From d7fa652b2c94207da8a897a03f719c75d9c1726a Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Mon, 2 Jul 2007 22:43:31 +0000 Subject: [PATCH] - fix build of libns*.so - move AOLSERVERBASE under PREFIX - move small pkg-plist to PLIST_FILES - bump PORTREVISION Approved by: garga (mentor) --- archivers/aolserver-nszlib/Makefile | 22 +++++++++++++------ archivers/aolserver-nszlib/pkg-plist | 3 --- databases/aolserver-nsmysql/Makefile | 27 ++++++++++++++++-------- databases/aolserver-nsmysql/pkg-plist | 3 --- databases/aolserver-nspostgres/Makefile | 20 ++++++++++++++---- databases/aolserver-nspostgres/pkg-plist | 3 --- graphics/aolserver-nsgd/Makefile | 23 ++++++++++++++------ graphics/aolserver-nsgd/pkg-plist | 3 --- security/aolserver-nsencrypt/Makefile | 20 ++++++++++++++---- security/aolserver-nsencrypt/pkg-plist | 3 --- 10 files changed, 81 insertions(+), 46 deletions(-) delete mode 100644 archivers/aolserver-nszlib/pkg-plist delete mode 100644 databases/aolserver-nsmysql/pkg-plist delete mode 100644 databases/aolserver-nspostgres/pkg-plist delete mode 100644 graphics/aolserver-nsgd/pkg-plist delete mode 100644 security/aolserver-nsencrypt/pkg-plist diff --git a/archivers/aolserver-nszlib/Makefile b/archivers/aolserver-nszlib/Makefile index 0888d8e3b508..43f1ebdcb28e 100644 --- a/archivers/aolserver-nszlib/Makefile +++ b/archivers/aolserver-nszlib/Makefile @@ -5,33 +5,41 @@ # $FreeBSD$ # -PORTNAME= aolserver-nszlib +PORTNAME= nszlib PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= archivers www MASTER_SITES= ftp://ftp.crystalballinc.com/pub/vlad/ MASTER_SITE_SUBDIR= aolserver -DISTNAME= nszlib +PKGNAMEPREFIX= aolserver- +DISTNAME= ${PORTNAME} DIST_SUBDIR= aolserver MAINTAINER= mm@FreeBSD.org COMMENT= Zlib library interface for AOLserver -AOLSERVERBASE?= ${PREFIX}/aolserver +AOLSERVERBASE?= aolserver -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 -MAKE_ARGS= AOLSERVER=${AOLSERVERBASE} +MAKE_ARGS= AOLSERVER="${LOCALBASE}/${AOLSERVERBASE}" \ + DLLLIBS="-lz" MODLIBS="-lz" + +PLIST_FILES= ${AOLSERVERBASE}/bin/nszlib.so \ + ${AOLSERVERBASE}/lib/libnszlib.a \ + ${AOLSERVERBASE}/lib/libnszlib.so .if !defined(NOPORTDOCS) PORTDOCS= ChangeLog README example.tcl .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/archivers/aolserver-nszlib/pkg-plist b/archivers/aolserver-nszlib/pkg-plist deleted file mode 100644 index 6e23743ce4fa..000000000000 --- a/archivers/aolserver-nszlib/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -%%AOLSERVERBASE%%/bin/nszlib.so -%%AOLSERVERBASE%%/lib/libnszlib.a -%%AOLSERVERBASE%%/lib/libnszlib.so 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 diff --git a/graphics/aolserver-nsgd/Makefile b/graphics/aolserver-nsgd/Makefile index a03257268021..b104874f839a 100644 --- a/graphics/aolserver-nsgd/Makefile +++ b/graphics/aolserver-nsgd/Makefile @@ -7,7 +7,7 @@ PORTNAME= nsgd PORTVERSION= 2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics www MASTER_SITES= http://www.aolserver.cz/download/ PKGNAMEPREFIX= aolserver- @@ -20,11 +20,10 @@ COMMENT= Graphics module for AOLserver WRKSRC= ${WRKDIR} -AOLSERVERBASE?= ${PREFIX}/aolserver +AOLSERVERBASE?= aolserver LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd -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 @@ -33,13 +32,23 @@ USE_TCL_THREADS= yes .include -MAKE_ARGS= NSHOME=${AOLSERVERBASE} MODLIBS="-L${LOCALBASE}/lib -lgd" \ - CFLAGS="-I. -I${AOLSERVERBASE}/include -I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -DAOL4=1 -fPIC" +CFLAGS+= "-I${LOCALBASE}/include" + +MAKE_ARGS= NSHOME="${LOCALBASE}/${AOLSERVERBASE}" \ + MODLIBS="-L${LOCALBASE}/lib -lgd" \ + DLLLIBS="-L${LOCALBASE}/lib -lgd" + +PLIST_FILES= ${AOLSERVERBASE}/bin/nsgd2.so \ + ${AOLSERVERBASE}/lib/libnsgd2.a \ + ${AOLSERVERBASE}/lib/libnsgd2.so PORTDOCS= nsgd.html post-patch: - @ ${REINPLACE_CMD} -e 's|OBJS|MODOBJS|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's/CFLAGS =/CFLAGS +=/g' \ + -e '/^OBJS =.*/{p;s/OBJS =.*/MODOBJS = $$(OBJS)/g;}' \ + -e 's/^MODLIBS =/#MODLIBS =/g' \ + ${WRKSRC}/Makefile post-install: .if !defined(NOPORTDOCS) diff --git a/graphics/aolserver-nsgd/pkg-plist b/graphics/aolserver-nsgd/pkg-plist deleted file mode 100644 index 3b52739be4b6..000000000000 --- a/graphics/aolserver-nsgd/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -%%AOLSERVERBASE%%/bin/nsgd2.so -%%AOLSERVERBASE%%/lib/libnsgd2.a -%%AOLSERVERBASE%%/lib/libnsgd2.so diff --git a/security/aolserver-nsencrypt/Makefile b/security/aolserver-nsencrypt/Makefile index 9c70d49eaa14..28b1aec0dfea 100644 --- a/security/aolserver-nsencrypt/Makefile +++ b/security/aolserver-nsencrypt/Makefile @@ -7,6 +7,7 @@ PORTNAME= aolserver-nsencrypt PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= security www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= aolserver @@ -18,20 +19,31 @@ COMMENT= OpenSSL data encryption module for AOLserver WRKSRC= ${WRKDIR}/nsencrypt-${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}\///} +PLIST_SUB+= AOLSERVERBASE=${AOLSERVERBASE} USE_OPENSSL= yes USE_GMAKE= yes -MAKE_ARGS= AOLSERVER=${AOLSERVERBASE} OPENSSL=${OPENSSLBASE} +MAKE_ARGS= AOLSERVER="${LOCALBASE}/${AOLSERVERBASE}" \ + OPENSSL="${OPENSSLBASE}" + +PLIST_FILES= ${AOLSERVERBASE}/bin/nsencrypt.so \ + ${AOLSERVERBASE}/lib/libnsencrypt.a \ + ${AOLSERVERBASE}/lib/libnsencrypt.so .if !defined(NOPORTDOCS) PORTDOCS= ChangeLog readme.txt .endif +post-patch: + @${REINPLACE_CMD} \ + -e '/^MODOBJS =.*/{p;s/MODOBJS =/OBJS +=/g;}' \ + -e '/^MODLIBS =.*/{p;s/MODLIBS =/DLLLIBS +=/g;}' \ + ${WRKSRC}/Makefile + post-install: .if !defined(NOPORTDOCS) @ ${MKDIR} ${DOCSDIR} diff --git a/security/aolserver-nsencrypt/pkg-plist b/security/aolserver-nsencrypt/pkg-plist deleted file mode 100644 index ba4ce9d6dc8f..000000000000 --- a/security/aolserver-nsencrypt/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -%%AOLSERVERBASE%%/bin/nsencrypt.so -%%AOLSERVERBASE%%/lib/libnsencrypt.a -%%AOLSERVERBASE%%/lib/libnsencrypt.so