--- Makefile.orig	Thu Jun 24 03:11:26 2004
+++ Makefile	Thu Jun 24 03:15:14 2004
@@ -22,9 +22,20 @@
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500035
+BUILD_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+RUN_DEPENDS+=   ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+CXXFLAGS+=      -I${LOCALBASE}/include/stlport
+LDFLAGS+=       -L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS}
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
+.endif
 
 CONFIGURE_ARGS=	--with-postgres=${LOCALBASE} \
 		--enable-shared \
 		--with-postgres-include=${LOCALBASE}/include/postgresql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- pkg-plist.orig	Thu Jun 24 03:11:34 2004
+++ pkg-plist	Thu Jun 24 03:11:43 2004
@@ -67,7 +67,7 @@
 lib/libpqxx.a
 lib/libpqxx.la
 lib/libpqxx.so
-lib/libpqxx-2.2.3.so
+lib/libpqxx-%%PORTVERSION%%.so
 lib/pkgconfig/libpqxx.pc
 @dirrm lib/pkgconfig
 @dirrm include/pqxx