- PORTDOCS police

- DOCSDIR support to some
- Brush out some lint

23 files changed, 108 insertions, 109 deletions

diff --git a/net-im/climm/pkg-plist b/net-im/climm/pkg-plist
index 7e7cd2aacb55..a13e44e499b4 100644
--- a/net-im/climm/pkg-plist
+++ b/net-im/climm/pkg-plist
@@ -1,4 +1,4 @@
 bin/micq
-share/doc/micq/CHANGELOG
-share/doc/micq/README
-@dirrm share/doc/micq
+%%PORTDOCS%%share/doc/micq/CHANGELOG
+%%PORTDOCS%%share/doc/micq/README
+%%PORTDOCS%%@dirrm share/doc/micq
diff --git a/net-im/micq/pkg-plist b/net-im/micq/pkg-plist
index 7e7cd2aacb55..a13e44e499b4 100644
--- a/net-im/micq/pkg-plist
+++ b/net-im/micq/pkg-plist
@@ -1,4 +1,4 @@
 bin/micq
-share/doc/micq/CHANGELOG
-share/doc/micq/README
-@dirrm share/doc/micq
+%%PORTDOCS%%share/doc/micq/CHANGELOG
+%%PORTDOCS%%share/doc/micq/README
+%%PORTDOCS%%@dirrm share/doc/micq
diff --git a/net-mgmt/dhcpconf/Makefile b/net-mgmt/dhcpconf/Makefile
index a5d909e42100..4b93e7c04f8a 100644
--- a/net-mgmt/dhcpconf/Makefile
+++ b/net-mgmt/dhcpconf/Makefile
@@ -24,8 +24,8 @@ MAKE_ENV+=	PCFLAGS="${CFLAGS}"
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/dhcp-conf ${PREFIX}/sbin/dhcpconf
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/dhcpconf
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/dhcpconf
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/dhcpconf/pkg-plist b/net-mgmt/dhcpconf/pkg-plist
index 7be764c6360f..c68bedef941e 100644
--- a/net-mgmt/dhcpconf/pkg-plist
+++ b/net-mgmt/dhcpconf/pkg-plist
@@ -1,3 +1,3 @@
 sbin/dhcpconf
-share/dhcpconf/README
-@dirrm share/dhcpconf
+%%PORTDOCS%%share/doc/dhcpconf/README
+%%PORTDOCS%%@dirrm share/doc/dhcpconf
diff --git a/net-mgmt/trafd/Makefile b/net-mgmt/trafd/Makefile
index 4364e0c031ae..c2f800d602ef 100644
--- a/net-mgmt/trafd/Makefile
+++ b/net-mgmt/trafd/Makefile
@@ -26,8 +26,8 @@ do-install:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/trafd
-	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/trafd/README
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 	${MKDIR} ${PREFIX}/var/trafd
 	${MKDIR} ${PREFIX}/var/log
diff --git a/net-mgmt/trafd/pkg-plist b/net-mgmt/trafd/pkg-plist
index 1791a3e25ef9..a43a72995842 100644
--- a/net-mgmt/trafd/pkg-plist
+++ b/net-mgmt/trafd/pkg-plist
@@ -7,8 +7,8 @@ bin/trafstat
 bin/trafstatd
 bin/trafstop
 etc/traflog.format
-share/doc/trafd/README
-@dirrm share/doc/trafd
+%%PORTDOCS%%share/doc/trafd/README
+%%PORTDOCS%%@dirrm share/doc/trafd
 @dirrm var/trafd
 @unexec rmdir %D/var/log 2>/dev/null || true
 @unexec rmdir %D/var 2>/dev/null || true
diff --git a/net/ascend-radius/pkg-plist b/net/ascend-radius/pkg-plist
index bf8922f6408e..ac20541c9bae 100644
--- a/net/ascend-radius/pkg-plist
+++ b/net/ascend-radius/pkg-plist
@@ -1,20 +1,20 @@
 sbin/builddbm
 sbin/radiusd
 sbin/radiusd.dbm
-share/doc/ascend-radius/ascend.doc
-share/doc/ascend-radius/draft-ietf-radius-accounting-01.txt
-share/doc/ascend-radius/draft-ietf-radius-radius-03.txt
-share/doc/ascend-radius/draft-ietf-radius-radius-04.txt
-share/doc/ascend-radius/ChangeLog
-share/doc/ascend-radius/README
-share/doc/ascend-radius/README.cexample
-share/doc/ascend-radius/README.dict
-share/doc/ascend-radius/radius.ps
-share/doc/ascend-radius/radius.pdf
-share/doc/ascend-radius/980618.ps
-share/doc/ascend-radius/980618.pdf
+%%PORTDOCS%%share/doc/ascend-radius/ascend.doc
+%%PORTDOCS%%share/doc/ascend-radius/draft-ietf-radius-accounting-01.txt
+%%PORTDOCS%%share/doc/ascend-radius/draft-ietf-radius-radius-03.txt
+%%PORTDOCS%%share/doc/ascend-radius/draft-ietf-radius-radius-04.txt
+%%PORTDOCS%%share/doc/ascend-radius/ChangeLog
+%%PORTDOCS%%share/doc/ascend-radius/README
+%%PORTDOCS%%share/doc/ascend-radius/README.cexample
+%%PORTDOCS%%share/doc/ascend-radius/README.dict
+%%PORTDOCS%%share/doc/ascend-radius/radius.ps
+%%PORTDOCS%%share/doc/ascend-radius/radius.pdf
+%%PORTDOCS%%share/doc/ascend-radius/980618.ps
+%%PORTDOCS%%share/doc/ascend-radius/980618.pdf
 etc/raddb/clients.example
 etc/raddb/dictionary
 etc/raddb/users.example
-@dirrm share/doc/ascend-radius
+%%PORTDOCS%%@dirrm share/doc/ascend-radius
 @dirrm etc/raddb
diff --git a/net/cap/pkg-plist b/net/cap/pkg-plist
index 3e61ee4e85f5..786f40eee0c0 100644
--- a/net/cap/pkg-plist
+++ b/net/cap/pkg-plist
@@ -67,32 +67,32 @@ man/man3/libcap.3.gz
 man/man3/libafpc.3.gz
 man/man3/libafp.3.gz
 man/man8/papof.8.gz
-share/doc/cap/abmisc.doc
-share/doc/cap/asp.notes
-share/doc/cap/atp.notes
-share/doc/cap/cap.auth.doc
-share/doc/cap/cap.notes
-share/doc/cap/glossary
-share/doc/cap/install.ms
-share/doc/cap/iptalk.cookbook
-share/doc/cap/nbp.ext
-share/doc/cap/pap.notes
-share/doc/cap/print.cookbook
-share/doc/cap/sched.notes
-share/doc/cap/uab.desc.ms
-share/doc/cap/uar.cookbook
-share/doc/cap/CAP.faq
-share/doc/cap/CAP60.README
-share/doc/cap/NOTICE
-share/doc/cap/README
-share/doc/cap/papif.README
-share/doc/cap/lwsrv.README
-share/doc/cap/aufs.README
-share/doc/cap/doc.README
-share/doc/cap/applications.README
-share/doc/cap/uab.README
-share/doc/cap/ethertalk.README
+%%PORTDOCS%%share/doc/cap/abmisc.doc
+%%PORTDOCS%%share/doc/cap/asp.notes
+%%PORTDOCS%%share/doc/cap/atp.notes
+%%PORTDOCS%%share/doc/cap/cap.auth.doc
+%%PORTDOCS%%share/doc/cap/cap.notes
+%%PORTDOCS%%share/doc/cap/glossary
+%%PORTDOCS%%share/doc/cap/install.ms
+%%PORTDOCS%%share/doc/cap/iptalk.cookbook
+%%PORTDOCS%%share/doc/cap/nbp.ext
+%%PORTDOCS%%share/doc/cap/pap.notes
+%%PORTDOCS%%share/doc/cap/print.cookbook
+%%PORTDOCS%%share/doc/cap/sched.notes
+%%PORTDOCS%%share/doc/cap/uab.desc.ms
+%%PORTDOCS%%share/doc/cap/uar.cookbook
+%%PORTDOCS%%share/doc/cap/CAP.faq
+%%PORTDOCS%%share/doc/cap/CAP60.README
+%%PORTDOCS%%share/doc/cap/NOTICE
+%%PORTDOCS%%share/doc/cap/README
+%%PORTDOCS%%share/doc/cap/papif.README
+%%PORTDOCS%%share/doc/cap/lwsrv.README
+%%PORTDOCS%%share/doc/cap/aufs.README
+%%PORTDOCS%%share/doc/cap/doc.README
+%%PORTDOCS%%share/doc/cap/applications.README
+%%PORTDOCS%%share/doc/cap/uab.README
+%%PORTDOCS%%share/doc/cap/ethertalk.README
 @dirrm include/netat
 @dirrm etc/cap
 @dirrm lib/cap
-@dirrm share/doc/cap
+%%PORTDOCS%%@dirrm share/doc/cap
diff --git a/net/dhcpconf/Makefile b/net/dhcpconf/Makefile
index a5d909e42100..4b93e7c04f8a 100644
--- a/net/dhcpconf/Makefile
+++ b/net/dhcpconf/Makefile
@@ -24,8 +24,8 @@ MAKE_ENV+=	PCFLAGS="${CFLAGS}"
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/dhcp-conf ${PREFIX}/sbin/dhcpconf
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/dhcpconf
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/dhcpconf
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/dhcpconf/pkg-plist b/net/dhcpconf/pkg-plist
index 7be764c6360f..c68bedef941e 100644
--- a/net/dhcpconf/pkg-plist
+++ b/net/dhcpconf/pkg-plist
@@ -1,3 +1,3 @@
 sbin/dhcpconf
-share/dhcpconf/README
-@dirrm share/dhcpconf
+%%PORTDOCS%%share/doc/dhcpconf/README
+%%PORTDOCS%%@dirrm share/doc/dhcpconf
diff --git a/net/dlint/Makefile b/net/dlint/Makefile
index 42445ecfd69e..9de4133041d6 100644
--- a/net/dlint/Makefile
+++ b/net/dlint/Makefile
@@ -25,8 +25,8 @@ do-install:
 	cd ${WRKSRC} ; ${INSTALL_SCRIPT} dlint digparse ${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/dlint.8 ${PREFIX}/man/man8
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/dlint
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dlint
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/dlint/pkg-plist b/net/dlint/pkg-plist
index 410d05762a47..f26955f1bbec 100644
--- a/net/dlint/pkg-plist
+++ b/net/dlint/pkg-plist
@@ -1,5 +1,4 @@
-@comment $FreeBSD$
 sbin/dlint
 sbin/digparse
-share/doc/dlint/README
-@dirrm share/doc/dlint
+%%PORTDOCS%%share/doc/dlint/README
+%%PORTDOCS%%@dirrm share/doc/dlint
diff --git a/net/freewais-sf/pkg-plist b/net/freewais-sf/pkg-plist
index a3d67763c482..6641df49b06a 100644
--- a/net/freewais-sf/pkg-plist
+++ b/net/freewais-sf/pkg-plist
@@ -24,8 +24,8 @@ bin/ws
 include/freeWAIS-sf/wais.h
 lib/freeWAIS-sf/emacs/lisp/wais.el
 lib/freeWAIS-sf/libwais.a
-share/doc/SF/fwsf.ps
-@dirrm share/doc/SF
+%%PORTDOCS%%share/doc/SF/fwsf.ps
+%%PORTDOCS%%@dirrm share/doc/SF
 @dirrm lib/freeWAIS-sf/emacs/lisp
 @dirrm lib/freeWAIS-sf/emacs
 @dirrm lib/freeWAIS-sf
diff --git a/net/merlinmon/Makefile b/net/merlinmon/Makefile
index 79a68a5fa0ea..9c03296a051e 100644
--- a/net/merlinmon/Makefile
+++ b/net/merlinmon/Makefile
@@ -20,8 +20,8 @@ NO_WRKSUBDIR=	yes
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/merlin ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/README.merlin
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/merlinmon/pkg-plist b/net/merlinmon/pkg-plist
index 6a14ab5f4675..16553f819d6b 100644
--- a/net/merlinmon/pkg-plist
+++ b/net/merlinmon/pkg-plist
@@ -1,3 +1,3 @@
 bin/merlin
-share/doc/README.merlin
-@dirrm share/doc
+%%PORTDOCS%%share/doc/merlinmon/README
+%%PORTDOCS%%@dirrm share/doc/merlinmon
diff --git a/net/micq/pkg-plist b/net/micq/pkg-plist
index 7e7cd2aacb55..a13e44e499b4 100644
--- a/net/micq/pkg-plist
+++ b/net/micq/pkg-plist
@@ -1,4 +1,4 @@
 bin/micq
-share/doc/micq/CHANGELOG
-share/doc/micq/README
-@dirrm share/doc/micq
+%%PORTDOCS%%share/doc/micq/CHANGELOG
+%%PORTDOCS%%share/doc/micq/README
+%%PORTDOCS%%@dirrm share/doc/micq
diff --git a/net/pmf/pkg-plist b/net/pmf/pkg-plist
index 75997813cb29..bc30882c1a05 100644
--- a/net/pmf/pkg-plist
+++ b/net/pmf/pkg-plist
@@ -1,10 +1,10 @@
 bin/pmf
-share/doc/pmf/mud-clients.FAQ
-share/doc/pmf/mud-rwho.FAQ  
-share/doc/pmf/mud.FAQ
-share/doc/pmf/mudlist.18oct93 
-share/doc/pmf/pmf.doc
-share/doc/pmf/resource-usage
+%%PORTDOCS%%share/doc/pmf/mud-clients.FAQ
+%%PORTDOCS%%share/doc/pmf/mud-rwho.FAQ  
+%%PORTDOCS%%share/doc/pmf/mud.FAQ
+%%PORTDOCS%%share/doc/pmf/mudlist.18oct93 
+%%PORTDOCS%%share/doc/pmf/pmf.doc
+%%PORTDOCS%%share/doc/pmf/resource-usage
 share/examples/pmf/dot.pmfrc
 share/examples/pmf/pmf-sparc-sound
 share/examples/pmf/sample-robot
@@ -98,4 +98,4 @@ share/pmf/helpfiles/verbose
 @dirrm share/pmf/helpfiles
 @dirrm share/pmf
 @dirrm share/examples/pmf
-@dirrm share/doc/pmf
+%%PORTDOCS%%@dirrm share/doc/pmf
diff --git a/net/rwhois/pkg-plist b/net/rwhois/pkg-plist
index da12e0a163c1..65822e442674 100644
--- a/net/rwhois/pkg-plist
+++ b/net/rwhois/pkg-plist
@@ -34,15 +34,15 @@ lib/rwhois/rwhoisd.dir
 lib/rwhois/rwhoisd.root
 lib/rwhois/rwhoisd.x.dir
 lib/rwhois/sbin/rwhoisd
-share/doc/rwhois/INSTALL.html
-share/doc/rwhois/TODO
-share/doc/rwhois/UPGRADE
-share/doc/rwhois/operations_guide.html
-share/doc/rwhois/operations_guide.txt
-share/doc/rwhois/rfc2167.txt
-share/doc/rwhois/security.html
-share/doc/rwhois/security.txt
-@dirrm share/doc/rwhois
+%%PORTDOCS%%share/doc/rwhois/INSTALL.html
+%%PORTDOCS%%share/doc/rwhois/TODO
+%%PORTDOCS%%share/doc/rwhois/UPGRADE
+%%PORTDOCS%%share/doc/rwhois/operations_guide.html
+%%PORTDOCS%%share/doc/rwhois/operations_guide.txt
+%%PORTDOCS%%share/doc/rwhois/rfc2167.txt
+%%PORTDOCS%%share/doc/rwhois/security.html
+%%PORTDOCS%%share/doc/rwhois/security.txt
+%%PORTDOCS%%@dirrm share/doc/rwhois
 @dirrm lib/rwhois/sbin
 @dirrm lib/rwhois/net-10.0.0.0-8/data/referral
 @dirrm lib/rwhois/net-10.0.0.0-8/data/network
diff --git a/net/rwhoisd/pkg-plist b/net/rwhoisd/pkg-plist
index da12e0a163c1..65822e442674 100644
--- a/net/rwhoisd/pkg-plist
+++ b/net/rwhoisd/pkg-plist
@@ -34,15 +34,15 @@ lib/rwhois/rwhoisd.dir
 lib/rwhois/rwhoisd.root
 lib/rwhois/rwhoisd.x.dir
 lib/rwhois/sbin/rwhoisd
-share/doc/rwhois/INSTALL.html
-share/doc/rwhois/TODO
-share/doc/rwhois/UPGRADE
-share/doc/rwhois/operations_guide.html
-share/doc/rwhois/operations_guide.txt
-share/doc/rwhois/rfc2167.txt
-share/doc/rwhois/security.html
-share/doc/rwhois/security.txt
-@dirrm share/doc/rwhois
+%%PORTDOCS%%share/doc/rwhois/INSTALL.html
+%%PORTDOCS%%share/doc/rwhois/TODO
+%%PORTDOCS%%share/doc/rwhois/UPGRADE
+%%PORTDOCS%%share/doc/rwhois/operations_guide.html
+%%PORTDOCS%%share/doc/rwhois/operations_guide.txt
+%%PORTDOCS%%share/doc/rwhois/rfc2167.txt
+%%PORTDOCS%%share/doc/rwhois/security.html
+%%PORTDOCS%%share/doc/rwhois/security.txt
+%%PORTDOCS%%@dirrm share/doc/rwhois
 @dirrm lib/rwhois/sbin
 @dirrm lib/rwhois/net-10.0.0.0-8/data/referral
 @dirrm lib/rwhois/net-10.0.0.0-8/data/network
diff --git a/net/sharity-light/pkg-plist b/net/sharity-light/pkg-plist
index b2bf7f5ff155..b6f2f713dc45 100644
--- a/net/sharity-light/pkg-plist
+++ b/net/sharity-light/pkg-plist
@@ -1,5 +1,5 @@
 sbin/shlight
 sbin/unshlight
-share/doc/Sharity-Light/README
-share/doc/Sharity-Light/FAQ
-@dirrm share/doc/Sharity-Light
+%%PORTDOCS%%share/doc/Sharity-Light/README
+%%PORTDOCS%%share/doc/Sharity-Light/FAQ
+%%PORTDOCS%%@dirrm share/doc/Sharity-Light
diff --git a/net/trafd/Makefile b/net/trafd/Makefile
index 4364e0c031ae..c2f800d602ef 100644
--- a/net/trafd/Makefile
+++ b/net/trafd/Makefile
@@ -26,8 +26,8 @@ do-install:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/trafd
-	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/trafd/README
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 	${MKDIR} ${PREFIX}/var/trafd
 	${MKDIR} ${PREFIX}/var/log
diff --git a/net/trafd/pkg-plist b/net/trafd/pkg-plist
index 1791a3e25ef9..a43a72995842 100644
--- a/net/trafd/pkg-plist
+++ b/net/trafd/pkg-plist
@@ -7,8 +7,8 @@ bin/trafstat
 bin/trafstatd
 bin/trafstop
 etc/traflog.format
-share/doc/trafd/README
-@dirrm share/doc/trafd
+%%PORTDOCS%%share/doc/trafd/README
+%%PORTDOCS%%@dirrm share/doc/trafd
 @dirrm var/trafd
 @unexec rmdir %D/var/log 2>/dev/null || true
 @unexec rmdir %D/var 2>/dev/null || true
diff --git a/net/zephyr/pkg-plist b/net/zephyr/pkg-plist
index b93c3d5865d9..0b3c705a0533 100644
--- a/net/zephyr/pkg-plist
+++ b/net/zephyr/pkg-plist
@@ -18,16 +18,16 @@ sbin/zephyrd
 sbin/zhm
 sbin/zpopnotify
 sbin/zshutdown_notify
-share/doc/zephyr/INSTALL
-share/doc/zephyr/NOTES
-share/doc/zephyr/OPERATING
-share/doc/zephyr/README
-share/doc/zephyr/USING
+%%PORTDOCS%%share/doc/zephyr/INSTALL
+%%PORTDOCS%%share/doc/zephyr/NOTES
+%%PORTDOCS%%share/doc/zephyr/OPERATING
+%%PORTDOCS%%share/doc/zephyr/README
+%%PORTDOCS%%share/doc/zephyr/USING
 share/zephyr/XZwrite
 share/zephyr/xzwrite.bitmap
 share/zephyr/zwgc.desc
 share/zephyr/zwgc_resources
 @dirrm etc/zephyr
 @dirrm include/zephyr
-@dirrm share/doc/zephyr
+%%PORTDOCS%%@dirrm share/doc/zephyr
 @dirrm share/zephyr