4 files changed, 34 insertions, 19 deletions

diff --git a/databases/aolserver-nsmysql/Makefile b/databases/aolserver-nsmysql/Makefile
index 42d97c7fea45..d363a833a48b 100644
--- a/databases/aolserver-nsmysql/Makefile
+++ b/databases/aolserver-nsmysql/Makefile
@@ -5,35 +5,44 @@
 # $FreeBSD$
 #
 
-PORTNAME=	aolserver-nsmysql
+PORTNAME=	nsmysql
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	aolserver
-DISTFILES=	nsmysql_v1.tar.gz
+PKGNAMEPREFIX=	aolserver-
+DISTNAME=	nsmysql_v1
 DIST_SUBDIR=	aolserver
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Internal MySQL database driver for AOLserver
 
-WRKSRC=		${WRKDIR}/nsmysql_v1
-
-AOLSERVERBASE?=	${PREFIX}/aolserver
-BUILD_DEPENDS+=	${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver
+AOLSERVERBASE?=	aolserver
+BUILD_DEPENDS+=	${LOCALBASE}/${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver
 RUN_DEPENDS+=	${BUILD_DEPENDS}
-PLIST_SUB+=	AOLSERVERBASE=${AOLSERVERBASE:S/${PREFIX}\///}
 
 USE_MYSQL=	yes
 USE_GMAKE=	yes
 
-MAKE_ARGS=	AOLSERVER=${AOLSERVERBASE}
+MAKE_ARGS=	AOLSERVER="${LOCALBASE}/${AOLSERVERBASE}" \
+		MYSQL_PREFIX="${LOCALBASE}" \
+		MODLIBS="-L${LOCALBASE}/lib/mysql -lmysqlclient_r" \
+		DLLLIBS="-L${LOCALBASE}/lib/mysql -lmysqlclient_r" \
+		NO_LDOVERRIDE=1
+
+PLIST_FILES=	${AOLSERVERBASE}/bin/nsmysql.so \
+		${AOLSERVERBASE}/lib/libnsmysql.a \
+		${AOLSERVERBASE}/lib/libnsmysql.so
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	ChangeLog README INSTALL
 .endif
 
 post-patch:
-	@ ${REINPLACE_CMD} -e 's|OBJS|MODOBJS|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's/^MODLIBS  =/MODLIBS +=/g' \
+		-e '/^OBJS      =.*/{n;s/.*/MODOBJS  = $$(OBJS)/g;G;}' \
+		${WRKSRC}/Makefile
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/databases/aolserver-nsmysql/pkg-plist b/databases/aolserver-nsmysql/pkg-plist
deleted file mode 100644
index b53c885d3ca1..000000000000
--- a/databases/aolserver-nsmysql/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%AOLSERVERBASE%%/bin/nsmysql.so
-%%AOLSERVERBASE%%/lib/libnsmysql.a
-%%AOLSERVERBASE%%/lib/libnsmysql.so
diff --git a/databases/aolserver-nspostgres/Makefile b/databases/aolserver-nspostgres/Makefile
index ba54c021e46e..9d74277a6a41 100644
--- a/databases/aolserver-nspostgres/Makefile
+++ b/databases/aolserver-nspostgres/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nspostgres
 PORTVERSION=	4.1
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -19,21 +20,32 @@ COMMENT=	Internal PostgreSQL driver for AOLserver
 
 WRKSRC=		${WRKDIR}/nspostgres-${PORTVERSION}
 
-AOLSERVERBASE?=	${PREFIX}/aolserver
-BUILD_DEPENDS+=	${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver
+AOLSERVERBASE?=	aolserver
+BUILD_DEPENDS+=	${LOCALBASE}/${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver
 RUN_DEPENDS+=	${BUILD_DEPENDS}
-PLIST_SUB+=	AOLSERVERBASE=${AOLSERVERBASE:S/${PREFIX}\///}
 
 USE_PGSQL=	yes
 DEFAULT_PGSQL_VER=	82
 USE_GMAKE=	yes
 
-MAKE_ARGS=	AOLSERVER=${AOLSERVERBASE} POSTGRES=${LOCALBASE} ACS=1
+MAKE_ARGS=	AOLSERVER="${LOCALBASE}/${AOLSERVERBASE}" \
+		PG_CONFIG="${LOCALBASE}/bin/pg_config" \
+		POSTGRES=PG_CONFIG ACS=1 OPENSSL=1
+
+PLIST_FILES=	${AOLSERVERBASE}/bin/nspostgres.so \
+		${AOLSERVERBASE}/lib/libnspostgres.a \
+		${AOLSERVERBASE}/lib/libnspostgres.so
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	ChangeLog README
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} \
+		-e '/^MODOBJS   =.*/{n;s/.*/OBJS  = $$(MODOBJS)/g;G;}' \
+		-e '/MODLIBS *+=.*/{p;s/MODLIBS *+=/DLLLIBS  +=/g;}' \
+		${WRKSRC}/Makefile
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}
diff --git a/databases/aolserver-nspostgres/pkg-plist b/databases/aolserver-nspostgres/pkg-plist
deleted file mode 100644
index 0bea83cae21e..000000000000
--- a/databases/aolserver-nspostgres/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%AOLSERVERBASE%%/bin/nspostgres.so
-%%AOLSERVERBASE%%/lib/libnspostgres.a
-%%AOLSERVERBASE%%/lib/libnspostgres.so