6 files changed, 38 insertions, 30 deletions

diff --git a/security/fwtk/Makefile b/security/fwtk/Makefile
index a0dc15100d8a..66eb5249d09a 100644
--- a/security/fwtk/Makefile
+++ b/security/fwtk/Makefile
@@ -56,13 +56,21 @@ pre-configure:
 post-install:
 	cd ${PREFIX}/libexec ; strip ${SBIN_BINS} ${LIBEXEC_BINS}
 	cd ${PREFIX}/libexec ; ${MV} ${SBIN_BINS} mqueue ../sbin
-	${MKDIR} ${PREFIX}/share/doc/fwtk
-	${INSTALL_MAN} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/fwtk
-	cd ${WRKSRC}/doc/man ; ${INSTALL_MAN} ${MAN3} ${PREFIX}/man/man3
-	cd ${WRKSRC}/doc/man ; ${INSTALL_MAN} ${MAN5} ${PREFIX}/man/man5
-	cd ${WRKSRC}/doc/man ; ${INSTALL_MAN} ${MAN8} ${PREFIX}/man/man8
+.for man in ${MAN3}
+	@${INSTALL_MAN} ${WRKSRC}/doc/man/${man} ${PREFIX}/man/man3
+.endfor
+.for man in ${MAN5}
+	@${INSTALL_MAN} ${WRKSRC}/doc/man/${man} ${PREFIX}/man/man5
+.endfor
+.for man in ${MAN8}
+	@${INSTALL_MAN} ${WRKSRC}/doc/man/${man} ${PREFIX}/man/man8
+.endfor
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC}/doc ; ${INSTALL_MAN} ${DOCS} ${PREFIX}/share/doc/fwtk
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
+.for files in ${DOCS}
+	@${INSTALL_DATA} ${WRKSRC}/doc/${files} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/fwtk/pkg-plist b/security/fwtk/pkg-plist
index de46bf9ec8bc..632e964f3c2c 100644
--- a/security/fwtk/pkg-plist
+++ b/security/fwtk/pkg-plist
@@ -1,8 +1,4 @@
-@comment $FreeBSD$
-sbin/authdump
-sbin/authload
-sbin/authmgr
-sbin/mqueue
+etc/netperm-table
 libexec/authsrv
 libexec/ftp-gw
 libexec/http-gw
@@ -13,11 +9,15 @@ libexec/smap
 libexec/smapd
 libexec/tn-gw
 libexec/x-gw
-etc/netperm-table
-share/doc/fwtk/LICENSE
-share/doc/fwtk/admin_guide.ps
-share/doc/fwtk/manpages.ps
-share/doc/fwtk/overview.ps
-share/doc/fwtk/presentation.ps
-share/doc/fwtk/sample-report.txt
-share/doc/fwtk/user_guide.ps
+sbin/authdump
+sbin/authload
+sbin/authmgr
+sbin/mqueue
+%%PORTDOCS%%share/doc/fwtk/LICENSE
+%%PORTDOCS%%share/doc/fwtk/admin_guide.ps
+%%PORTDOCS%%share/doc/fwtk/manpages.ps
+%%PORTDOCS%%share/doc/fwtk/overview.ps
+%%PORTDOCS%%share/doc/fwtk/presentation.ps
+%%PORTDOCS%%share/doc/fwtk/sample-report.txt
+%%PORTDOCS%%share/doc/fwtk/user_guide.ps
+%%PORTDOCS%%@dirrm share/doc/fwtk
diff --git a/security/openssl-beta/pkg-plist b/security/openssl-beta/pkg-plist
index 071c42297585..c0c7e4a028ed 100644
--- a/security/openssl-beta/pkg-plist
+++ b/security/openssl-beta/pkg-plist
@@ -70,7 +70,7 @@ openssl/misc/c_issuer
 openssl/misc/c_name
 openssl/misc/der_chop
 openssl/openssl.cnf.sample
-share/doc/openssl/openssl.txt
+%%PORTDOCS%%share/doc/openssl/openssl.txt
 @dirrm include/openssl
 @dirrm openssl/certs
 @dirrm openssl/lib
@@ -82,4 +82,4 @@ share/doc/openssl/openssl.txt
 @dirrm openssl/misc
 @dirrm openssl/private
 @dirrm openssl
-@dirrm share/doc/openssl
+%%PORTDOCS%%@dirrm share/doc/openssl
diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist
index 071c42297585..c0c7e4a028ed 100644
--- a/security/openssl/pkg-plist
+++ b/security/openssl/pkg-plist
@@ -70,7 +70,7 @@ openssl/misc/c_issuer
 openssl/misc/c_name
 openssl/misc/der_chop
 openssl/openssl.cnf.sample
-share/doc/openssl/openssl.txt
+%%PORTDOCS%%share/doc/openssl/openssl.txt
 @dirrm include/openssl
 @dirrm openssl/certs
 @dirrm openssl/lib
@@ -82,4 +82,4 @@ share/doc/openssl/openssl.txt
 @dirrm openssl/misc
 @dirrm openssl/private
 @dirrm openssl
-@dirrm share/doc/openssl
+%%PORTDOCS%%@dirrm share/doc/openssl
diff --git a/security/vpnd/Makefile b/security/vpnd/Makefile
index 86ef97a6cc2c..9bc478064c55 100644
--- a/security/vpnd/Makefile
+++ b/security/vpnd/Makefile
@@ -31,9 +31,9 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/vpnd.conf ${PREFIX}/etc/vpnd.conf.sample
 	@${INSTALL_DATA} ${WRKSRC}/vpnd.chat ${PREFIX}/etc/vpnd.chat.sample
 .if !defined(NOPORTDOCS)
-	${INSTALL} -d -m 555 ${PREFIX}/share/doc/vpnd
+	@${MKDIR} ${DOCSDIR}
 .for i in ${DOCFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/vpnd
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/security/vpnd/pkg-plist b/security/vpnd/pkg-plist
index e688d3c32941..ee2d8c4ff9c4 100644
--- a/security/vpnd/pkg-plist
+++ b/security/vpnd/pkg-plist
@@ -1,8 +1,8 @@
 sbin/vpnd
 etc/vpnd.conf.sample
 etc/vpnd.chat.sample
-share/doc/vpnd/README
-share/doc/vpnd/FAQ.TXT
-share/doc/vpnd/SPEED.TXT
-share/doc/vpnd/VERSIONS
-@dirrm share/doc/vpnd
+%%PORTDOCS%%share/doc/vpnd/README
+%%PORTDOCS%%share/doc/vpnd/FAQ.TXT
+%%PORTDOCS%%share/doc/vpnd/SPEED.TXT
+%%PORTDOCS%%share/doc/vpnd/VERSIONS
+%%PORTDOCS%%@dirrm share/doc/vpnd