17 files changed, 15 insertions, 37 deletions

diff --git a/security/aimsniff/Makefile b/security/aimsniff/Makefile
index 5bebf3ff0421..a9722eb2b569 100644
--- a/security/aimsniff/Makefile
+++ b/security/aimsniff/Makefile
@@ -37,7 +37,7 @@ do-install:
 	${CHMOD} u+s ${STAGEDIR}${PREFIX}/bin/aimsniff
 .endif
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR}
diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile
index 783c770a6c30..8614b756ae90 100644
--- a/security/ca_root_nss/Makefile
+++ b/security/ca_root_nss/Makefile
@@ -57,8 +57,6 @@ do-build:	apply-slist
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${CERTDIR}
 	${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/${CERTDIR}
-
-post-install:
 .if ${PORT_OPTIONS:METCSYMLINK}
 	${MKDIR} ${STAGEDIR}/etc/ssl
 	${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}/etc/ssl/cert.pem
diff --git a/security/cryptlib/Makefile b/security/cryptlib/Makefile
index da02c6340c8e..14ca85711ab6 100644
--- a/security/cryptlib/Makefile
+++ b/security/cryptlib/Makefile
@@ -38,7 +38,7 @@ do-install:
 	${LN} -sf libcl.so.3 ${STAGEDIR}${PREFIX}/lib/libcl.so
 	${INSTALL_DATA} ${WRKSRC}/cryptlib.h ${STAGEDIR}${PREFIX}/include
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
diff --git a/security/f-prot/Makefile b/security/f-prot/Makefile
index a7dbfb447296..ad2edb193008 100644
--- a/security/f-prot/Makefile
+++ b/security/f-prot/Makefile
@@ -42,7 +42,7 @@ do-install:
 	${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:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 	${CP} ${WRKSRC}/doc/CHANGES ${STAGEDIR}${DOCSDIR}
diff --git a/security/fakeident/Makefile b/security/fakeident/Makefile
index e30281fe8e0a..6b45c658507c 100644
--- a/security/fakeident/Makefile
+++ b/security/fakeident/Makefile
@@ -24,7 +24,4 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/identd ${STAGEDIR}${PREFIX}/sbin
 
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/identd
-
 .include <bsd.port.mk>
diff --git a/security/fwanalog/Makefile b/security/fwanalog/Makefile
index e1a53a8b98fb..2a4e03e3e9c3 100644
--- a/security/fwanalog/Makefile
+++ b/security/fwanalog/Makefile
@@ -39,7 +39,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${ETCDIR}/${i}.sample
 .endfor
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
diff --git a/security/gorilla/Makefile b/security/gorilla/Makefile
index 0517154e91e4..15d22c41c5c9 100644
--- a/security/gorilla/Makefile
+++ b/security/gorilla/Makefile
@@ -69,8 +69,6 @@ do-install:
 		${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${dir}
 .endfor
 	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
-post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README			\
 		${WRKSRC}/sources/README.install-from-source	\
diff --git a/security/keybase/Makefile b/security/keybase/Makefile
index 04f7745a5c86..52cad575cd3b 100644
--- a/security/keybase/Makefile
+++ b/security/keybase/Makefile
@@ -37,9 +37,7 @@ do-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${KEYBASE_PREFIX}/lib/node_modules/${PORTNAME})
 	${CHMOD} +x ${STAGEDIR}${KEYBASE_PREFIX}/lib/node_modules/${PORTNAME}/bin/main.js
 	${LN} -s ${KEYBASE_PREFIX}/lib/node_modules/${PORTNAME}/bin/main.js ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
-# Quiet stage-qa
-post-install:
+	# Quiet stage-qa
 	@${RM} ${STAGEDIR}${KEYBASE_PREFIX}/lib/node_modules/keybase/node_modules/request/node_modules/node-uuid/benchmark/bench.sh
 
 .include <bsd.port.mk>
diff --git a/security/letsencrypt.sh/Makefile b/security/letsencrypt.sh/Makefile
index e372b6c71a7b..7513f37a9f1d 100644
--- a/security/letsencrypt.sh/Makefile
+++ b/security/letsencrypt.sh/Makefile
@@ -61,7 +61,6 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PERIODIC_FILES} ${STAGEDIR}${PREFIX}/${PERIODIC_DIRS}/${PERIODIC_FILES}
 
-post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 .	for d in dns-verification domains_txt ecc hook_chain import-from-official-client \
diff --git a/security/libbf/Makefile b/security/libbf/Makefile
index 2a1a95914e7a..7b011dd09476 100644
--- a/security/libbf/Makefile
+++ b/security/libbf/Makefile
@@ -30,7 +30,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/libblowfish.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/blowfish.h ${STAGEDIR}${PREFIX}/include
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
diff --git a/security/openvpn-auth-radius/Makefile b/security/openvpn-auth-radius/Makefile
index 0dc3700d335e..81200a77027d 100644
--- a/security/openvpn-auth-radius/Makefile
+++ b/security/openvpn-auth-radius/Makefile
@@ -32,14 +32,11 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/radiusplugin.so ${STAGEDIR}${LOCALBASE}/lib
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/radiusplugin.cnf ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/security/retranslator/Makefile b/security/retranslator/Makefile
index 0b50c588f2e3..e0b2f7a6bef5 100644
--- a/security/retranslator/Makefile
+++ b/security/retranslator/Makefile
@@ -30,8 +30,6 @@ do-configure:
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}.bin \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
-post-install:
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf \
 		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 
diff --git a/security/rkhunter/Makefile b/security/rkhunter/Makefile
index fae6d5578468..ff9b1a6f6f97 100644
--- a/security/rkhunter/Makefile
+++ b/security/rkhunter/Makefile
@@ -43,8 +43,6 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/415.${PORTNAME} ${STAGEDIR}${PREFIX}/etc/periodic/security
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/files/|} ${STAGEDIR}${DOCSDIR}
-
-post-install:
 	@${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||g' \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf
 	${INSTALL_DATA} ${WRKSRC}/files/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
diff --git a/security/softether/Makefile b/security/softether/Makefile
index 598c07fd08dc..97be83a81ea6 100644
--- a/security/softether/Makefile
+++ b/security/softether/Makefile
@@ -68,17 +68,14 @@ post-extract:
 # into ${PREFIX}/sbin
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/softether
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnbridge/vpnbridge ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnbridge
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnclient/vpnclient ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnclient
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpncmd/vpncmd ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpncmd
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnserver/vpnserver ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnserver
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vpnbridge/vpnbridge ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnbridge
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vpnclient/vpnclient ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnclient
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vpncmd/vpncmd ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpncmd
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vpnserver/vpnserver ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnserver
 	${INSTALL_DATA} ${WRKSRC}/bin/vpnserver/hamcore.se2 ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/hamcore.se2
 	${INSTALL_SCRIPT} ${WRKDIR}/vpncmd ${STAGEDIR}/${PREFIX}/sbin/vpncmd
 
-post-install:
-.for i in vpnbridge vpnclient vpncmd vpnserver
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/${i}
-.endfor
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
diff --git a/security/vnccrack/Makefile b/security/vnccrack/Makefile
index 5daa25c1e64e..61f8b29c7e5f 100644
--- a/security/vnccrack/Makefile
+++ b/security/vnccrack/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFINE=	DOCS
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vnccrack ${STAGEDIR}${PREFIX}/bin
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}
 
diff --git a/security/webfwlog/Makefile b/security/webfwlog/Makefile
index cdd98c6d2bcd..29c88b3e9b2a 100644
--- a/security/webfwlog/Makefile
+++ b/security/webfwlog/Makefile
@@ -79,7 +79,7 @@ do-install:
 	@${ECHO} "Installed mysql shared library in ${MYSQL_PLUGIN_DIR}"
 .endif
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/mysql
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/pgsql
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/examples
diff --git a/security/yafic/Makefile b/security/yafic/Makefile
index 1e2d41709285..5961b8434d71 100644
--- a/security/yafic/Makefile
+++ b/security/yafic/Makefile
@@ -39,8 +39,6 @@ do-install:
 	${LN} -sf yafic-sign.1 ${STAGEDIR}${PREFIX}/man/man1/yafic-check.1
 .endif
 	${INSTALL_MAN} ${WRKSRC}/yafic.conf.5 ${STAGEDIR}${PREFIX}/man/man5
-
-post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/yafic
 	@${CP} ${FILESDIR}/yafic.conf.sample ${STAGEDIR}${EXAMPLESDIR}