- PORTDOCS police

- DOCSDIR support to some
- Brush out some lint

13 files changed, 206 insertions, 207 deletions

diff --git a/devel/crossgo32-djgpp2-pdcurses/pkg-plist b/devel/crossgo32-djgpp2-pdcurses/pkg-plist
index 918c21727df9..504903fd0d1c 100644
--- a/devel/crossgo32-djgpp2-pdcurses/pkg-plist
+++ b/devel/crossgo32-djgpp2-pdcurses/pkg-plist
@@ -5,9 +5,9 @@ i386-go32/include/panel.h
 i386-go32/lib/libcurses.a
 i386-go32/lib/libcurso.a
 i386-go32/lib/libpano.a
-share/doc/pdcurses/README.FreeBSD
-share/doc/pdcurses/intro.txt
-share/doc/pdcurses/overview.txt
-share/doc/pdcurses/readme.txt
-share/doc/pdcurses/xwindows.txt
-@dirrm share/doc/pdcurses
+%%PORTDOCS%%share/doc/pdcurses/README.FreeBSD
+%%PORTDOCS%%share/doc/pdcurses/intro.txt
+%%PORTDOCS%%share/doc/pdcurses/overview.txt
+%%PORTDOCS%%share/doc/pdcurses/readme.txt
+%%PORTDOCS%%share/doc/pdcurses/xwindows.txt
+%%PORTDOCS%%@dirrm share/doc/pdcurses
diff --git a/devel/crossgo32-djgpp2/pkg-plist b/devel/crossgo32-djgpp2/pkg-plist
index f68369dea714..7d8db2c924bd 100644
--- a/devel/crossgo32-djgpp2/pkg-plist
+++ b/devel/crossgo32-djgpp2/pkg-plist
@@ -140,10 +140,10 @@ i386-go32/lib/libm.a
 i386-go32/lib/libpc.a
 i386-go32/lib/specs
 info/libc.info
-share/doc/djgpp2/README.FreeBSD
-share/doc/djgpp2/install
-share/doc/djgpp2/readme
-@dirrm share/doc/djgpp2
+%%PORTDOCS%%share/doc/djgpp2/README.FreeBSD
+%%PORTDOCS%%share/doc/djgpp2/install
+%%PORTDOCS%%share/doc/djgpp2/readme
+%%PORTDOCS%%@dirrm share/doc/djgpp2
 @unexec rm -rf %D/i386-go32/lib
 @unexec rm -rf %D/i386-go32/include
 @unexec mv %D/i386-go32/lib-newlib %D/i386-go32/lib
diff --git a/devel/crossgo32/pkg-plist b/devel/crossgo32/pkg-plist
index c36c550b5d48..66caca96b34d 100644
--- a/devel/crossgo32/pkg-plist
+++ b/devel/crossgo32/pkg-plist
@@ -174,9 +174,9 @@ lib/libi386-go32-opcodes.a
 lib/libiberty.a
 share/crossgo32/emu387
 share/crossgo32/go32.exe
-share/doc/crossgo32/FAQ-0.8
-share/doc/crossgo32/README.FreeBSD
-@dirrm share/doc/crossgo32
+%%PORTDOCS%%share/doc/crossgo32/FAQ-0.8
+%%PORTDOCS%%share/doc/crossgo32/README.FreeBSD
+%%PORTDOCS%%@dirrm share/doc/crossgo32
 @dirrm share/crossgo32
 @dirrm lib/gcc-lib/i386-go32/2.7.2.2/include/objc
 @dirrm lib/gcc-lib/i386-go32/2.7.2.2/include
diff --git a/devel/cs/Makefile b/devel/cs/Makefile
index ad7029530bff..9c0452b70594 100644
--- a/devel/cs/Makefile
+++ b/devel/cs/Makefile
@@ -21,8 +21,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cs ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/cs.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/cs
-	${INSTALL_DATA} ${WRKSRC}/ANNOUNCE ${PREFIX}/share/doc/cs
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/ANNOUNCE ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/cs/pkg-plist b/devel/cs/pkg-plist
index d3d41b74babe..6dcc02d3577b 100644
--- a/devel/cs/pkg-plist
+++ b/devel/cs/pkg-plist
@@ -1,3 +1,3 @@
 bin/cs
-share/doc/cs/ANNOUNCE
-@dirrm share/doc/cs
+%%PORTDOCS%%share/doc/cs/ANNOUNCE
+%%PORTDOCS%%@dirrm share/doc/cs
diff --git a/devel/flick/Makefile b/devel/flick/Makefile
index 5c530636c218..6ca2bde6521d 100644
--- a/devel/flick/Makefile
+++ b/devel/flick/Makefile
@@ -19,9 +19,9 @@ MAKEFILE=	GNUmakefile
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/flick
-	${INSTALL_DATA}	${WRKSRC}/doc/guts/*.ps ${PREFIX}/share/doc/flick
-	${INSTALL_DATA}	${WRKSRC}/doc/usersguide/*.ps ${PREFIX}/share/doc/flick
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/guts/*.ps ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/usersguide/*.ps ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/flick/pkg-plist b/devel/flick/pkg-plist
index 8d51d4ec3489..11bf66c3bcae 100644
--- a/devel/flick/pkg-plist
+++ b/devel/flick/pkg-plist
@@ -47,10 +47,10 @@ include/flick/pres/tao_stubs.scml
 include/flick/pres/tao_union.scml
 lib/libflick-iiop.a
 lib/libflick-suntcp.a
-share/doc/flick/guts.ps
-share/doc/flick/user.ps
-@dirrm include/flick/encode
-@dirrm include/flick/link
+%%PORTDOCS%%share/doc/flick/guts.ps
+%%PORTDOCS%%share/doc/flick/user.ps
+%%PORTDOCS%%@dirrm share/doc/flick
 @dirrm include/flick/pres
+@dirrm include/flick/link
+@dirrm include/flick/encode
 @dirrm include/flick
-@dirrm share/doc/flick
diff --git a/devel/flux/pkg-plist b/devel/flux/pkg-plist
index ffb64cfc5fa2..9b0cd84a40df 100644
--- a/devel/flux/pkg-plist
+++ b/devel/flux/pkg-plist
@@ -30,105 +30,105 @@ include/flux/xml.h
 lib/libflux.a
 lib/libflux.so
 lib/libflux.so.1
-share/doc/flux/AUTHORS
-share/doc/flux/NEWS
-share/doc/flux/README
-share/doc/flux/TODO
-share/doc/flux/html/.#index.html.1.15
-share/doc/flux/html/about.html
-share/doc/flux/html/benchmarks.html
-share/doc/flux/html/contact.html
-share/doc/flux/html/docs/future.html
-share/doc/flux/html/docs/hacking.html
-share/doc/flux/html/docs/index.html
-share/doc/flux/html/docs/platforms.html
-share/doc/flux/html/docs/ref-bmem.html
-share/doc/flux/html/docs/ref-comm.html
-share/doc/flux/html/docs/ref-log.html
-share/doc/flux/html/docs/ref-mt.html
-share/doc/flux/html/docs/ref-proxy.html
-share/doc/flux/html/docs/ref-sock.html
-share/doc/flux/html/docs/ref-tt.html
-share/doc/flux/html/docs/ref.css
-share/doc/flux/html/download.html
-share/doc/flux/html/img/background-gray.png
-share/doc/flux/html/img/frontpage-bottom.png
-share/doc/flux/html/img/frontpage-glass.png
-share/doc/flux/html/img/frontpage-header.png
-share/doc/flux/html/img/frontpage-menu-about.png
-share/doc/flux/html/img/frontpage-menu-contact.png
-share/doc/flux/html/img/frontpage-menu-cvs.png
-share/doc/flux/html/img/frontpage-menu-docs.png
-share/doc/flux/html/img/frontpage-menu-download.png
-share/doc/flux/html/img/frontpage-menu-footer.png
-share/doc/flux/html/img/frontpage-nurse.png
-share/doc/flux/html/img/graph-ballocbenchmark-alpha.png
-share/doc/flux/html/img/graph-ballocbenchmark-pentium.png
-share/doc/flux/html/img/menu-about.png
-share/doc/flux/html/img/menu-contact.png
-share/doc/flux/html/img/menu-cvs.png
-share/doc/flux/html/img/menu-docs.png
-share/doc/flux/html/img/menu-download-bottom.png
-share/doc/flux/html/img/menu-download-top.png
-share/doc/flux/html/img/subpage-header-left.png
-share/doc/flux/html/img/subpage-header-picturefooter.png
-share/doc/flux/html/img/subpage-header-pictureheader0.png
-share/doc/flux/html/img/subpage-header-pictureheader1.png
-share/doc/flux/html/img/subpage-header-pictureheader2.png
-share/doc/flux/html/img/subpage-header-pictureheader3.png
-share/doc/flux/html/img/subpage-header-topright.png
-share/doc/flux/html/img/subpage-icon-about.png
-share/doc/flux/html/img/subpage-icon-benchmarks.png
-share/doc/flux/html/img/subpage-icon-contact.png
-share/doc/flux/html/img/subpage-icon-docs.png
-share/doc/flux/html/img/subpage-icon-download.png
-share/doc/flux/html/img/subpage-icon-hacking.png
-share/doc/flux/html/img/subpage-icon-proxies.png
-share/doc/flux/html/img/subpage-icon-tree.png
-share/doc/flux/html/img/subpage-title-about.png
-share/doc/flux/html/img/subpage-title-benchmarks.png
-share/doc/flux/html/img/subpage-title-contact.png
-share/doc/flux/html/img/subpage-title-docs.png
-share/doc/flux/html/img/subpage-title-download.png
-share/doc/flux/html/img/subpage-title-hacking.png
-share/doc/flux/html/img/subpage-title-markuptrees.png
-share/doc/flux/html/img/subpage-title-proxies.png
-share/doc/flux/html/img/subpage-title-tokentrees.png
-share/doc/flux/html/index.html
-share/doc/flux/plain/builds/0.3.0/billy
-share/doc/flux/plain/builds/0.3.0/domination
-share/doc/flux/plain/builds/0.3.0/fili
-share/doc/flux/plain/builds/0.3.0/foo
-share/doc/flux/plain/builds/0.3.0/gluttony
-share/doc/flux/plain/builds/0.3.0/harald
-share/doc/flux/plain/builds/0.3.0/kassad
-share/doc/flux/plain/builds/0.3.0/morten
-share/doc/flux/plain/builds/0.3.0/nerdhaven
-share/doc/flux/plain/builds/0.3.0/nocto
-share/doc/flux/plain/builds/0.3.0/totem
-share/doc/flux/plain/builds/0.3.0/vodka
-share/doc/flux/plain/builds/0.3.0/wrath
-share/doc/flux/plain/builds/0.4.0/gluttony
-share/doc/flux/plain/builds/0.4.0/nocto
-share/doc/flux/plain/builds/0.4.0/wrath
-share/doc/flux/plain/builds/Summary
-share/doc/flux/tex/comm.fig
-share/doc/flux/tex/concepts.fig
-share/doc/flux/tex/depend.fig
-share/doc/flux/tex/fifobuf.fig
-share/doc/flux/tex/proxy.fig
-share/doc/flux/tex/refcard-gen.sh
-share/doc/flux/tex/refcard.tex
-share/doc/flux/tex/sock.fig
-share/doc/flux/tex/tt.fig
-share/doc/flux/tex/ttree-rules.fig
-@dirrm share/doc/flux/tex
-@dirrm share/doc/flux/plain/builds/0.4.0
-@dirrm share/doc/flux/plain/builds/0.3.0
-@dirrm share/doc/flux/plain/builds
-@dirrm share/doc/flux/plain
-@dirrm share/doc/flux/html/img
-@dirrm share/doc/flux/html/docs
-@dirrm share/doc/flux/html
-@dirrm share/doc/flux
+%%PORTDOCS%%share/doc/flux/AUTHORS
+%%PORTDOCS%%share/doc/flux/NEWS
+%%PORTDOCS%%share/doc/flux/README
+%%PORTDOCS%%share/doc/flux/TODO
+%%PORTDOCS%%share/doc/flux/html/.#index.html.1.15
+%%PORTDOCS%%share/doc/flux/html/about.html
+%%PORTDOCS%%share/doc/flux/html/benchmarks.html
+%%PORTDOCS%%share/doc/flux/html/contact.html
+%%PORTDOCS%%share/doc/flux/html/docs/future.html
+%%PORTDOCS%%share/doc/flux/html/docs/hacking.html
+%%PORTDOCS%%share/doc/flux/html/docs/index.html
+%%PORTDOCS%%share/doc/flux/html/docs/platforms.html
+%%PORTDOCS%%share/doc/flux/html/docs/ref-bmem.html
+%%PORTDOCS%%share/doc/flux/html/docs/ref-comm.html
+%%PORTDOCS%%share/doc/flux/html/docs/ref-log.html
+%%PORTDOCS%%share/doc/flux/html/docs/ref-mt.html
+%%PORTDOCS%%share/doc/flux/html/docs/ref-proxy.html
+%%PORTDOCS%%share/doc/flux/html/docs/ref-sock.html
+%%PORTDOCS%%share/doc/flux/html/docs/ref-tt.html
+%%PORTDOCS%%share/doc/flux/html/docs/ref.css
+%%PORTDOCS%%share/doc/flux/html/download.html
+%%PORTDOCS%%share/doc/flux/html/img/background-gray.png
+%%PORTDOCS%%share/doc/flux/html/img/frontpage-bottom.png
+%%PORTDOCS%%share/doc/flux/html/img/frontpage-glass.png
+%%PORTDOCS%%share/doc/flux/html/img/frontpage-header.png
+%%PORTDOCS%%share/doc/flux/html/img/frontpage-menu-about.png
+%%PORTDOCS%%share/doc/flux/html/img/frontpage-menu-contact.png
+%%PORTDOCS%%share/doc/flux/html/img/frontpage-menu-cvs.png
+%%PORTDOCS%%share/doc/flux/html/img/frontpage-menu-docs.png
+%%PORTDOCS%%share/doc/flux/html/img/frontpage-menu-download.png
+%%PORTDOCS%%share/doc/flux/html/img/frontpage-menu-footer.png
+%%PORTDOCS%%share/doc/flux/html/img/frontpage-nurse.png
+%%PORTDOCS%%share/doc/flux/html/img/graph-ballocbenchmark-alpha.png
+%%PORTDOCS%%share/doc/flux/html/img/graph-ballocbenchmark-pentium.png
+%%PORTDOCS%%share/doc/flux/html/img/menu-about.png
+%%PORTDOCS%%share/doc/flux/html/img/menu-contact.png
+%%PORTDOCS%%share/doc/flux/html/img/menu-cvs.png
+%%PORTDOCS%%share/doc/flux/html/img/menu-docs.png
+%%PORTDOCS%%share/doc/flux/html/img/menu-download-bottom.png
+%%PORTDOCS%%share/doc/flux/html/img/menu-download-top.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-header-left.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-header-picturefooter.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-header-pictureheader0.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-header-pictureheader1.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-header-pictureheader2.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-header-pictureheader3.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-header-topright.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-icon-about.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-icon-benchmarks.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-icon-contact.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-icon-docs.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-icon-download.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-icon-hacking.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-icon-proxies.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-icon-tree.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-title-about.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-title-benchmarks.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-title-contact.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-title-docs.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-title-download.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-title-hacking.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-title-markuptrees.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-title-proxies.png
+%%PORTDOCS%%share/doc/flux/html/img/subpage-title-tokentrees.png
+%%PORTDOCS%%share/doc/flux/html/index.html
+%%PORTDOCS%%share/doc/flux/plain/builds/0.3.0/billy
+%%PORTDOCS%%share/doc/flux/plain/builds/0.3.0/domination
+%%PORTDOCS%%share/doc/flux/plain/builds/0.3.0/fili
+%%PORTDOCS%%share/doc/flux/plain/builds/0.3.0/foo
+%%PORTDOCS%%share/doc/flux/plain/builds/0.3.0/gluttony
+%%PORTDOCS%%share/doc/flux/plain/builds/0.3.0/harald
+%%PORTDOCS%%share/doc/flux/plain/builds/0.3.0/kassad
+%%PORTDOCS%%share/doc/flux/plain/builds/0.3.0/morten
+%%PORTDOCS%%share/doc/flux/plain/builds/0.3.0/nerdhaven
+%%PORTDOCS%%share/doc/flux/plain/builds/0.3.0/nocto
+%%PORTDOCS%%share/doc/flux/plain/builds/0.3.0/totem
+%%PORTDOCS%%share/doc/flux/plain/builds/0.3.0/vodka
+%%PORTDOCS%%share/doc/flux/plain/builds/0.3.0/wrath
+%%PORTDOCS%%share/doc/flux/plain/builds/0.4.0/gluttony
+%%PORTDOCS%%share/doc/flux/plain/builds/0.4.0/nocto
+%%PORTDOCS%%share/doc/flux/plain/builds/0.4.0/wrath
+%%PORTDOCS%%share/doc/flux/plain/builds/Summary
+%%PORTDOCS%%share/doc/flux/tex/comm.fig
+%%PORTDOCS%%share/doc/flux/tex/concepts.fig
+%%PORTDOCS%%share/doc/flux/tex/depend.fig
+%%PORTDOCS%%share/doc/flux/tex/fifobuf.fig
+%%PORTDOCS%%share/doc/flux/tex/proxy.fig
+%%PORTDOCS%%share/doc/flux/tex/refcard-gen.sh
+%%PORTDOCS%%share/doc/flux/tex/refcard.tex
+%%PORTDOCS%%share/doc/flux/tex/sock.fig
+%%PORTDOCS%%share/doc/flux/tex/tt.fig
+%%PORTDOCS%%share/doc/flux/tex/ttree-rules.fig
+%%PORTDOCS%%@dirrm share/doc/flux/tex
+%%PORTDOCS%%@dirrm share/doc/flux/plain/builds/0.4.0
+%%PORTDOCS%%@dirrm share/doc/flux/plain/builds/0.3.0
+%%PORTDOCS%%@dirrm share/doc/flux/plain/builds
+%%PORTDOCS%%@dirrm share/doc/flux/plain
+%%PORTDOCS%%@dirrm share/doc/flux/html/img
+%%PORTDOCS%%@dirrm share/doc/flux/html/docs
+%%PORTDOCS%%@dirrm share/doc/flux/html
+%%PORTDOCS%%@dirrm share/doc/flux
 @dirrm include/flux
diff --git a/devel/libU77/pkg-plist b/devel/libU77/pkg-plist
index cd6e8567d406..0aab3407a4ef 100644
--- a/devel/libU77/pkg-plist
+++ b/devel/libU77/pkg-plist
@@ -1,5 +1,5 @@
 lib/libU77.a
 lib/libU77.so
 lib/libU77.so.1
-share/doc/libU77/manual.ps
-@dirrm share/doc/libU77
+%%PORTDOCS%%share/doc/libU77/manual.ps
+%%PORTDOCS%%@dirrm share/doc/libU77
diff --git a/devel/libcii/pkg-plist b/devel/libcii/pkg-plist
index 4995e531b759..3969753604ed 100644
--- a/devel/libcii/pkg-plist
+++ b/devel/libcii/pkg-plist
@@ -47,63 +47,63 @@ lib/cii/%%CIIMAJOR%%/libcii.a
 @unexec /bin/rm %D/include/cii
 @exec /bin/ln -sf %D/lib/cii/%%CIIMAJOR%%/include %D/include/cii
 @exec /bin/ln -sf %D/lib/cii/%%CIIMAJOR%%/libcii.a %D/lib/libcii.a
-share/doc/cii/CPYRIGHT
-share/doc/cii/README
-share/doc/cii/examples/basename.c
-share/doc/cii/examples/calc.c
-share/doc/cii/examples/cref.c
-share/doc/cii/examples/double.c
-share/doc/cii/examples/getword.c
-share/doc/cii/examples/getword.h
-share/doc/cii/examples/idents.c
-share/doc/cii/examples/ids.c
-share/doc/cii/examples/integer.c
-share/doc/cii/examples/integer.h
-share/doc/cii/examples/iref.c
-share/doc/cii/examples/kref.c
-share/doc/cii/examples/mpcalc.c
-share/doc/cii/examples/sieve.c
-share/doc/cii/examples/sort.c 
-share/doc/cii/examples/spin.c
-share/doc/cii/examples/wf.c  
-share/doc/cii/examples/words.c
-share/doc/cii/examples/xref.c
-share/doc/cii/history.html
-share/doc/cii/install.html
-share/doc/cii/makefile
-share/doc/cii/packing.lst
-share/doc/cii/src/ap.c
-share/doc/cii/src/arena.c
-share/doc/cii/src/arith.c
-share/doc/cii/src/array.c
-share/doc/cii/src/assert.c
-share/doc/cii/src/atom.c
-share/doc/cii/src/bit.c
-share/doc/cii/src/chan.c
-share/doc/cii/src/except.c
-share/doc/cii/src/fmt.c
-share/doc/cii/src/libcii.def
-share/doc/cii/src/list.c
-share/doc/cii/src/mem.c
-share/doc/cii/src/memchk.c
-share/doc/cii/src/memcmp.c
-share/doc/cii/src/memmove.c
-share/doc/cii/src/mp.c
-share/doc/cii/src/ring.c
-share/doc/cii/src/seq.c
-share/doc/cii/src/set.c
-share/doc/cii/src/stack.c
-share/doc/cii/src/str.c
-share/doc/cii/src/strerror.c
-share/doc/cii/src/strncmp.c
-share/doc/cii/src/table.c
-share/doc/cii/src/swtch.s
-share/doc/cii/src/swtch.s.orig
-share/doc/cii/src/text.c
-share/doc/cii/src/thread-nt.c
-share/doc/cii/src/thread.c
-share/doc/cii/src/thread.c.orig
-share/doc/cii/src/xp.c
-@dirrm share/doc/cii/src
-@dirrm share/doc/cii/examples
-@dirrm share/doc/cii
+%%PORTDOCS%%share/doc/cii/CPYRIGHT
+%%PORTDOCS%%share/doc/cii/README
+%%PORTDOCS%%share/doc/cii/examples/basename.c
+%%PORTDOCS%%share/doc/cii/examples/calc.c
+%%PORTDOCS%%share/doc/cii/examples/cref.c
+%%PORTDOCS%%share/doc/cii/examples/double.c
+%%PORTDOCS%%share/doc/cii/examples/getword.c
+%%PORTDOCS%%share/doc/cii/examples/getword.h
+%%PORTDOCS%%share/doc/cii/examples/idents.c
+%%PORTDOCS%%share/doc/cii/examples/ids.c
+%%PORTDOCS%%share/doc/cii/examples/integer.c
+%%PORTDOCS%%share/doc/cii/examples/integer.h
+%%PORTDOCS%%share/doc/cii/examples/iref.c
+%%PORTDOCS%%share/doc/cii/examples/kref.c
+%%PORTDOCS%%share/doc/cii/examples/mpcalc.c
+%%PORTDOCS%%share/doc/cii/examples/sieve.c
+%%PORTDOCS%%share/doc/cii/examples/sort.c 
+%%PORTDOCS%%share/doc/cii/examples/spin.c
+%%PORTDOCS%%share/doc/cii/examples/wf.c  
+%%PORTDOCS%%share/doc/cii/examples/words.c
+%%PORTDOCS%%share/doc/cii/examples/xref.c
+%%PORTDOCS%%share/doc/cii/history.html
+%%PORTDOCS%%share/doc/cii/install.html
+%%PORTDOCS%%share/doc/cii/makefile
+%%PORTDOCS%%share/doc/cii/packing.lst
+%%PORTDOCS%%share/doc/cii/src/ap.c
+%%PORTDOCS%%share/doc/cii/src/arena.c
+%%PORTDOCS%%share/doc/cii/src/arith.c
+%%PORTDOCS%%share/doc/cii/src/array.c
+%%PORTDOCS%%share/doc/cii/src/assert.c
+%%PORTDOCS%%share/doc/cii/src/atom.c
+%%PORTDOCS%%share/doc/cii/src/bit.c
+%%PORTDOCS%%share/doc/cii/src/chan.c
+%%PORTDOCS%%share/doc/cii/src/except.c
+%%PORTDOCS%%share/doc/cii/src/fmt.c
+%%PORTDOCS%%share/doc/cii/src/libcii.def
+%%PORTDOCS%%share/doc/cii/src/list.c
+%%PORTDOCS%%share/doc/cii/src/mem.c
+%%PORTDOCS%%share/doc/cii/src/memchk.c
+%%PORTDOCS%%share/doc/cii/src/memcmp.c
+%%PORTDOCS%%share/doc/cii/src/memmove.c
+%%PORTDOCS%%share/doc/cii/src/mp.c
+%%PORTDOCS%%share/doc/cii/src/ring.c
+%%PORTDOCS%%share/doc/cii/src/seq.c
+%%PORTDOCS%%share/doc/cii/src/set.c
+%%PORTDOCS%%share/doc/cii/src/stack.c
+%%PORTDOCS%%share/doc/cii/src/str.c
+%%PORTDOCS%%share/doc/cii/src/strerror.c
+%%PORTDOCS%%share/doc/cii/src/strncmp.c
+%%PORTDOCS%%share/doc/cii/src/table.c
+%%PORTDOCS%%share/doc/cii/src/swtch.s
+%%PORTDOCS%%share/doc/cii/src/swtch.s.orig
+%%PORTDOCS%%share/doc/cii/src/text.c
+%%PORTDOCS%%share/doc/cii/src/thread-nt.c
+%%PORTDOCS%%share/doc/cii/src/thread.c
+%%PORTDOCS%%share/doc/cii/src/thread.c.orig
+%%PORTDOCS%%share/doc/cii/src/xp.c
+%%PORTDOCS%%@dirrm share/doc/cii/src
+%%PORTDOCS%%@dirrm share/doc/cii/examples
+%%PORTDOCS%%@dirrm share/doc/cii
diff --git a/devel/mob/pkg-plist b/devel/mob/pkg-plist
index 9df6240db3ef..9773bcd3d08d 100644
--- a/devel/mob/pkg-plist
+++ b/devel/mob/pkg-plist
@@ -1,3 +1,3 @@
 bin/inspector
-share/doc/mob/mob.ps
-@dirrm share/doc/mob
+%%PORTDOCS%%share/doc/mob/mob.ps
+%%PORTDOCS%%@dirrm share/doc/mob
diff --git a/devel/pccts/pkg-plist b/devel/pccts/pkg-plist
index 7db1071efb39..ba49edbefb1c 100644
--- a/devel/pccts/pkg-plist
+++ b/devel/pccts/pkg-plist
@@ -1,4 +1,3 @@
-@comment $FreeBSD$
 bin/antlr
 bin/dlg
 bin/genmk
@@ -44,14 +43,14 @@ include/pccts/pccts_stdlib.h
 include/pccts/pccts_string.h
 include/pccts/pcctscfg.h
 include/pccts/slist.cpp
-share/doc/pccts/CHANGES_FROM_131.txt
-share/doc/pccts/CHANGES_FROM_133.txt
-share/doc/pccts/CHANGES_FROM_133_BEFORE_MR13.txt
-share/doc/pccts/KNOWN_PROBLEMS.txt
-share/doc/pccts/README
-share/doc/pccts/RIGHTS
-share/doc/pccts/history.txt
-share/doc/pccts/history.ps
+%%PORTDOCS%%share/doc/pccts/CHANGES_FROM_131.txt
+%%PORTDOCS%%share/doc/pccts/CHANGES_FROM_133.txt
+%%PORTDOCS%%share/doc/pccts/CHANGES_FROM_133_BEFORE_MR13.txt
+%%PORTDOCS%%share/doc/pccts/KNOWN_PROBLEMS.txt
+%%PORTDOCS%%share/doc/pccts/README
+%%PORTDOCS%%share/doc/pccts/RIGHTS
+%%PORTDOCS%%share/doc/pccts/history.txt
+%%PORTDOCS%%share/doc/pccts/history.ps
 share/examples/pccts/makefile
 share/examples/pccts/1/makefile
 share/examples/pccts/1/test.g
@@ -94,7 +93,7 @@ share/examples/pccts/12/test.g
 share/examples/pccts/13/makefile
 share/examples/pccts/13/test.g
 @dirrm include/pccts
-@dirrm share/doc/pccts
+%%PORTDOCS%%@dirrm share/doc/pccts
 @dirrm share/examples/pccts/1
 @dirrm share/examples/pccts/2
 @dirrm share/examples/pccts/3
diff --git a/devel/robodoc/pkg-plist b/devel/robodoc/pkg-plist
index efd62e135602..b6e165579694 100644
--- a/devel/robodoc/pkg-plist
+++ b/devel/robodoc/pkg-plist
@@ -1,10 +1,10 @@
 bin/robodoc
-share/doc/robodoc/AUTHORS
-share/doc/robodoc/ChangeLog
-share/doc/robodoc/NEWS
-share/doc/robodoc/README
-share/doc/robodoc/main.css
-share/doc/robodoc/robodoc.html
+%%PORTDOCS%%share/doc/robodoc/AUTHORS
+%%PORTDOCS%%share/doc/robodoc/ChangeLog
+%%PORTDOCS%%share/doc/robodoc/NEWS
+%%PORTDOCS%%share/doc/robodoc/README
+%%PORTDOCS%%share/doc/robodoc/main.css
+%%PORTDOCS%%share/doc/robodoc/robodoc.html
 share/examples/robodoc/C/makefile
 share/examples/robodoc/C/prog1.c
 share/examples/robodoc/C/prog1.c.html
@@ -19,4 +19,4 @@ share/examples/robodoc/CPP/muppets.h.html
 @dirrm share/examples/robodoc/CPP
 @dirrm share/examples/robodoc/C
 @dirrm share/examples/robodoc
-@dirrm share/doc/robodoc
+%%PORTDOCS%%@dirrm share/doc/robodoc