diff options
49 files changed, 307 insertions, 504 deletions
diff --git a/security/afterglow/Makefile b/security/afterglow/Makefile index dfaaff4f44e9..b87a8da200ea 100644 --- a/security/afterglow/Makefile +++ b/security/afterglow/Makefile @@ -21,22 +21,21 @@ USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} -NO_STAGE= yes do-install: - ${MKDIR} ${DATADIR}/data - ${MKDIR} ${DATADIR}/charts - ${MKDIR} ${DATADIR}/graph - ${MKDIR} ${DATADIR}/loganalysis - ${MKDIR} ${DATADIR}/parsers - (cd ${WRKSRC}/data/ && ${COPYTREE_SHARE} \* ${DATADIR}/data "! -name generate.pl") - (cd ${WRKSRC}/data/ && ${COPYTREE_BIN} \* ${DATADIR}/data "-name generate.pl") - (cd ${WRKSRC}/src/perl/charts/ && ${COPYTREE_SHARE} \* ${DATADIR}/charts "! -name *\.pl") - (cd ${WRKSRC}/src/perl/charts/ && ${COPYTREE_BIN} \* ${DATADIR}/charts "-name *\.pl") - (cd ${WRKSRC}/src/perl/graph/ && ${COPYTREE_SHARE} \* ${DATADIR}/graph "! -name *\.pl") - (cd ${WRKSRC}/src/perl/graph/ && ${COPYTREE_BIN} \* ${DATADIR}/graph "-name *\.pl") - (cd ${WRKSRC}/src/perl/loganalysis/ && ${COPYTREE_SHARE} \* ${DATADIR}/loganalysis "! ( -name *\.pl -or -name *\.sh )") - (cd ${WRKSRC}/src/perl/loganalysis/ && ${COPYTREE_BIN} \* ${DATADIR}/loganalysis "( -name *\.pl -or -name *\.sh )") - (cd ${WRKSRC}/src/perl/parsers/ && ${COPYTREE_SHARE} \* ${DATADIR}/parsers "! -name *\.pl") - (cd ${WRKSRC}/src/perl/parsers/ && ${COPYTREE_BIN} \* ${DATADIR}/parsers "-name *\.pl") + ${MKDIR} ${STAGEDIR}${DATADIR}/data + ${MKDIR} ${STAGEDIR}${DATADIR}/charts + ${MKDIR} ${STAGEDIR}${DATADIR}/graph + ${MKDIR} ${STAGEDIR}${DATADIR}/loganalysis + ${MKDIR} ${STAGEDIR}${DATADIR}/parsers + (cd ${WRKSRC}/data/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/data "! -name generate.pl") + (cd ${WRKSRC}/data/ && ${COPYTREE_BIN} \* ${STAGEDIR}${DATADIR}/data "-name generate.pl") + (cd ${WRKSRC}/src/perl/charts/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/charts "! -name *\.pl") + (cd ${WRKSRC}/src/perl/charts/ && ${COPYTREE_BIN} \* ${STAGEDIR}${DATADIR}/charts "-name *\.pl") + (cd ${WRKSRC}/src/perl/graph/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/graph "! -name *\.pl") + (cd ${WRKSRC}/src/perl/graph/ && ${COPYTREE_BIN} \* ${STAGEDIR}${DATADIR}/graph "-name *\.pl") + (cd ${WRKSRC}/src/perl/loganalysis/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/loganalysis "! ( -name *\.pl -or -name *\.sh )") + (cd ${WRKSRC}/src/perl/loganalysis/ && ${COPYTREE_BIN} \* ${STAGEDIR}${DATADIR}/loganalysis "( -name *\.pl -or -name *\.sh )") + (cd ${WRKSRC}/src/perl/parsers/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/parsers "! -name *\.pl") + (cd ${WRKSRC}/src/perl/parsers/ && ${COPYTREE_BIN} \* ${STAGEDIR}${DATADIR}/parsers "-name *\.pl") .include <bsd.port.mk> diff --git a/security/aimsniff/Makefile b/security/aimsniff/Makefile index ede7a5d430ee..a9793f285a0d 100644 --- a/security/aimsniff/Makefile +++ b/security/aimsniff/Makefile @@ -20,6 +20,7 @@ RUN_DEPENDS= p5-Net-Pcap>=0:${PORTSDIR}/net/p5-Net-Pcap\ OPTIONS_DEFINE= SUID_ROOT DOCS SUID_ROOT_DESC= Install aimsniff with set-uid bit +PORT_OPTIONS= DOCS PORTDOCS= README table.struct rc.aimsniff USES= perl5 @@ -27,7 +28,6 @@ NO_BUILD= yes PLIST_FILES= bin/aimsniff -NO_STAGE= yes .include <bsd.port.options.mk> .if !exists(${LOCALBASE}/lib/perl5/${PERL_VER}/${PERL_ARCH}/GDBM_File.pm) @@ -35,18 +35,15 @@ NO_STAGE= yes .endif do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/aimSniff.pl ${PREFIX}/bin/aimsniff + ${INSTALL_SCRIPT} ${WRKSRC}/aimSniff.pl ${STAGEDIR}${PREFIX}/bin/aimsniff .if ${PORT_OPTIONS:MSUID_ROOT} - ${CHMOD} u+s ${PREFIX}/bin/aimsniff -.else + ${CHMOD} u+s ${STAGEDIR}${PREFIX}/bin/aimsniff .endif post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> diff --git a/security/amap/Makefile b/security/amap/Makefile index f38c8f70e4d1..5d957d9f3792 100644 --- a/security/amap/Makefile +++ b/security/amap/Makefile @@ -3,6 +3,7 @@ PORTNAME= amap PORTVERSION= 5.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_PACKETSTORM} MASTER_SITE_SUBDIR= groups/thc @@ -15,19 +16,11 @@ CONFIGURE_ARGS= --prefix=${PREFIX} USE_OPENSSL= yes -MAN1= amap.1 -.if !defined(NOPORTDOCS) +PORT_OPTIONS= DOCS PORTDOCS= README TODO CHANGES AMAP-LIB-INTERFACE -.endif -PLIST_SUB= AMAPLIBDIR=lib/${PORTNAME} AMAPINCDIR=include/${PORTNAME} -CONF_DIR= ${PREFIX}/etc/${PORTNAME} LOCAL_CONF_FILES= appdefs.resp appdefs.rpc appdefs.trig -SUB_FILES= pkg-install pkg-deinstall -SUB_LIST= LOCAL_CONF_FILES="${LOCAL_CONF_FILES}" CONF_DIR="${CONF_DIR}" - -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e \ 's|/usr/local|${LOCALBASE}|g; \ @@ -38,26 +31,23 @@ post-patch: @${REINPLACE_CMD} -e 's|etc/|etc/amap/|g' ${WRKSRC}/amap-lib.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/amap ${PREFIX}/bin - ${LN} -s ${PREFIX}/bin/amap ${PREFIX}/bin/amap6 - ${INSTALL_PROGRAM} ${WRKSRC}/amapcrap ${PREFIX}/bin - ${MKDIR} ${PREFIX}/lib/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/amap-lib.o ${PREFIX}/lib/${PORTNAME} - ${MKDIR} ${PREFIX}/include/${PORTNAME} -. for i in amap.h amap-inc.h amap-lib.h - ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/include/${PORTNAME} -. endfor - ${MKDIR} ${CONF_DIR} -. for i in ${LOCAL_CONF_FILES} - ${INSTALL_DATA} ${WRKSRC}/${i} ${CONF_DIR}/${i}.default -. endfor - ${INSTALL_MAN} ${WRKSRC}/amap.1 ${MANPREFIX}/man/man1 -. if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -. for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR} -. endfor -. endif - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + ${INSTALL_PROGRAM} ${WRKSRC}/amap ${STAGEDIR}${PREFIX}/bin + ${LN} -s amap ${STAGEDIR}${PREFIX}/bin/amap6 + ${INSTALL_PROGRAM} ${WRKSRC}/amapcrap ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/amap-lib.o ${STAGEDIR}${PREFIX}/lib/${PORTNAME} + ${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} +.for i in amap.h amap-inc.h amap-lib.h + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/include/${PORTNAME} +.endfor + ${MKDIR} ${STAGEDIR}${ETCDIR} +.for i in ${LOCAL_CONF_FILES} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${ETCDIR}/${i}.sample +.endfor + ${INSTALL_MAN} ${WRKSRC}/amap.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR} +.endfor .include <bsd.port.mk> diff --git a/security/amap/files/pkg-deinstall.in b/security/amap/files/pkg-deinstall.in deleted file mode 100644 index 90ac66a8f50d..000000000000 --- a/security/amap/files/pkg-deinstall.in +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -[ "$2" != "DEINSTALL" ] && exit 0 - -for f in %%LOCAL_CONF_FILES%%; do - if cmp -s "%%CONF_DIR%%/$f" "%%CONF_DIR%%/$f.default"; then - rm -f "%%CONF_DIR%%/$f" - fi -done diff --git a/security/amap/files/pkg-install.in b/security/amap/files/pkg-install.in deleted file mode 100644 index 3b5ad1e0669b..000000000000 --- a/security/amap/files/pkg-install.in +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -[ "$2" != "POST-INSTALL" ] && exit 0 - -for f in %%LOCAL_CONF_FILES%%; do - [ -f "%%CONF_DIR%%/$f" ] || cp -p "%%CONF_DIR%%/$f.default" "%%CONF_DIR%%/$f" -done diff --git a/security/amap/pkg-plist b/security/amap/pkg-plist index e849e51c864e..f3fa7c076afb 100644 --- a/security/amap/pkg-plist +++ b/security/amap/pkg-plist @@ -1,13 +1,14 @@ bin/amap bin/amap6 bin/amapcrap -etc/amap/appdefs.resp.default -etc/amap/appdefs.rpc.default -etc/amap/appdefs.trig.default -%%AMAPLIBDIR%%/amap-lib.o -%%AMAPINCDIR%%/amap.h -%%AMAPINCDIR%%/amap-inc.h -%%AMAPINCDIR%%/amap-lib.h -@dirrm %%AMAPLIBDIR%% -@dirrm %%AMAPINCDIR%% +@sample %%ETCDIR%%/appdefs.resp.sample +@sample %%ETCDIR%%/appdefs.rpc.sample +@sample %%ETCDIR%%/appdefs.trig.sample +include/amap/amap.h +include/amap/amap-inc.h +include/amap/amap-lib.h +lib/amap/amap-lib.o +man/man1/amap.1.gz +@dirrm lib/amap +@dirrm include/amap @dirrmtry etc/amap diff --git a/security/avcheck/Makefile b/security/avcheck/Makefile index a89dce171105..499253cc3866 100644 --- a/security/avcheck/Makefile +++ b/security/avcheck/Makefile @@ -9,30 +9,28 @@ MASTER_SITES= http://www.corpit.ru/ftp/avcheck/ MAINTAINER= dsh@vlink.ru COMMENT= Simple antivirus solution for a mail system -MAN1= avcheck.1 - -PLIST_FILES= sbin/avcheck sbin/uchroot +PLIST_FILES= man/man1/avcheck.1.gz sbin/avcheck sbin/uchroot PORTDOCS= README.AVP README.AVP.de README.DrWeb README.Exim \ README.Postfix README.Postfix.de README.Sendmail eicar.msg \ eicar.txt -NO_STAGE= yes +PORT_OPTIONS= DOCS + post-patch: @${REINPLACE_CMD} -e 's/^CC/#CC/g ; s/^CFLAGS/#CFLAGS/g' ${WRKSRC}/Makefile do-install: .for i in avcheck uchroot - ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/sbin/ + ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin/ .endfor .for i in ${MAN1} - ${INSTALL_MAN} ${WRKSRC}/${i} ${MANPREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${MANPREFIX}/man/man1/ .endfor -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ .endfor .endif diff --git a/security/bruteforceblocker/Makefile b/security/bruteforceblocker/Makefile index d2158ddbbebd..3d33cc4eeede 100644 --- a/security/bruteforceblocker/Makefile +++ b/security/bruteforceblocker/Makefile @@ -3,6 +3,7 @@ PORTNAME= bruteforceblocker PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://danger.rulez.sk/projects/bruteforceblocker/ \ ${MASTER_SITE_LOCAL} @@ -20,27 +21,17 @@ NO_BUILD= yes USES= perl5 USE_PERL5= run +PORT_OPTIONS= DOCS + WRKSRC= ${WRKDIR}/${PORTNAME} -PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message -NO_STAGE= yes do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/sbin/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf-dist -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${STAGEDIR}${PREFIX}/sbin/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in INSTALL CHANGELOG CREDITS - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} .endfor -.endif - -post-install: - @if [ ! -f ${PREFIX}/etc/${PORTNAME}.conf ]; then \ - ${CP} -p ${PREFIX}/etc/${PORTNAME}.conf-dist ${PREFIX}/etc/${PORTNAME}.conf ; \ - fi -.if !defined(BATCH) - @${CAT} ${PKGMESSAGE} -.endif .include <bsd.port.mk> diff --git a/security/bruteforceblocker/pkg-plist b/security/bruteforceblocker/pkg-plist index 1b3e0c5a8028..e976bc01b855 100644 --- a/security/bruteforceblocker/pkg-plist +++ b/security/bruteforceblocker/pkg-plist @@ -2,7 +2,5 @@ %%PORTDOCS%%%%DOCSDIR%%/CREDITS %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec if cmp -s %D/etc/bruteforceblocker.conf %D/etc/bruteforceblocker.conf-dist; then rm -f %D/etc/bruteforceblocker.conf; fi -etc/bruteforceblocker.conf-dist -@exec if [ ! -f %D/etc/bruteforceblocker.conf ] ; then cp -p %D/%F %B/bruteforceblocker.conf; fi +@sample etc/bruteforceblocker.conf.sample sbin/bruteforceblocker diff --git a/security/burpsuite/Makefile b/security/burpsuite/Makefile index 392d29715a3f..b1846da6c75b 100644 --- a/security/burpsuite/Makefile +++ b/security/burpsuite/Makefile @@ -21,7 +21,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME} PLIST_FILES= bin/${PORTNAME} \ %%JAVAJARDIR%%/${DISTNAME}.jar -NO_STAGE= yes .include <bsd.port.pre.mk> # Get BSFEL agreement @@ -32,16 +31,16 @@ pre-extract: post-extract: @${MKDIR} ${WRKSRC} - @${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}/ + ${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC} pre-install: - @${SED} -e 's:%%PATH%%:${JAVAJARDIR}/:' \ + ${SED} -e 's:%%PATH%%:${JAVAJARDIR}/:' \ -e 's:%%JAVA_CMD%%:${JAVA}:' \ -e 's:%%BURP%%:${JAVAJARDIR}/${DISTNAME}.jar:' \ < ${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME} do-install: - @${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar ${JAVAJARDIR}/ - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar ${STAGEDIR}${JAVAJARDIR} + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.post.mk> diff --git a/security/chkrootkit/Makefile b/security/chkrootkit/Makefile index 96b2fa23a5d8..88d0e9aca5de 100644 --- a/security/chkrootkit/Makefile +++ b/security/chkrootkit/Makefile @@ -16,6 +16,8 @@ MASTER_SITES= ftp://ftp.pangeia.com.br/pub/seg/pac/ \ MAINTAINER= cordeiro@nic.br COMMENT= Tool to locally check for signs of a rootkit +PORT_OPTIONS= DOCS + SCRIPT_FILES= chkrootkit PROG_FILES= chklastlog \ chkwtmp \ @@ -36,7 +38,6 @@ PLIST_FILES= ${ALL_TARGET:C,^,sbin/,} BINMODE= 0700 -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${OSVERSION} > 900007 @@ -53,11 +54,9 @@ post-patch: .endfor do-install: - ${INSTALL_SCRIPT} ${SCRIPT_FILES:C,^,${WRKSRC}/,} ${PREFIX}/sbin - ${INSTALL_PROGRAM} ${PROG_FILES:C,^,${WRKSRC}/,} ${PREFIX}/sbin -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:C,^,${WRKSRC}/,} ${DOCSDIR} -.endif + ${INSTALL_SCRIPT} ${SCRIPT_FILES:C,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_PROGRAM} ${PROG_FILES:C,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/sbin + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:C,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include <bsd.port.post.mk> diff --git a/security/clamav-unofficial-sigs/Makefile b/security/clamav-unofficial-sigs/Makefile index 73a513ff803a..a0145af20ee3 100644 --- a/security/clamav-unofficial-sigs/Makefile +++ b/security/clamav-unofficial-sigs/Makefile @@ -3,6 +3,7 @@ PORTNAME= clamav-unofficial-sigs PORTVERSION= 3.7.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/unofficial-sigs/ @@ -20,19 +21,13 @@ NO_BUILD= yes SUB_FILES= pkg-message -MAN8= clamav-unofficial-sigs.8 -MANCOMPRESSED= no - SED_CONF= -e 's|%%CLAM_DBS%%|/var/db/clamav|g' \ -e 's|%%CLAMD_PID%%|/var/run/clamav/clamd.pid|g' \ -e 's|%%CLAMD_SOCKET%%|/var/run/clamav/clamd.sock|g' \ -e 's|%%START_CLAMD%%|${PREFIX}/etc/rc.d/clamav-clamd start|g' \ -e 's|%%WORK_DIR%%|/var/db/clamav-unofficial-sigs|g' -OPTIONS_DEFINE= DOCS - -NO_STAGE= yes -.include <bsd.port.options.mk> +OPTIONS_DEFINE= DOCS EXAMPLES post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/clamav-unofficial-sigs.sh @@ -40,22 +35,16 @@ post-patch: @${REINPLACE_CMD} ${SED_CONF} ${WRKSRC}/clamd-status.sh do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/clamav-unofficial-sigs.sh ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/clamav-unofficial-sigs.8 ${MANPREFIX}/man/man8 - ${INSTALL_DATA} ${WRKSRC}/clamav-unofficial-sigs.conf ${PREFIX}/etc/clamav-unofficial-sigs.conf.sample - -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} CHANGELOG INSTALL LICENSE README ${DOCSDIR} -.endif - -.ifndef(NOPORTEXAMPLES) - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/clamav-unofficial-sigs-cron ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/clamav-unofficial-sigs-logrotate ${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/clamd-status.sh ${EXAMPLESDIR} -.endif - - @${CAT} ${PKGMESSAGE} + ${INSTALL_SCRIPT} ${WRKSRC}/clamav-unofficial-sigs.sh ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/clamav-unofficial-sigs.8 ${STAGEDIR}${MANPREFIX}/man/man8 + ${INSTALL_DATA} ${WRKSRC}/clamav-unofficial-sigs.conf ${STAGEDIR}${PREFIX}/etc/clamav-unofficial-sigs.conf.sample + + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} CHANGELOG INSTALL LICENSE README ${STAGEDIR}${DOCSDIR}) + + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/clamav-unofficial-sigs-cron ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/clamav-unofficial-sigs-logrotate ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/clamd-status.sh ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> diff --git a/security/clamav-unofficial-sigs/files/pkg-message.in b/security/clamav-unofficial-sigs/files/pkg-message.in index 4fbaa34a954c..e5d108c82024 100644 --- a/security/clamav-unofficial-sigs/files/pkg-message.in +++ b/security/clamav-unofficial-sigs/files/pkg-message.in @@ -1,11 +1,7 @@ ********************************************************************** In order to start using clamav-unofficial-sigs, you need to configure -it first. A sample configuration file has been installed to: - -%%PREFIX%%/etc/clamav-unofficial-sigs.conf.sample - -Modify it according to your needs and copy to: +modify the configuration file according to your needs: %%PREFIX%%/etc/clamav-unofficial-sigs.conf diff --git a/security/clamav-unofficial-sigs/pkg-plist b/security/clamav-unofficial-sigs/pkg-plist index 596cb56f866b..f595f4736e9c 100644 --- a/security/clamav-unofficial-sigs/pkg-plist +++ b/security/clamav-unofficial-sigs/pkg-plist @@ -1,5 +1,6 @@ bin/clamav-unofficial-sigs.sh -etc/clamav-unofficial-sigs.conf.sample +@sample etc/clamav-unofficial-sigs.conf.sample +man/man8/clamav-unofficial-sigs.8.gz %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/LICENSE diff --git a/security/cops/Makefile b/security/cops/Makefile index 21db0f0f467e..6166ee10a639 100644 --- a/security/cops/Makefile +++ b/security/cops/Makefile @@ -24,7 +24,6 @@ C_SRC= home.chk.c user.chk.c is_able.c is_something.c \ addto.c clearfiles.c filewriters.c members.c tilde.c \ crc.c crc_check.c -NO_STAGE= yes pre-build: ${SED} \ -e 's,^SECURE=/usr/foo/bar,SECURE=${PREFIX}/cops,g' \ @@ -35,10 +34,10 @@ pre-build: ${MV} ${WRKSRC}/cops.out ${WRKSRC}/cops do-install: - ${MKDIR} ${PREFIX}/cops + ${MKDIR} ${STAGEDIR}${PREFIX}/cops ${TAR} -C ${WRKSRC} --exclude "*.old" -cf - . | \ - ${TAR} -C ${PREFIX}/cops --unlink -xf - - ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/cops - ${CHMOD} -R go-rwx ${PREFIX}/cops + ${TAR} -C ${STAGEDIR}${PREFIX}/cops --unlink -xf - + ${CHOWN} -R ${BINOWN}:${BINGRP} ${STAGEDIR}${PREFIX}/cops + ${CHMOD} -R go-rwx ${STAGEDIR}${PREFIX}/cops .include <bsd.port.mk> diff --git a/security/cryptstring/Makefile b/security/cryptstring/Makefile index 232eb42ee50f..15cda886615a 100644 --- a/security/cryptstring/Makefile +++ b/security/cryptstring/Makefile @@ -12,9 +12,8 @@ COMMENT= Crypto Strings for PHP NO_BUILD= yes USE_PHP= mcrypt mhash -NO_STAGE= yes do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/cs.inc.php ${DATADIR} + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/cs.inc.php ${STAGEDIR}${DATADIR} .include <bsd.port.mk> diff --git a/security/dirbuster/Makefile b/security/dirbuster/Makefile index 6c1d692f5dcd..e08229060229 100644 --- a/security/dirbuster/Makefile +++ b/security/dirbuster/Makefile @@ -17,7 +17,6 @@ NO_BUILD= yes WRKSRC= ${WRKDIR}/${DISTNAME} DATADIR= ${JAVASHAREDIR}/${PORTNAME} -NO_STAGE= yes .include <bsd.port.pre.mk> post-extract: @@ -31,8 +30,8 @@ pre-install: < ${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME} do-install: - ${MKDIR} ${DATADIR} - ${CP} -R ${WRKSRC}/* ${DATADIR} - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${DATADIR} + ${CP} -R ${WRKSRC}/* ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.post.mk> diff --git a/security/dradis/Makefile b/security/dradis/Makefile index 0256579aa2c6..8278cd1aa041 100644 --- a/security/dradis/Makefile +++ b/security/dradis/Makefile @@ -39,15 +39,11 @@ RUBY_NO_BUILD_DEPENDS= yes USE_DOS2UNIX= yes DOS2UNIX_REGEX= .*(css|rb|txt|js|RELEASE_NOTES)$$ -NO_STAGE= yes pre-install: - @${FIND} ${WRKSRC}/server -type f \( -name "*.bak" -o -name "*.orig" -o -name "*.swp" \) -delete + ${FIND} ${WRKSRC}/server -type f \( -name "*.bak" -o -name "*.orig" -o -name "*.swp" \) -delete do-install: - @${MKDIR} ${PREFIX}/${PORTNAME} - @( cd ${WRKSRC} && ${COPYTREE_SHARE} server ${PREFIX}/${PORTNAME}/ ) - -post-install: - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME} + ( cd ${WRKSRC} && ${COPYTREE_SHARE} server ${STAGEDIR}${PREFIX}/${PORTNAME}/ ) .include <bsd.port.mk> diff --git a/security/easypg/Makefile b/security/easypg/Makefile index 8f60162d4c10..484f6060f336 100644 --- a/security/easypg/Makefile +++ b/security/easypg/Makefile @@ -3,7 +3,7 @@ PORTNAME= easypg PORTVERSION= 0.0.16 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= security elisp MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= epg/29289 @@ -17,31 +17,21 @@ RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg1 GNU_CONFIGURE= yes USE_EMACS= yes -NO_STAGE= yes +PORT_OPTIONS= DOCS +INFO= epa +PORTDOCS= ChangeLog NEWS README + .include <bsd.port.pre.mk> .if (${EMACS_PORT_NAME} == "emacs23") || (${EMACS_PORT_NAME} == "emacs24") || (${EMACS_PORT_NAME} == "emacs-devel") IGNORE= easyPG has been part of Emacs 23 and Emacs 24 .endif -INFO= epa -.if !defined(NOPORTDOCS) -PORTDOCS= ChangeLog NEWS README -.endif - do-install: - cd ${WRKSRC};\ - ${MKDIR} ${PREFIX}/${EMACS_SITE_LISPDIR}/epg;\ - ${INSTALL_DATA} *.el *.elc ${PREFIX}/${EMACS_SITE_LISPDIR}/epg - cd ${WRKSRC};\ - ${INSTALL_MAN} epa.info ${PREFIX}/${INFO_PATH} -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR};\ - cd ${WRKSRC};\ - ${INSTALL_MAN} ${PORTDOCS} ${DOCSDIR} -.endif - -post-install: - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/epg + ${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc ${PREFIX}/${EMACS_SITE_LISPDIR}/epg + ${INSTALL_MAN} ${WRKSRC}/epa.info ${STAGEDIR}${PREFIX}/${INFO_PATH} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.post.mk> diff --git a/security/f-prot/Makefile b/security/f-prot/Makefile index dd548d1523c4..1ef05fa2d385 100644 --- a/security/f-prot/Makefile +++ b/security/f-prot/Makefile @@ -3,6 +3,7 @@ PORTNAME= f-prot PORTVERSION= 6.5.1.5927 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ftp://ftp.i-scream.org/pub/ftp.f-prot.com/pub/bsd/ \ http://ftp.i-scream.org/pub/ftp.f-prot.com/pub/bsd/ @@ -17,49 +18,37 @@ WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes SUB_FILES= 900.fpupdate fpscan fpupdate -MAN1= fpscan.1 -MAN5= f-prot.conf.5 -MAN8= fpupdate.8 +PORT_OPTIONS= DOCS ONLY_FOR_ARCHS= i386 amd64 -NO_STAGE= yes do-install: - ${MKDIR} ${PREFIX}/libexec/${PORTNAME} - ${INSTALL_PROGRAM} ${WRKSRC}/fpscan ${PREFIX}/libexec/${PORTNAME} - ${INSTALL_PROGRAM} ${WRKSRC}/fpupdate ${PREFIX}/libexec/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/antivir.def ${PREFIX}/libexec/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/license.key ${PREFIX}/libexec/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/product.data ${PREFIX}/libexec/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/libexec/${PORTNAME} + @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/fpscan ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/fpupdate ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/antivir.def ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/license.key ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/product.data ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/f-prot.conf.default ${PREFIX}/etc/f-prot.conf.sample + ${INSTALL_DATA} ${WRKSRC}/f-prot.conf.default ${STAGEDIR}${PREFIX}/etc/f-prot.conf.sample - ${INSTALL_SCRIPT} ${WRKDIR}/fpscan ${PREFIX}/bin/fpscan - ${INSTALL_SCRIPT} ${WRKDIR}/fpupdate ${PREFIX}/bin/fpupdate + ${INSTALL_SCRIPT} ${WRKDIR}/fpscan ${STAGEDIR}${PREFIX}/bin/fpscan + ${INSTALL_SCRIPT} ${WRKDIR}/fpupdate ${STAGEDIR}${PREFIX}/bin/fpupdate - ${MKDIR} ${PREFIX}/etc/periodic/daily - ${INSTALL_SCRIPT} ${WRKDIR}/900.fpupdate ${PREFIX}/etc/periodic/daily + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily + ${INSTALL_SCRIPT} ${WRKDIR}/900.fpupdate ${STAGEDIR}${PREFIX}/etc/periodic/daily - ${INSTALL_MAN} ${WRKSRC}/doc/man/fpscan.1 ${MANPREFIX}/man/man1/ - ${INSTALL_MAN} ${WRKSRC}/doc/man/f-prot.conf.5 ${MANPREFIX}/man/man5/ - ${INSTALL_MAN} ${WRKSRC}/doc/man/fpupdate.8 ${MANPREFIX}/man/man8/ + ${INSTALL_MAN} ${WRKSRC}/doc/man/fpscan.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/man/f-prot.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/doc/man/fpupdate.8 ${STAGEDIR}${MANPREFIX}/man/man8 post-install: -.ifndef(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${CP} -R ${WRKSRC}/doc/html ${DOCSDIR} - ${CP} ${WRKSRC}/doc/CHANGES ${DOCSDIR} - ${CP} ${WRKSRC}/doc/LICENSE ${DOCSDIR} - ${CP} ${WRKSRC}/doc/LICENSE-FPAV ${DOCSDIR} - ${CP} ${WRKSRC}/doc/LICENSES-others ${DOCSDIR} -.endif - @if [ ! -f ${PREFIX}/etc/f-prot.conf ]; then \ - ${CP} -p ${PREFIX}/etc/f-prot.conf.sample ${PREFIX}/etc/f-prot.conf ; \ - fi - @if [ ! -e /etc/f-prot.conf ]; then \ - ${LN} -s ${PREFIX}/etc/f-prot.conf /etc/f-prot.conf ; \ - fi - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}) + ${CP} ${WRKSRC}/doc/CHANGES ${STAGEDIR}${DOCSDIR} + ${CP} ${WRKSRC}/doc/LICENSE ${STAGEDIR}${DOCSDIR} + ${CP} ${WRKSRC}/doc/LICENSE-FPAV ${STAGEDIR}${DOCSDIR} + ${CP} ${WRKSRC}/doc/LICENSES-others ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/security/f-prot/pkg-plist b/security/f-prot/pkg-plist index b5bc22c1e648..a842eec2d849 100644 --- a/security/f-prot/pkg-plist +++ b/security/f-prot/pkg-plist @@ -1,9 +1,7 @@ bin/fpscan bin/fpupdate @unexec if [ -L /etc/f-prot.conf ]; then rm /etc/f-prot.conf; fi -@unexec if cmp -s %D/etc/f-prot.conf.sample %D/etc/f-prot.conf; then rm -f %D/etc/f-prot.conf; fi -etc/f-prot.conf.sample -@exec if [ ! -f %D/etc/f-prot.conf ]; then cp -p %D/%F %B/f-prot.conf; fi +@sample etc/f-prot.conf.sample @exec if [ ! -e /etc/f-prot.conf ]; then ln -s %D/etc/f-prot.conf /etc/f-prot.conf; fi etc/periodic/daily/900.fpupdate libexec/f-prot/README @@ -12,6 +10,9 @@ libexec/f-prot/fpscan libexec/f-prot/fpupdate libexec/f-prot/license.key libexec/f-prot/product.data +man/man1/fpscan.1.gz +man/man5/f-prot.conf.5.gz +man/man8/fpupdate.8.gz %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/LICENSE-FPAV diff --git a/security/fakebo/Makefile b/security/fakebo/Makefile index 121d5d00c4ee..caa107dd8f22 100644 --- a/security/fakebo/Makefile +++ b/security/fakebo/Makefile @@ -3,6 +3,7 @@ PORTNAME= fakebo PORTVERSION= 0.4.2.1 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} @@ -17,22 +18,17 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} USE_AUTOTOOLS= aclocal autoheader automake autoconf AUTOMAKE_ARGS= --add-missing -MAN1= fakebo.1 -PORTDOCS= README custom.replies -PLIST_FILES= bin/fakebo etc/fakebo.conf.sample +PORT_OPTIONS= DOCS -NO_STAGE= yes post-extract: @${FIND} ${WRKSRC} -type l -delete do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/fakebo ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/fakebo.1 ${MANPREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/fakebo.conf.dist ${PREFIX}/etc/fakebo.conf.sample -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/custom.replies ${DOCSDIR} -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/fakebo ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/fakebo.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/fakebo.conf.dist ${STAGEDIR}${PREFIX}/etc/fakebo.conf.sample + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/custom.replies ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/security/fakebo/pkg-plist b/security/fakebo/pkg-plist new file mode 100644 index 000000000000..41d7e459b5a7 --- /dev/null +++ b/security/fakebo/pkg-plist @@ -0,0 +1,6 @@ +bin/fakebo +@sample etc/fakebo.conf.sample +man/man1/fakebo.1 +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/custom.replies +%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/security/fiked/Makefile b/security/fiked/Makefile index 4ed5f0d6d84a..1e30472a68f8 100644 --- a/security/fiked/Makefile +++ b/security/fiked/Makefile @@ -10,32 +10,31 @@ MASTER_SITES= http://mirror.roe.ch/dist/fiked/ MAINTAINER= ports@FreeBSD.org COMMENT= Fake IKE PSK+XAUTH daemon based on VPNC -LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt -.if !defined(WITHOUT_LIBNET) -LIB_DEPENDS+= net:${PORTSDIR}/net/libnet -.endif +LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt -USE_BZIP2= yes -USE_GMAKE= yes +USES= tar:bzip2 gmake + +OPTIONS_DEFINE= LIBNET +OPTIONS_DEFAULT=LIBNET +LIBNET_DESC= Build with libnet support + +LIBNET_LIB_DEPENDS= libnet.so:${PORTSDIR}/net/libnet MAKEFILE= GNUmakefile -PLIST_FILES= bin/fiked -MAN1= fiked.1 +PLIST_FILES= bin/fiked man/man1/fiked.1.gz PORTDOCS= README NEWS +PORT_OPTIONS= DOCS LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|=-g|=|' ${WRKSRC}/${MAKEFILE} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/fiked ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/fiked.1 ${PREFIX}/man/man1/ -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/fiked ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/fiked.1 ${STAGEDIR}${PREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> diff --git a/security/fwanalog/Makefile b/security/fwanalog/Makefile index 8e7223dfcb5c..8eba7800e9f3 100644 --- a/security/fwanalog/Makefile +++ b/security/fwanalog/Makefile @@ -3,7 +3,7 @@ PORTNAME= fwanalog PORTVERSION= 0.6.9 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MASTER_SITES= http://tud.at/programm/fwanalog/ @@ -12,8 +12,6 @@ COMMENT= Firewall log summarizer that uses Analog RUN_DEPENDS= analog:${PORTSDIR}/www/analog -ETCDIR= ${PREFIX}/etc/${PORTNAME} -PLIST_SUB+= ETCDIR=${ETCDIR} CONFFILES= fwanalog-dom.tab \ fwanalog.analog.conf \ fwanalog.analog.conf.local \ @@ -21,7 +19,8 @@ CONFFILES= fwanalog-dom.tab \ fwanalog.opts \ services.conf -NO_STAGE= yes +PORT_OPTIONS= DOCS + post-patch: ${REINPLACE_CMD} \ -e "s,the script's directory.*$$,${ETCDIR},;" \ @@ -34,17 +33,14 @@ do-build: ${LN} ${WRKSRC}/fwanalog.opts.freebsd ${WRKSRC}/fwanalog.opts do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/fwanalog.sh ${PREFIX}/sbin/fwanalog - ${MKDIR} ${ETCDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/fwanalog.sh ${STAGEDIR}${PREFIX}/sbin/fwanalog + @${MKDIR} ${STAGEDIR}${ETCDIR} .for i in ${CONFFILES} - ${INSTALL_DATA} ${WRKSRC}/${i} ${ETCDIR}/${i}-dist - ${TEST} -f ${ETCDIR}/${i} || ${INSTALL_DATA} ${WRKSRC}/${i} ${ETCDIR}/${i} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${ETCDIR}/${i}.sample .endfor post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif .include <bsd.port.mk> diff --git a/security/fwanalog/pkg-plist b/security/fwanalog/pkg-plist index 37f2acaa1dde..7f018ba38a08 100644 --- a/security/fwanalog/pkg-plist +++ b/security/fwanalog/pkg-plist @@ -1,22 +1,10 @@ sbin/fwanalog -@unexec if cmp -s %D/etc/fwanalog/fwanalog-dom.tab %D/etc/fwanalog/fwanalog-dom.tab-dist; then rm -f %D/etc/fwanalog/fwanalog-dom.tab; fi -etc/fwanalog/fwanalog-dom.tab-dist -@exec [ -f %B/fwanalog-dom.tab ] || cp %B/%f %B/fwanalog-dom.tab -@unexec if cmp -s %D/etc/fwanalog/fwanalog.analog.conf %D/etc/fwanalog/fwanalog.analog.conf-dist; then rm -f %D/etc/fwanalog/fwanalog.analog.conf; fi -etc/fwanalog/fwanalog.analog.conf-dist -@exec [ -f %B/fwanalog.analog.conf ] || cp %B/%f %B/fwanalog.analog.conf -@unexec if cmp -s %D/etc/fwanalog/fwanalog.analog.conf.local %D/etc/fwanalog/fwanalog.analog.conf.local-dist; then rm -f %D/etc/fwanalog/fwanalog.analog.conf.local; fi -etc/fwanalog/fwanalog.analog.conf.local-dist -@exec [ -f %B/fwanalog.analog.conf.local ] || cp %B/%f %B/fwanalog.analog.conf.local -@unexec if cmp -s %D/etc/fwanalog/fwanalog.lng %D/etc/fwanalog/fwanalog.lng-dist; then rm -f %D/etc/fwanalog/fwanalog.lng; fi -etc/fwanalog/fwanalog.lng-dist -@exec [ -f %B/fwanalog.lng ] || cp %B/%f %B/fwanalog.lng -@unexec if cmp -s %D/etc/fwanalog/fwanalog.opts %D/etc/fwanalog/fwanalog.opts-dist; then rm -f %D/etc/fwanalog/fwanalog.opts; fi -etc/fwanalog/fwanalog.opts-dist -@exec [ -f %B/fwanalog.opts ] || cp %B/%f %B/fwanalog.opts -@unexec if cmp -s %D/etc/fwanalog/services.conf %D/etc/fwanalog/services.conf-dist; then rm -f %D/etc/fwanalog/services.conf; fi -etc/fwanalog/services.conf-dist -@exec [ -f %B/services.conf ] || cp %B/%f %B/services.conf -%%PORTDOCS%%share/doc/fwanalog/README -%%PORTDOCS%%@dirrm share/doc/fwanalog -@unexec rmdir %D/etc/fwanalog 2> /dev/null || echo If permanently deleting this package, %%ETCDIR%%/fwanalog must be removed manually +@sample etc/fwanalog/fwanalog-dom.tab.sample +@sample etc/fwanalog/fwanalog.analog.conf.sample +@sample etc/fwanalog/fwanalog.analog.conf.local.sample +@sample etc/fwanalog/fwanalog.lng.sample +@sample etc/fwanalog/fwanalog.opts.sample +@sample etc/fwanalog/services.conf.sample +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@unexec rmdir %D/%%ETCDIR%% 2> /dev/null || echo If permanently deleting this package, %D/%%ETCDIR%% must be removed manually diff --git a/security/gcipher/Makefile b/security/gcipher/Makefile index e6a23e57412e..c262e531e669 100644 --- a/security/gcipher/Makefile +++ b/security/gcipher/Makefile @@ -3,7 +3,7 @@ PORTNAME= gcipher PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security gnome MASTER_SITES= SF @@ -18,7 +18,8 @@ USE_PYTHON= yes MAN1= gcipher.1 LICENSE_FILES= ${WRKSRC}/LICENSE -NO_STAGE= yes +PORT_OPTIONS= DOCS + post-patch: @${REINPLACE_CMD} -e \ '/^VERSION/s|=.*|= "${PORTVERSION}"|g ; \ @@ -33,29 +34,27 @@ do-build: @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/src do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/src/gcipher ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/gcipher.1 ${MANPREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/src/gcipher.desktop ${PREFIX}/share/applications - @${MKDIR} ${DATADIR}/lib - @(cd ${WRKSRC}/src && \ + ${INSTALL_SCRIPT} ${WRKSRC}/src/gcipher ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/gcipher.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/src/gcipher.desktop ${STAGEDIR}${PREFIX}/share/applications + @${MKDIR} ${STAGEDIR}${DATADIR}/lib + (cd ${WRKSRC}/src && \ ${FIND} . -name '*.glade' \ -o -name '*.gladep' \ -o -name '*.py' \ -o -name '*.pyc' \ -o -name '*.pyo' | \ - ${CPIO} -pdm -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/lib) - @${MKDIR} ${DATADIR}/plugins - @(cd ${WRKSRC}/plugins && \ + ${CPIO} -pdm -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}/lib) + @${MKDIR} ${STAGEDIR}${DATADIR}/plugins + (cd ${WRKSRC}/plugins && \ ${FIND} . -name '*.glade' \ -o -name '*.gladep' \ -o -name '*.py' | \ - ${CPIO} -pdm -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/plugins) - @${FIND} ${DATADIR} -type d | ${XARGS} ${CHMOD} a+rx - @${FIND} ${DATADIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE} -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @(cd ${WRKSRC} && \ - ${INSTALL_DATA} CONTRIB README ${DOCSDIR}) -.endif + ${CPIO} -pdm -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}/plugins) + ${FIND} ${STAGEDIR}${DATADIR} -type d | ${XARGS} ${CHMOD} a+rx + ${FIND} ${STAGEDIR}${DATADIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && \ + ${INSTALL_DATA} CONTRIB README ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> diff --git a/security/gcipher/pkg-plist b/security/gcipher/pkg-plist index 0d3d6cc8459f..e88c7303ae1d 100644 --- a/security/gcipher/pkg-plist +++ b/security/gcipher/pkg-plist @@ -1,4 +1,5 @@ bin/gcipher +man/man1/gcipher.1.gz share/applications/gcipher.desktop %%PORTDOCS%%%%DOCSDIR%%/CONTRIB %%PORTDOCS%%%%DOCSDIR%%/README diff --git a/security/gnome-password-generator/Makefile b/security/gnome-password-generator/Makefile index d5f2702dce4d..b176104701c7 100644 --- a/security/gnome-password-generator/Makefile +++ b/security/gnome-password-generator/Makefile @@ -13,14 +13,13 @@ COMMENT= GNOME 2 password generator USE_GNOME= pygnome2 USE_PYTHON= yes -NO_STAGE= yes do-build: @cd ${WRKSRC} && ${SED} -e 's|/usr/bin/python|${PYTHON_CMD}|g ; \ s|/usr/share|${PREFIX}/share|g' ${PORTNAME}.py > ${PORTNAME} do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/*.png ${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKSRC}/*.desktop ${PREFIX}/share/applications + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/*.png ${STAGEDIR}${PREFIX}/share/pixmaps + ${INSTALL_DATA} ${WRKSRC}/*.desktop ${STAGEDIR}${PREFIX}/share/applications .include <bsd.port.mk> diff --git a/security/gnome-ssh-askpass/Makefile b/security/gnome-ssh-askpass/Makefile index 02fbd1bf453e..9cdf69c3263b 100644 --- a/security/gnome-ssh-askpass/Makefile +++ b/security/gnome-ssh-askpass/Makefile @@ -21,11 +21,9 @@ PLIST_FILES= bin/gnome-ssh-askpass2 USES= pkgconfig USE_GNOME= gtk20 -NO_STAGE= yes -.include <bsd.port.pre.mk> CFLAGS+= ${PTHREAD_LIBS} do-install: - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gnome-ssh-askpass2 ${PREFIX}/bin + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gnome-ssh-askpass2 ${STAGEDIR}${PREFIX}/bin -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/gpasman/Makefile b/security/gpasman/Makefile index 9e3f41e8b6c1..06b5a8b69d09 100644 --- a/security/gpasman/Makefile +++ b/security/gpasman/Makefile @@ -16,8 +16,7 @@ USE_GNOME= gtk12 GNU_CONFIGURE= yes CONFIGURE_ENV= GTKCONFIG="${GTK_CONFIG}" -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/gpasman ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/src/gpasman ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/security/gpgdir/Makefile b/security/gpgdir/Makefile index fb9d0d433b48..baa64ddd5f88 100644 --- a/security/gpgdir/Makefile +++ b/security/gpgdir/Makefile @@ -20,12 +20,10 @@ NO_BUILD= yes USE_PERL5= run USES= perl5 -MAN1= gpgdir.1 -PLIST_FILES= bin/gpgdir +PLIST_FILES= bin/gpgdir man/man1/gpgdir.1.gz -NO_STAGE= yes do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/gpgdir ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/gpgdir.1 ${MANPREFIX}/man/man1/ + ${INSTALL_SCRIPT} ${WRKSRC}/gpgdir ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/gpgdir.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include <bsd.port.mk> diff --git a/security/hlfl/Makefile b/security/hlfl/Makefile index f813be379655..026f775fb62d 100644 --- a/security/hlfl/Makefile +++ b/security/hlfl/Makefile @@ -3,6 +3,7 @@ PORTNAME= hlfl PORTVERSION= 0.60.1 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ftp://ftp.hlfl.org/pub/hlfl/ @@ -11,18 +12,16 @@ COMMENT= High Level Firewall Language GNU_CONFIGURE= yes CONFIGURE_ARGS+= --datadir=${LOCALBASE}/share/doc -DOC_FILES= services.hlfl sample_1.hlfl sample_2.hlfl test.hlfl syntax.txt -MAN1= hlfl.1 +PORTDOCS= services.hlfl sample_1.hlfl sample_2.hlfl test.hlfl syntax.txt +PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz +PORT_OPTIONS= DOCS -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/hlfl ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/doc/${MAN1} ${PREFIX}/man/man1 -.if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/hlfl -.for i in ${DOC_FILES} - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/hlfl + ${INSTALL_PROGRAM} ${WRKSRC}/src/hlfl ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/doc/${MAN1} ${STAGEDIR}${PREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> diff --git a/security/hlfl/pkg-plist b/security/hlfl/pkg-plist deleted file mode 100644 index c933854ca8bd..000000000000 --- a/security/hlfl/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/hlfl -%%PORTDOCS%%share/doc/hlfl/services.hlfl -%%PORTDOCS%%share/doc/hlfl/sample_1.hlfl -%%PORTDOCS%%share/doc/hlfl/sample_2.hlfl -%%PORTDOCS%%share/doc/hlfl/test.hlfl -%%PORTDOCS%%share/doc/hlfl/syntax.txt -%%PORTDOCS%%@dirrm share/doc/hlfl diff --git a/security/honggfuzz/Makefile b/security/honggfuzz/Makefile index f9d1c9e09503..beae3f1788ca 100644 --- a/security/honggfuzz/Makefile +++ b/security/honggfuzz/Makefile @@ -13,21 +13,16 @@ COMMENT= General-purpose fuzzer with simple, command-line interface LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING -USE_GMAKE= yes +USES= gmake +PORT_OPTIONS= EXAMPLES # inplace replacement to remove relative binary path in examples scripts -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -i "" -E "s,\.\./,," ${WRKSRC}/examples/*.sh - -do-build: - @(cd ${WRKSRC}; ${GMAKE}) + ${REINPLACE_CMD} -i "" -E "s,\.\./,," ${WRKSRC}/examples/*.sh do-install: -.if !defined(NOPORTEXAMPLES) - @${MKDIR} ${EXAMPLESDIR} - @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}) -.endif ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + @${MKDIR} ${EXAMPLESDIR} + (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}) .include <bsd.port.mk> diff --git a/security/ifd-slb_rf60/Makefile b/security/ifd-slb_rf60/Makefile index 942eeb61ce01..c1adab34c3ea 100644 --- a/security/ifd-slb_rf60/Makefile +++ b/security/ifd-slb_rf60/Makefile @@ -13,28 +13,24 @@ COMMENT= PC/SC Lite driver for the Reflex 62 serial smart card reader LIB_DEPENDS= pcsclite.1:${PORTSDIR}/devel/pcsc-lite -USE_GMAKE= yes +USES= gmake CFLAGS+= -fPIC -PKGMESSAGE= ${WRKDIR}/pkg-message +SUB_LIST= pkg-message WRKSRC= ${WRKDIR}/${PORTNAME:S/^ifd-//} +PORT_OPTIONS= DOCS + PORTDOCS= README PLIST_FILES= lib/pcsc/drivers/libslb_rf60.so -NO_STAGE= yes do-install: - ${MKDIR} ${PREFIX}/lib/pcsc/drivers/ + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/pcsc/drivers/ ${INSTALL_DATA} ${WRKSRC}/libslb_rf60.so \ - ${PREFIX}/lib/pcsc/drivers/libslb_rf60.so + ${STAGEDIR}${PREFIX}/lib/pcsc/drivers post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif - @${SED} 's,%%PREFIX%%,${PREFIX},g' < ${FILESDIR}/pkg-message.in > \ - ${WRKDIR}/pkg-message - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/security/ipfcount/Makefile b/security/ipfcount/Makefile index de211c76f145..8feeb3c6f11f 100644 --- a/security/ipfcount/Makefile +++ b/security/ipfcount/Makefile @@ -3,7 +3,7 @@ PORTNAME= ipfcount PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://deathbeforedecaf.net/misc/ports/ \ http://users.netleader.com.au/~rob/ @@ -11,18 +11,15 @@ MASTER_SITES= http://deathbeforedecaf.net/misc/ports/ \ MAINTAINER= freebsd@deathbeforedecaf.net COMMENT= Summarise ipf logs by counting and sorting the fields -PLIST_FILES= bin/ipfcount -MAN1= ipfcount.1 +PLIST_FILES= bin/ipfcount man/man1/ipfcount.1.gz USES= perl5 -.if !defined(NOPORTDOCS) -PLIST_DIRS= %%EXAMPLESDIR%% -PLIST_FILES+= %%EXAMPLESDIR%%/100.ipfcount +PORT_OPTIONS= EXAMPLES + +PORTEXAMPLES= 100.ipfcount SUB_FILES= pkg-message -.endif -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e '1s,^#![^ ]*,#!${PERL},' ${WRKSRC}/ipfcount @@ -30,16 +27,9 @@ do-build: cd ${WRKSRC} && pod2man ipfcount > ipfcount.1 do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/ipfcount ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/ipfcount.1 ${PREFIX}/man/man1/ipfcount.1 -.if !defined(NOPORTDOCS) - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/100.ipfcount ${EXAMPLESDIR} -.endif - -post-install: -.if !defined(NOPORTDOCS) - @${CAT} ${PKGMESSAGE} -.endif + ${INSTALL_SCRIPT} ${WRKSRC}/ipfcount ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/ipfcount.1 ${STAGEDIR}${PREFIX}/man/man1 + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/100.ipfcount ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> diff --git a/security/ipfilter2dshield/Makefile b/security/ipfilter2dshield/Makefile index 4f9139018670..b7ccfd7923bb 100644 --- a/security/ipfilter2dshield/Makefile +++ b/security/ipfilter2dshield/Makefile @@ -3,6 +3,7 @@ PORTNAME= ipfilter2dshield PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.dshield.org/clients/ DISTNAME= dshield-freebsd.pl @@ -18,29 +19,21 @@ USES= perl5 PKGMESSAGE= ${WRKDIR}/pkg-message PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -NO_STAGE= yes +NO_BUILD= yes + do-extract: - [ -d ${WRKDIR} ] || ${MKDIR} ${WRKDIR} + @${MKDIR} ${WRKDIR} ${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}/${DISTNAME} -do-build: - pre-install: @${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \ -e "s=%%DISTNAME%%=${DISTNAME}=g" \ pkg-message > ${PKGMESSAGE} - @${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \ - -e "s=%%PORTNAME%%=${PORTNAME}=g" \ - -e "s=%%DISTNAME%%=${DISTNAME}=g" \ - pkg-deinstall > ${PKGDEINSTALL} do-install: - [ -d ${PREFIX}/etc/${PORTNAME} ] || ${MKDIR} ${PREFIX}/etc/${PORTNAME} - ${INSTALL} -o root -g wheel -m 644 ${WRKDIR}/${DISTNAME} \ - ${PREFIX}/etc/${PORTNAME}/${DISTNAME}.dist - ${INSTALL} -o root -g wheel -m 760 ${WRKDIR}/${DISTNAME} ${PREFIX}/sbin - -post-install: - @${CAT} ${PKGMESSAGE} + @${MKDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME} \ + ${STAGEDIR}${ETCDIR}/${DISTNAME}.sample + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 760 ${WRKDIR}/${DISTNAME} ${PREFIX}/sbin .include <bsd.port.mk> diff --git a/security/ipfilter2dshield/pkg-deinstall b/security/ipfilter2dshield/pkg-deinstall deleted file mode 100644 index 149470f97518..000000000000 --- a/security/ipfilter2dshield/pkg-deinstall +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -PREFIX=%%PREFIX%% -PORTNAME=%%PORTNAME%% -DISTNAME=%%DISTNAME%% - -# Restore the original script to undo any customization and thus -# to allow clean deinstallation. -# -if [ -f ${PREFIX}/etc/${PORTNAME}/${DISTNAME}.dist ]; then - install -o root -g wheel -m 760 \ - ${PREFIX}/etc/${PORTNAME}/${DISTNAME}.dist ${PREFIX}/sbin/${DISTNAME} -fi - -exit 0 diff --git a/security/ipfilter2dshield/pkg-plist b/security/ipfilter2dshield/pkg-plist index f329b7548949..db0eab4c1368 100644 --- a/security/ipfilter2dshield/pkg-plist +++ b/security/ipfilter2dshield/pkg-plist @@ -1,3 +1,3 @@ -etc/ipfilter2dshield/dshield-freebsd.pl.dist +@sample etc/ipfilter2dshield/dshield-freebsd.pl.sample sbin/dshield-freebsd.pl @dirrm etc/ipfilter2dshield diff --git a/security/jbrofuzz/Makefile b/security/jbrofuzz/Makefile index 5716d930d38a..ebe03b730734 100644 --- a/security/jbrofuzz/Makefile +++ b/security/jbrofuzz/Makefile @@ -19,23 +19,20 @@ WRKSRC= ${WRKDIR}/${PORTNAME} SUB_FILES= ${PORTNAME}.sh SUB_LIST= JAVA_CMD=${JAVA} JBROFUZZ=${PORTNAME} -NO_STAGE= yes +PORT_OPTIONS= DOCS EXAMPLES + .include <bsd.port.pre.mk> do-install: - ${MKDIR} ${JAVASHAREDIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/JBroFuzz.jar ${JAVASHAREDIR}/${PORTNAME}/${PORTNAME}.jar - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME} - ( cd ${WRKSRC}/fuzzers/ && ${COPYTREE_SHARE} . ${DATADIR}/fuzzers/ ) -.if !defined(NOPORTEXAMPLES) - ${MKDIR} ${EXAMPLESDIR} - ( cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR} ) -.endif -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -. for I in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${I} ${DOCSDIR} -. endfor -.endif + @${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/JBroFuzz.jar ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/${PORTNAME}.jar + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ( cd ${WRKSRC}/fuzzers/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/fuzzers/ ) + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ( cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} ) + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for I in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${I} ${STAGEDIR}${DOCSDIR} +.endfor .include <bsd.port.post.mk> diff --git a/security/kpcli/Makefile b/security/kpcli/Makefile index 51fc647cd0c5..d65ab8c20857 100644 --- a/security/kpcli/Makefile +++ b/security/kpcli/Makefile @@ -24,21 +24,17 @@ RUN_DEPENDS= p5-Crypt-Rijndael>=1.08:${PORTSDIR}/security/p5-Crypt-Rijndael \ BUILD_DEPENDS:= ${RUN_DEPENDS} USES= perl5 -MAN1= ${PORTNAME}.1 -MANCOMPRESSED= yes -PLIST_FILES= bin/kpcli +PLIST_FILES= bin/kpcli man/man1/${PORTNAME}.1.gz -NO_STAGE= yes do-extract: @${MKDIR} ${WRKSRC} - @${CP} ${DISTDIR}/${PORTNAME}-${PORTVERSION}.pl ${WRKSRC}/${PORTNAME} + ${CP} ${DISTDIR}/${PORTNAME}-${PORTVERSION}.pl ${WRKSRC}/${PORTNAME} do-build: ${LOCALBASE}/bin/pod2man ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.1 - ${GZIP_CMD} ${WRKSRC}/${PORTNAME}.1 do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1.gz ${MAN1PREFIX}/man/man1/ + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .include <bsd.port.mk> diff --git a/security/libbf/Makefile b/security/libbf/Makefile index aea4864e787c..3865f3c78aa1 100644 --- a/security/libbf/Makefile +++ b/security/libbf/Makefile @@ -20,21 +20,20 @@ MAKEFLAGS+= BF_ENC=bf_enc.o WRKSRC= ${WRKDIR}/bf -MYPORTDOCS= blowfish.doc COPYRIGHT README VERSION +PORT_OPTIONS= DOCS + +PORTDOCS= blowfish.doc COPYRIGHT README VERSION -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bfspeed ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/bftest ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/libblowfish.a ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/blowfish.h ${PREFIX}/include + ${INSTALL_PROGRAM} ${WRKSRC}/bfspeed ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/bftest ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/libblowfish.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/blowfish.h ${STAGEDIR}${PREFIX}/include post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for doc in ${MYPORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for doc in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> diff --git a/security/libbf/pkg-plist b/security/libbf/pkg-plist index d690cc373bc9..ccefecd6dae4 100644 --- a/security/libbf/pkg-plist +++ b/security/libbf/pkg-plist @@ -2,8 +2,3 @@ bin/bftest bin/bfspeed include/blowfish.h lib/libblowfish.a -%%PORTDOCS%%share/doc/libbf/COPYRIGHT -%%PORTDOCS%%share/doc/libbf/README -%%PORTDOCS%%share/doc/libbf/VERSION -%%PORTDOCS%%share/doc/libbf/blowfish.doc -%%PORTDOCS%%@dirrm share/doc/libbf diff --git a/security/mailzu/Makefile b/security/mailzu/Makefile index 96b7871e486e..134875d0399e 100644 --- a/security/mailzu/Makefile +++ b/security/mailzu/Makefile @@ -3,7 +3,7 @@ PORTNAME= mailzu DISTVERSION= 0.8rc3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/MailZu%200.8RC3 DISTNAME= MailZu_${DISTVERSION:S/rc/RC/} @@ -36,43 +36,23 @@ PGSQL_DESC= Use PostgreSQL database/auth storage backend IMAP_DESC= Use IMAP auth backend LDAP_DESC= Use LDAP auth backend -NO_STAGE= yes -.include <bsd.port.pre.mk> - -.if ${PORT_OPTIONS:MMYSQL} -USE_PHP+= mysql -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PHP+= pgsql -.endif - -.if ${PORT_OPTIONS:MIMAP} -USE_PHP+= imap -.endif - -.if ${PORT_OPTIONS:MLDAP} -USE_PHP+= ldap -.endif - -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= * -.endif +MYSQL_USE= PHP=mysql +PGSQL_USE= PHP=pgsql +IMAP_USE= PHP=imap +LDAP_USE= PHP=ldap do-install: - @${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} -m 755 ${WWWDIR} - @${INSTALL_DATA} ${WRKSRC}/*.php* ${WRKSRC}/*.js* ${WRKSRC}/*.css* ${WWWDIR} - @cd ${WRKSRC} && ${COPYTREE_SHARE} "config contrib img lang lib templates" \ - ${WWWDIR} "! -name *.orig" - @cd ${WRKSRC} && ${COPYTREE_BIN} scripts ${WWWDIR} + @${MKDIR} ${STAGEDIR}${WWWDIR} + ${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} ${WRKSRC}/*.php* ${WRKSRC}/*.js* ${WRKSRC}/*.css* ${STAGEDIR}${WWWDIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} "config contrib img lang lib templates" \ + ${STAGEDIR}${WWWDIR} "! -name *.orig") + (cd ${WRKSRC} && ${COPYTREE_BIN} scripts ${STAGEDIR}${WWWDIR}) post-install: -.if ${PORT_OPTIONS:MDOCS} - @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} - @${INSTALL_MAN} ${WRKSRC}/CHANGELOG ${WRKSRC}/README ${DOCSDIR} - @${INSTALL_MAN} ${WRKSRC}/docs/* ${DOCSDIR} -.endif - @${CHMOD} 644 ${WWWDIR}/config/config.php.sample - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR} + ${CHMOD} 644 ${STAGEDIR}${WWWDIR}/config/config.php.sample -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/mailzu/files/pkg-message.in b/security/mailzu/files/pkg-message.in index 8218fc8efd03..5b7aa7eebc69 100644 --- a/security/mailzu/files/pkg-message.in +++ b/security/mailzu/files/pkg-message.in @@ -6,8 +6,7 @@ Please read: %%DOCSDIR%%/INSTALL **************************************************** -Then, create and edit %%WWWDIR%%/config/config.php -An example is provided in %%WWWDIR%%/config/config.php.sample +Then, edit %%WWWDIR%%/config/config.php Also, please note that MailZu needs PHP's short_open_tag boolean to be "on" (this is detault in typical installations diff --git a/security/mailzu/pkg-plist b/security/mailzu/pkg-plist index dce44eaa3571..28916603dee0 100644 --- a/security/mailzu/pkg-plist +++ b/security/mailzu/pkg-plist @@ -1,5 +1,4 @@ -@unexec if [ -f %D/%%WWWDIR%%/config/config.php ] && cmp -s %D%/%%WWWDIR%%/config/config.php %D%/%%WWWDIR%%/config/config.php.sample; then rm -f %D%/%%WWWDIR%%/config/config.php; fi -%%WWWDIR%%/config/config.php.sample +@sample %%WWWDIR%%/config/config.php.sample %%WWWDIR%%/config/constants.php %%WWWDIR%%/config/index.html %%WWWDIR%%/config/init.php @@ -172,7 +171,6 @@ %%WWWDIR%%/templates/sendmail.template.php %%WWWDIR%%/templates/summary.template.php %%WWWDIR%%/templates/viewmail.template.php -@dirrmtry %%WWWDIR%%/config @dirrm %%WWWDIR%%/lib/pear/PEAR/Validator @dirrm %%WWWDIR%%/lib/pear/PEAR/Task/Windowseol @dirrm %%WWWDIR%%/lib/pear/PEAR/Task/Unixeol @@ -199,6 +197,7 @@ @dirrm %%WWWDIR%%/lib @dirrm %%WWWDIR%%/contrib/mysql @dirrm %%WWWDIR%%/contrib +@dirrmtry %%WWWDIR%%/config @dirrm %%WWWDIR%%/img @dirrm %%WWWDIR%%/lang @dirrm %%WWWDIR%%/scripts diff --git a/security/makepasswd/Makefile b/security/makepasswd/Makefile index e505ffb57724..46e3c08cc8d7 100644 --- a/security/makepasswd/Makefile +++ b/security/makepasswd/Makefile @@ -3,7 +3,7 @@ PORTNAME= makepasswd PORTVERSION= 1.10 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION}.orig @@ -22,28 +22,25 @@ NO_BUILD= yes USES= perl5 USE_PERL5= run +PORT_OPTIONS= DOCS + RUN_DEPENDS+= p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \ p5-Crypt-OpenSSL-Random>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-Random WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAN1= makepasswd.1 -DOCS= CHANGES README - -NO_STAGE= yes -.include <bsd.port.pre.mk> +PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz +PORTDOCS= CHANGES README post-patch: ${REINPLACE_CMD} -e "s/use bytes;/#use bytes;/" ${WRKSRC}/makepasswd do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/makepasswd ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${PREFIX}/man/man1 -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for file in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/makepasswd ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${STAGEDIR}${PREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for file in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/makepasswd/pkg-plist b/security/makepasswd/pkg-plist deleted file mode 100644 index 4f66536b1d9f..000000000000 --- a/security/makepasswd/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -bin/makepasswd -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% |