svn commit: r352710 - in head/security: afterglow aimsniff amap amap/files avcheck bruteforceblocker burpsuite chkrootkit clamav-unofficial-sigs clamav-unofficial-sigs/files cops cryptstring dirbus...

Adam Weinberger adamw at FreeBSD.org
Thu May 1 01:42:44 UTC 2014 

Author: adamw
Date: Thu May  1 01:42:38 2014
New Revision: 352710
URL: http://svnweb.freebsd.org/changeset/ports/352710
QAT: https://qat.redports.org/buildarchive/r352710/

Log:
  STAGE support, and general cleanups. Some of the changes are a
  bit more aggressive, but at this point, if I'm staging your port,
  you've likely stopped caring what's done to it.

Added:
  head/security/fakebo/pkg-plist   (contents, props changed)
Deleted:
  head/security/amap/files/pkg-deinstall.in
  head/security/amap/files/pkg-install.in
  head/security/hlfl/pkg-plist
  head/security/ipfilter2dshield/pkg-deinstall
  head/security/makepasswd/pkg-plist
Modified:
  head/security/afterglow/Makefile
  head/security/aimsniff/Makefile
  head/security/amap/Makefile
  head/security/amap/pkg-plist
  head/security/avcheck/Makefile
  head/security/bruteforceblocker/Makefile
  head/security/bruteforceblocker/pkg-plist
  head/security/burpsuite/Makefile
  head/security/chkrootkit/Makefile
  head/security/clamav-unofficial-sigs/Makefile
  head/security/clamav-unofficial-sigs/files/pkg-message.in
  head/security/clamav-unofficial-sigs/pkg-plist
  head/security/cops/Makefile
  head/security/cryptstring/Makefile
  head/security/dirbuster/Makefile
  head/security/dradis/Makefile
  head/security/easypg/Makefile
  head/security/f-prot/Makefile
  head/security/f-prot/pkg-plist
  head/security/fakebo/Makefile
  head/security/fiked/Makefile
  head/security/fwanalog/Makefile
  head/security/fwanalog/pkg-plist
  head/security/gcipher/Makefile
  head/security/gcipher/pkg-plist
  head/security/gnome-password-generator/Makefile
  head/security/gnome-ssh-askpass/Makefile
  head/security/gpasman/Makefile
  head/security/gpgdir/Makefile
  head/security/hlfl/Makefile
  head/security/honggfuzz/Makefile
  head/security/ifd-slb_rf60/Makefile
  head/security/ipfcount/Makefile
  head/security/ipfilter2dshield/Makefile
  head/security/ipfilter2dshield/pkg-plist
  head/security/jbrofuzz/Makefile
  head/security/kpcli/Makefile
  head/security/libbf/Makefile
  head/security/libbf/pkg-plist
  head/security/mailzu/Makefile
  head/security/mailzu/files/pkg-message.in
  head/security/mailzu/pkg-plist
  head/security/makepasswd/Makefile

Modified: head/security/afterglow/Makefile
==============================================================================
--- head/security/afterglow/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/afterglow/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -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>

Modified: head/security/aimsniff/Makefile
==============================================================================
--- head/security/aimsniff/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/aimsniff/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -20,6 +20,7 @@ RUN_DEPENDS=	p5-Net-Pcap>=0:${PORTSDIR}/
 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>

Modified: head/security/amap/Makefile
==============================================================================
--- head/security/amap/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/amap/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -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>

Modified: head/security/amap/pkg-plist
==============================================================================
--- head/security/amap/pkg-plist	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/amap/pkg-plist	Thu May  1 01:42:38 2014	(r352710)
@@ -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
- at dirrm %%AMAPLIBDIR%%
- at dirrm %%AMAPINCDIR%%
+ at sample %%ETCDIR%%/appdefs.resp.sample
+ at sample %%ETCDIR%%/appdefs.rpc.sample
+ at 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
+ at dirrm lib/amap
+ at dirrm include/amap
 @dirrmtry etc/amap

Modified: head/security/avcheck/Makefile
==============================================================================
--- head/security/avcheck/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/avcheck/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -9,30 +9,28 @@ MASTER_SITES=	http://www.corpit.ru/ftp/a
 MAINTAINER=	dsh at 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
 

Modified: head/security/bruteforceblocker/Makefile
==============================================================================
--- head/security/bruteforceblocker/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/bruteforceblocker/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -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>

Modified: head/security/bruteforceblocker/pkg-plist
==============================================================================
--- head/security/bruteforceblocker/pkg-plist	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/bruteforceblocker/pkg-plist	Thu May  1 01:42:38 2014	(r352710)
@@ -2,7 +2,5 @@
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at 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
- at exec if [ ! -f %D/etc/bruteforceblocker.conf ] ; then cp -p %D/%F %B/bruteforceblocker.conf; fi
+ at sample etc/bruteforceblocker.conf.sample
 sbin/bruteforceblocker

Modified: head/security/burpsuite/Makefile
==============================================================================
--- head/security/burpsuite/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/burpsuite/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -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>

Modified: head/security/chkrootkit/Makefile
==============================================================================
--- head/security/chkrootkit/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/chkrootkit/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -16,6 +16,8 @@ MASTER_SITES=	ftp://ftp.pangeia.com.br/p
 MAINTAINER=	cordeiro at 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>

Modified: head/security/clamav-unofficial-sigs/Makefile
==============================================================================
--- head/security/clamav-unofficial-sigs/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/clamav-unofficial-sigs/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -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>

Modified: head/security/clamav-unofficial-sigs/files/pkg-message.in
==============================================================================
--- head/security/clamav-unofficial-sigs/files/pkg-message.in	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/clamav-unofficial-sigs/files/pkg-message.in	Thu May  1 01:42:38 2014	(r352710)
@@ -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
 

Modified: head/security/clamav-unofficial-sigs/pkg-plist
==============================================================================
--- head/security/clamav-unofficial-sigs/pkg-plist	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/clamav-unofficial-sigs/pkg-plist	Thu May  1 01:42:38 2014	(r352710)
@@ -1,5 +1,6 @@
 bin/clamav-unofficial-sigs.sh
-etc/clamav-unofficial-sigs.conf.sample
+ at sample etc/clamav-unofficial-sigs.conf.sample
+man/man8/clamav-unofficial-sigs.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE

Modified: head/security/cops/Makefile
==============================================================================
--- head/security/cops/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/cops/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -24,7 +24,6 @@ C_SRC=		home.chk.c user.chk.c is_able.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>

Modified: head/security/cryptstring/Makefile
==============================================================================
--- head/security/cryptstring/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/cryptstring/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -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>

Modified: head/security/dirbuster/Makefile
==============================================================================
--- head/security/dirbuster/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/dirbuster/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -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>

Modified: head/security/dradis/Makefile
==============================================================================
--- head/security/dradis/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/dradis/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -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>

Modified: head/security/easypg/Makefile
==============================================================================
--- head/security/easypg/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/easypg/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -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/gn
 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>

Modified: head/security/f-prot/Makefile
==============================================================================
--- head/security/f-prot/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/f-prot/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -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}
-
-	${INSTALL_DATA} ${WRKSRC}/f-prot.conf.default ${PREFIX}/etc/f-prot.conf.sample
-
-	${INSTALL_SCRIPT} ${WRKDIR}/fpscan ${PREFIX}/bin/fpscan
-	${INSTALL_SCRIPT} ${WRKDIR}/fpupdate ${PREFIX}/bin/fpupdate
-
-	${MKDIR} ${PREFIX}/etc/periodic/daily
-	${INSTALL_SCRIPT} ${WRKDIR}/900.fpupdate ${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/
+	@${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 ${STAGEDIR}${PREFIX}/etc/f-prot.conf.sample
+
+	${INSTALL_SCRIPT} ${WRKDIR}/fpscan ${STAGEDIR}${PREFIX}/bin/fpscan
+	${INSTALL_SCRIPT} ${WRKDIR}/fpupdate ${STAGEDIR}${PREFIX}/bin/fpupdate
+
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
+	${INSTALL_SCRIPT} ${WRKDIR}/900.fpupdate ${STAGEDIR}${PREFIX}/etc/periodic/daily
+
+	${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>

Modified: head/security/f-prot/pkg-plist
==============================================================================
--- head/security/f-prot/pkg-plist	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/f-prot/pkg-plist	Thu May  1 01:42:38 2014	(r352710)
@@ -1,9 +1,7 @@
 bin/fpscan
 bin/fpupdate
 @unexec if [ -L /etc/f-prot.conf ]; then rm /etc/f-prot.conf; fi
- at 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
- at exec if [ ! -f %D/etc/f-prot.conf ]; then cp -p %D/%F %B/f-prot.conf; fi
+ at 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

Modified: head/security/fakebo/Makefile
==============================================================================
--- head/security/fakebo/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/fakebo/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -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}-${PORTVER
 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>

Added: head/security/fakebo/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/fakebo/pkg-plist	Thu May  1 01:42:38 2014	(r352710)
@@ -0,0 +1,6 @@
+bin/fakebo
+ at sample etc/fakebo.conf.sample
+man/man1/fakebo.1
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/custom.replies
+%%PORTDOCS%%@dirrm %%DOCSDIR%%

Modified: head/security/fiked/Makefile
==============================================================================
--- head/security/fiked/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/fiked/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -10,32 +10,31 @@ MASTER_SITES=	http://mirror.roe.ch/dist/
 MAINTAINER=	ports at 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>

Modified: head/security/fwanalog/Makefile
==============================================================================
--- head/security/fwanalog/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/fwanalog/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -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 us
 
 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>

Modified: head/security/fwanalog/pkg-plist
==============================================================================
--- head/security/fwanalog/pkg-plist	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/fwanalog/pkg-plist	Thu May  1 01:42:38 2014	(r352710)
@@ -1,22 +1,10 @@
 sbin/fwanalog
- at 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
- at exec [ -f %B/fwanalog-dom.tab ] || cp %B/%f %B/fwanalog-dom.tab
- at 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
- at exec [ -f %B/fwanalog.analog.conf ] || cp %B/%f %B/fwanalog.analog.conf
- at 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
- at exec [ -f %B/fwanalog.analog.conf.local ] || cp %B/%f %B/fwanalog.analog.conf.local
- at 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
- at exec [ -f %B/fwanalog.lng ] || cp %B/%f %B/fwanalog.lng
- at 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
- at exec [ -f %B/fwanalog.opts ] || cp %B/%f %B/fwanalog.opts
- at 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
- at exec [ -f %B/services.conf ] || cp %B/%f %B/services.conf
-%%PORTDOCS%%share/doc/fwanalog/README
-%%PORTDOCS%%@dirrm share/doc/fwanalog
- at unexec rmdir %D/etc/fwanalog 2> /dev/null || echo If permanently deleting this package, %%ETCDIR%%/fwanalog must be removed manually
+ at sample etc/fwanalog/fwanalog-dom.tab.sample
+ at sample etc/fwanalog/fwanalog.analog.conf.sample
+ at sample etc/fwanalog/fwanalog.analog.conf.local.sample
+ at sample etc/fwanalog/fwanalog.lng.sample
+ at sample etc/fwanalog/fwanalog.opts.sample
+ at sample etc/fwanalog/services.conf.sample
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at unexec rmdir %D/%%ETCDIR%% 2> /dev/null || echo If permanently deleting this package, %D/%%ETCDIR%% must be removed manually

Modified: head/security/gcipher/Makefile
==============================================================================
--- head/security/gcipher/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/gcipher/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -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>

Modified: head/security/gcipher/pkg-plist
==============================================================================
--- head/security/gcipher/pkg-plist	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/gcipher/pkg-plist	Thu May  1 01:42:38 2014	(r352710)
@@ -1,4 +1,5 @@
 bin/gcipher
+man/man1/gcipher.1.gz
 share/applications/gcipher.desktop
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIB
 %%PORTDOCS%%%%DOCSDIR%%/README

Modified: head/security/gnome-password-generator/Makefile
==============================================================================
--- head/security/gnome-password-generator/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/gnome-password-generator/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -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>

Modified: head/security/gnome-ssh-askpass/Makefile
==============================================================================
--- head/security/gnome-ssh-askpass/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/gnome-ssh-askpass/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -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>

Modified: head/security/gpasman/Makefile
==============================================================================
--- head/security/gpasman/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/gpasman/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -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>

Modified: head/security/gpgdir/Makefile
==============================================================================
--- head/security/gpgdir/Makefile	Thu May  1 01:31:06 2014	(r352709)
+++ head/security/gpgdir/Makefile	Thu May  1 01:42:38 2014	(r352710)
@@ -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 OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list