aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2007-07-03 06:43:31 +0800
committermm <mm@FreeBSD.org>2007-07-03 06:43:31 +0800
commitb341c4d415b3bde652752d645f3a7a997f23bf2f (patch)
tree3abf29ba737590f8ab30d5646d9ba2aa1b3f7690 /graphics
parent098b7ae41fa8cce3746e7e1fa7e5fbd3d9621ef2 (diff)
downloadfreebsd-ports-gnome-b341c4d415b3bde652752d645f3a7a997f23bf2f.tar.gz
freebsd-ports-gnome-b341c4d415b3bde652752d645f3a7a997f23bf2f.tar.zst
freebsd-ports-gnome-b341c4d415b3bde652752d645f3a7a997f23bf2f.zip
- fix build of libns*.so
- move AOLSERVERBASE under PREFIX - move small pkg-plist to PLIST_FILES - bump PORTREVISION Approved by: garga (mentor)
Diffstat (limited to 'graphics')
-rw-r--r--graphics/aolserver-nsgd/Makefile23
-rw-r--r--graphics/aolserver-nsgd/pkg-plist3
2 files changed, 16 insertions, 10 deletions
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 <bsd.port.pre.mk>
-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