- update to 1.1

- move AOLSERVERBASE under PREFIX
- move small pkg-plist to PLIST_FILES

Approved by:	garga (mentor)

6 files changed, 40 insertions, 30 deletions

diff --git a/security/aolserver-nsmcrypt/Makefile b/security/aolserver-nsmcrypt/Makefile
index 426ebe5b4955..8e785c5e93ef 100644
--- a/security/aolserver-nsmcrypt/Makefile
+++ b/security/aolserver-nsmcrypt/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nsmcrypt
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	1.1
 CATEGORIES=	security www
 MASTER_SITES=	http://www.aolserver.cz/download/
 PKGNAMEPREFIX=	aolserver-
@@ -19,28 +18,37 @@ COMMENT=	AOLserver interface to mcrypt library
 
 WRKSRC=		${WRKDIR}
 
-AOLSERVERBASE?=	${PREFIX}/aolserver
+AOLSERVERBASE?=	aolserver
 LIB_DEPENDS+=	mcrypt.8:${PORTSDIR}/security/mcrypt
-BUILD_DEPENDS+=	${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver
+BUILD_DEPENDS+=	${LOCALBASE}/${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver
 RUN_DEPENDS+=	${BUILD_DEPENDS}
-PLIST_SUB+=	AOLSERVERBASE=${AOLSERVERBASE:S/${PREFIX}\///}
 
 USE_GMAKE=	yes
+MAKEFILE=	Makefile.ns
 
 USE_TCL=	84+
 USE_TCL_THREADS=	yes
 
+PLIST_FILES=	${AOLSERVERBASE}/bin/nsmcrypt.so \
+		${AOLSERVERBASE}/lib/libnsmcrypt.a \
+		${AOLSERVERBASE}/lib/libnsmcrypt.so
+
 .include <bsd.port.pre.mk>
 
-MAKE_ARGS=	NSHOME=${AOLSERVERBASE} MODLIBS="-L${LOCALBASE}/lib -lmcrypt" \
-		CFLAGS="-I. -I${AOLSERVERBASE}/include -I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -DAOL4=1 -fPIC"
+CFLAGS+=	"-I${LOCALBASE}/include"
+MAKE_ARGS+=	NSHOME="${LOCALBASE}/${AOLSERVERBASE}" \
+		DLLLIBS="-L${LOCALBASE}/lib -lmcrypt" \
+		MODLIBS="-L${LOCALBASE}/lib -lmcrypt"
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	AUTHORS COPYING README
+PORTDOCS=	AUTHORS CHANGES COPYING README
 .endif
 
 post-patch:
-	@ ${REINPLACE_CMD} -e 's|OBJS|MODOBJS|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's/^CFLAGS   =/CFLAGS  +=/g' \
+	-e 's/^MODLIBS  =/MODLIBS +=/g' \
+	-e '/^OBJS     =.*/{n;s/.*/MODOBJS  = $$(OBJS)/g;G;}' \
+		${WRKSRC}/${MAKEFILE}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/security/aolserver-nsmcrypt/distinfo b/security/aolserver-nsmcrypt/distinfo
index d98c37a140f1..1b71e878a3e1 100644
--- a/security/aolserver-nsmcrypt/distinfo
+++ b/security/aolserver-nsmcrypt/distinfo
@@ -1,3 +1,3 @@
-MD5 (aolserver/nsmcrypt-1.0.tgz) = bf768b58f78ef93cc306c2a671ae0c03
-SHA256 (aolserver/nsmcrypt-1.0.tgz) = 1783f2167da0c699a95ae9c5e6412ccbf29e36d8fbd510e81c5e227af927b41b
-SIZE (aolserver/nsmcrypt-1.0.tgz) = 19297
+MD5 (aolserver/nsmcrypt-1.1.tgz) = ab176455754cfe5163f551c31000b56d
+SHA256 (aolserver/nsmcrypt-1.1.tgz) = 7950321803a9f80ce66f8ef19e2f38abecd7fa462f34a0f51b546c6fea52e46c
+SIZE (aolserver/nsmcrypt-1.1.tgz) = 39609
diff --git a/security/aolserver-nsmcrypt/pkg-plist b/security/aolserver-nsmcrypt/pkg-plist
deleted file mode 100644
index b5af92014b50..000000000000
--- a/security/aolserver-nsmcrypt/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%AOLSERVERBASE%%/bin/nsmcrypt.so
-%%AOLSERVERBASE%%/lib/libnsmcrypt.a
-%%AOLSERVERBASE%%/lib/libnsmcrypt.so
diff --git a/security/aolserver-nsmhash/Makefile b/security/aolserver-nsmhash/Makefile
index 1be411ec1b5e..7547fcc6f6ed 100644
--- a/security/aolserver-nsmhash/Makefile
+++ b/security/aolserver-nsmhash/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nsmhash
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	1.1
 CATEGORIES=	security www
 MASTER_SITES=	http://www.aolserver.cz/download/
 PKGNAMEPREFIX=	aolserver-
@@ -19,28 +18,37 @@ COMMENT=	AOLserver interface to mhash library
 
 WRKSRC=		${WRKDIR}
 
-AOLSERVERBASE?=	${PREFIX}/aolserver
+AOLSERVERBASE?=	aolserver
 LIB_DEPENDS+=	mhash.2:${PORTSDIR}/security/mhash
-BUILD_DEPENDS+=	${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver
+BUILD_DEPENDS+=	${LOCALBASE}/${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver
 RUN_DEPENDS+=	${BUILD_DEPENDS}
-PLIST_SUB+=	AOLSERVERBASE=${AOLSERVERBASE:S/${PREFIX}\///}
 
 USE_GMAKE=	yes
+MAKEFILE=	Makefile.ns
 
 USE_TCL=	84+
 USE_TCL_THREADS=	yes
 
+PLIST_FILES=	${AOLSERVERBASE}/bin/nsmhash.so \
+		${AOLSERVERBASE}/lib/libnsmhash.a \
+		${AOLSERVERBASE}/lib/libnsmhash.so
+
 .include <bsd.port.pre.mk>
 
-MAKE_ARGS=	NSHOME=${AOLSERVERBASE} MODLIBS="-L${LOCALBASE}/lib -lmhash" \
-		CFLAGS="-I. -I${AOLSERVERBASE}/include -I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -DAOL4=1 -fPIC"
+CFLAGS+=	"-I${LOCALBASE}/include"
+MAKE_ARGS+=	NSHOME="${LOCALBASE}/${AOLSERVERBASE}" \
+		DLLLIBS="-L${LOCALBASE}/lib -lmhash" \
+		MODLIBS="-L${LOCALBASE}/lib -lmhash"
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	AUTHORS COPYING README
+PORTDOCS=	AUTHORS CHANGES COPYING README
 .endif
 
 post-patch:
-	@ ${REINPLACE_CMD} -e 's|OBJS|MODOBJS|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's/^CFLAGS   =/CFLAGS  +=/g' \
+		-e 's/^MODLIBS  =/MODLIBS +=/g' \
+		-e '/^OBJS     =.*/{n;s/.*/MODOBJS  = $$(OBJS)/g;G;}' \
+		${WRKSRC}/${MAKEFILE}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/security/aolserver-nsmhash/distinfo b/security/aolserver-nsmhash/distinfo
index 7c0663e02ae7..839241635e80 100644
--- a/security/aolserver-nsmhash/distinfo
+++ b/security/aolserver-nsmhash/distinfo
@@ -1,3 +1,3 @@
-MD5 (aolserver/nsmhash-1.0.tgz) = 882d71940f404f680f320ae9d02eccb0
-SHA256 (aolserver/nsmhash-1.0.tgz) = 2a889e8c7aecea0dfbeedf713f59465767a0c3b8562276b88fbfebb1e0ea3a61
-SIZE (aolserver/nsmhash-1.0.tgz) = 18692
+MD5 (aolserver/nsmhash-1.1.tgz) = be39f8d5c62871aa5966de37ff32ae35
+SHA256 (aolserver/nsmhash-1.1.tgz) = e87fa32e842682f7d8f7133ac537ccda9b0ee6449222188c97b06ce6958c6b0f
+SIZE (aolserver/nsmhash-1.1.tgz) = 37145
diff --git a/security/aolserver-nsmhash/pkg-plist b/security/aolserver-nsmhash/pkg-plist
deleted file mode 100644
index 225ddb10d338..000000000000
--- a/security/aolserver-nsmhash/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%AOLSERVERBASE%%/bin/nsmhash.so
-%%AOLSERVERBASE%%/lib/libnsmhash.a
-%%AOLSERVERBASE%%/lib/libnsmhash.so