6 files changed, 169 insertions, 169 deletions

diff --git a/cad/atlc/pkg-plist b/cad/atlc/pkg-plist
index 68d2551a7f7a..b1c0875c3c99 100644
--- a/cad/atlc/pkg-plist
+++ b/cad/atlc/pkg-plist
@@ -8,129 +8,129 @@ bin/rect_cen_in_rect
 bin/rect_in_circ
 bin/rect_in_rect
 bin/sym_strip
-%%PORTDOCS%%share/doc/atlc/FAQ.html
-%%PORTDOCS%%share/doc/atlc/IMPORTANT.html
-%%PORTDOCS%%share/doc/atlc/accuracy.html
-%%PORTDOCS%%share/doc/atlc/atlc.1.html
-%%PORTDOCS%%share/doc/atlc/banner.html
-%%PORTDOCS%%share/doc/atlc/bmp.html
-%%PORTDOCS%%share/doc/atlc/building.html
-%%PORTDOCS%%share/doc/atlc/circ_in_circ.1.html
-%%PORTDOCS%%share/doc/atlc/circ_in_rect.1.html
-%%PORTDOCS%%share/doc/atlc/colours.html
-%%PORTDOCS%%share/doc/atlc/couplers.html
-%%PORTDOCS%%share/doc/atlc/errors.html
-%%PORTDOCS%%share/doc/atlc/examples.html
-%%PORTDOCS%%share/doc/atlc/fileformat.html
-%%PORTDOCS%%share/doc/atlc/frontpage.html
-%%PORTDOCS%%share/doc/atlc/generators.html
-%%PORTDOCS%%share/doc/atlc/index.html
-%%PORTDOCS%%share/doc/atlc/index2.html
-%%PORTDOCS%%share/doc/atlc/jpgs/000000.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/0000ff.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/00ff00.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/00ffff.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/1aefb3.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/50.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/696969.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/8235ef.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/8e8e8e.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/aliased.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/bc7f60.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/central.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/centred.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/cir.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/coax2.E.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/coax2.Er.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/coax2.Ex.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/coax2.Ey.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/coax2.U.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/coax2.V.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/coax2.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/coaxial1.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/cop1.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/coupler.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/d5a04d.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/dcdcdc.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/eccentric_coax.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/eccentric_coax2.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/efcc1a.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/elliptical.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/enclosed-microstrip.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/ff0000.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/ff0001.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/ff00ff.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/ffcaca.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/ffff00.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/ffffff.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/full-size.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/multi-dielectric.E.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/multi-dielectric.Er.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/multi-dielectric.Ex.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/multi-dielectric.Ey.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/multi-dielectric.U.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/multi-dielectric.V.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/multi-dielectric.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/not-aliased.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/off-centre.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/off-centre2.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/pcb.E.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/pcb.Er.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/pcb.Ex.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/pcb.Ey.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/pcb.U.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/pcb.V.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/pcb.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/pcb2.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/rect.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/rect2.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/rect9.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/ric.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/symmetrical_strip.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/test.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/too-small.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/twin-wire.E.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/twin-wire.Er.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/twin-wire.Ex.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/twin-wire.Ey.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/twin-wire.U.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/twin-wire.V.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/twin-wire.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/twin-wire2.E.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/twin-wire2.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/ushape.E.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/ushape.Er.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/ushape.Ex.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/ushape.Ey.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/ushape.U.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/ushape.V.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/ushape.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/very-odd-dark.E.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/very-odd-dark.Ex.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/very-odd-dark.Ey.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/very-odd-light.E.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/very-odd-light.Ex.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/very-odd-light.Ey.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/very-odd.E.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/very-odd.Er.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/very-odd.Ex.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/very-odd.Ey.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/very-odd.U.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/very-odd.V.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/very-odd.jpg
-%%PORTDOCS%%share/doc/atlc/jpgs/wide.jpg
-%%PORTDOCS%%share/doc/atlc/man-pages.html
-%%PORTDOCS%%share/doc/atlc/not_yet.html
-%%PORTDOCS%%share/doc/atlc/options.html
-%%PORTDOCS%%share/doc/atlc/readbin.1.html
-%%PORTDOCS%%share/doc/atlc/rect_cen_in_rect.1.html
-%%PORTDOCS%%share/doc/atlc/rect_in_circ.1.html
-%%PORTDOCS%%share/doc/atlc/rect_in_rect.1.html
-%%PORTDOCS%%share/doc/atlc/rect_in_rect.html
-%%PORTDOCS%%share/doc/atlc/sym_strip.1.html
-%%PORTDOCS%%share/doc/atlc/todo.html
-%%PORTDOCS%%share/doc/atlc/tutorial.html
-%%PORTDOCS%%share/doc/atlc/using.html
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/IMPORTANT.html
+%%PORTDOCS%%%%DOCSDIR%%/accuracy.html
+%%PORTDOCS%%%%DOCSDIR%%/atlc.1.html
+%%PORTDOCS%%%%DOCSDIR%%/banner.html
+%%PORTDOCS%%%%DOCSDIR%%/bmp.html
+%%PORTDOCS%%%%DOCSDIR%%/building.html
+%%PORTDOCS%%%%DOCSDIR%%/circ_in_circ.1.html
+%%PORTDOCS%%%%DOCSDIR%%/circ_in_rect.1.html
+%%PORTDOCS%%%%DOCSDIR%%/colours.html
+%%PORTDOCS%%%%DOCSDIR%%/couplers.html
+%%PORTDOCS%%%%DOCSDIR%%/errors.html
+%%PORTDOCS%%%%DOCSDIR%%/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/fileformat.html
+%%PORTDOCS%%%%DOCSDIR%%/frontpage.html
+%%PORTDOCS%%%%DOCSDIR%%/generators.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index2.html
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/000000.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/0000ff.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/00ff00.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/00ffff.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/1aefb3.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/50.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/696969.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/8235ef.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/8e8e8e.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/aliased.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/bc7f60.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/central.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/centred.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/cir.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/coax2.E.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/coax2.Er.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/coax2.Ex.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/coax2.Ey.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/coax2.U.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/coax2.V.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/coax2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/coaxial1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/cop1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/coupler.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/d5a04d.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/dcdcdc.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/eccentric_coax.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/eccentric_coax2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/efcc1a.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/elliptical.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/enclosed-microstrip.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/ff0000.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/ff0001.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/ff00ff.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/ffcaca.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/ffff00.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/ffffff.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/full-size.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/multi-dielectric.E.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/multi-dielectric.Er.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/multi-dielectric.Ex.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/multi-dielectric.Ey.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/multi-dielectric.U.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/multi-dielectric.V.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/multi-dielectric.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/not-aliased.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/off-centre.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/off-centre2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/pcb.E.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/pcb.Er.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/pcb.Ex.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/pcb.Ey.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/pcb.U.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/pcb.V.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/pcb.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/pcb2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/rect.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/rect2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/rect9.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/ric.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/symmetrical_strip.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/test.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/too-small.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/twin-wire.E.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/twin-wire.Er.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/twin-wire.Ex.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/twin-wire.Ey.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/twin-wire.U.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/twin-wire.V.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/twin-wire.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/twin-wire2.E.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/twin-wire2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/ushape.E.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/ushape.Er.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/ushape.Ex.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/ushape.Ey.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/ushape.U.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/ushape.V.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/ushape.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/very-odd-dark.E.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/very-odd-dark.Ex.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/very-odd-dark.Ey.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/very-odd-light.E.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/very-odd-light.Ex.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/very-odd-light.Ey.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/very-odd.E.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/very-odd.Er.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/very-odd.Ex.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/very-odd.Ey.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/very-odd.U.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/very-odd.V.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/very-odd.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpgs/wide.jpg
+%%PORTDOCS%%%%DOCSDIR%%/man-pages.html
+%%PORTDOCS%%%%DOCSDIR%%/not_yet.html
+%%PORTDOCS%%%%DOCSDIR%%/options.html
+%%PORTDOCS%%%%DOCSDIR%%/readbin.1.html
+%%PORTDOCS%%%%DOCSDIR%%/rect_cen_in_rect.1.html
+%%PORTDOCS%%%%DOCSDIR%%/rect_in_circ.1.html
+%%PORTDOCS%%%%DOCSDIR%%/rect_in_rect.1.html
+%%PORTDOCS%%%%DOCSDIR%%/rect_in_rect.html
+%%PORTDOCS%%%%DOCSDIR%%/sym_strip.1.html
+%%PORTDOCS%%%%DOCSDIR%%/todo.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/using.html
 share/examples/atlc/13inner_22outer_coax.bmp
 share/examples/atlc/aliased.bmp
 share/examples/atlc/an_odd_er.bmp
@@ -169,5 +169,5 @@ share/examples/atlc/ushape.bmp
 share/examples/atlc/very-odd.bmp
 share/examples/atlc/wide-9pixel.bmp
 @dirrm share/examples/atlc
-%%PORTDOCS%%@dirrm share/doc/atlc/jpgs
-%%PORTDOCS%%@dirrm share/doc/atlc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/jpgs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/cad/cascade/pkg-plist b/cad/cascade/pkg-plist
index 11a29259c2aa..a2e831c4826c 100644
--- a/cad/cascade/pkg-plist
+++ b/cad/cascade/pkg-plist
@@ -1,10 +1,10 @@
 bin/cascade
-%%PORTDOCS%%share/doc/cascade/ex1.gif
-%%PORTDOCS%%share/doc/cascade/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ex1.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html
 share/emacs/site-lisp/cascade-mode.el
 share/examples/cascade/README.examples
 share/examples/cascade/ex1.cas
 share/examples/cascade/ex1.gif
 share/examples/cascade/ex1.out
 @dirrm share/examples/cascade
-%%PORTDOCS%%@dirrm share/doc/cascade
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/cad/gtkwave/pkg-plist b/cad/gtkwave/pkg-plist
index 4453d7ca9826..d7779af461a4 100644
--- a/cad/gtkwave/pkg-plist
+++ b/cad/gtkwave/pkg-plist
@@ -10,31 +10,31 @@ lib/gtkwave/reader_out.so.0
 lib/gtkwave/reader_vcd.a
 lib/gtkwave/reader_vcd.so
 lib/gtkwave/reader_vcd.so.0
-%%PORTDOCS%%share/doc/gtkwave/data_format.png
-%%PORTDOCS%%share/doc/gtkwave/edit_menu.png
-%%PORTDOCS%%share/doc/gtkwave/file_menu.png
-%%PORTDOCS%%share/doc/gtkwave/gtkwave.html
-%%PORTDOCS%%share/doc/gtkwave/help_menu.png
-%%PORTDOCS%%share/doc/gtkwave/hierarchy.png
-%%PORTDOCS%%share/doc/gtkwave/markers_menu.png
-%%PORTDOCS%%share/doc/gtkwave/search_menu.png
-%%PORTDOCS%%share/doc/gtkwave/time_menu.png
-%%PORTDOCS%%share/doc/gtkwave/view_menu.png
-%%PORTDOCS%%share/doc/gtkwave/w.ps
-%%PORTDOCS%%share/doc/gtkwave/w1.png
-%%PORTDOCS%%share/doc/gtkwave/w10.png
-%%PORTDOCS%%share/doc/gtkwave/w11.png
-%%PORTDOCS%%share/doc/gtkwave/w12.png
-%%PORTDOCS%%share/doc/gtkwave/w13.png
-%%PORTDOCS%%share/doc/gtkwave/w3.png
-%%PORTDOCS%%share/doc/gtkwave/w4.png
-%%PORTDOCS%%share/doc/gtkwave/w5.png
-%%PORTDOCS%%share/doc/gtkwave/w6.png
-%%PORTDOCS%%share/doc/gtkwave/w7.png
-%%PORTDOCS%%share/doc/gtkwave/w8.png
-%%PORTDOCS%%share/doc/gtkwave/w9.png
-%%PORTDOCS%%share/doc/gtkwave/wps.png
-%%PORTDOCS%%share/doc/gtkwave/zoom_submenu.png
+%%PORTDOCS%%%%DOCSDIR%%/data_format.png
+%%PORTDOCS%%%%DOCSDIR%%/edit_menu.png
+%%PORTDOCS%%%%DOCSDIR%%/file_menu.png
+%%PORTDOCS%%%%DOCSDIR%%/gtkwave.html
+%%PORTDOCS%%%%DOCSDIR%%/help_menu.png
+%%PORTDOCS%%%%DOCSDIR%%/hierarchy.png
+%%PORTDOCS%%%%DOCSDIR%%/markers_menu.png
+%%PORTDOCS%%%%DOCSDIR%%/search_menu.png
+%%PORTDOCS%%%%DOCSDIR%%/time_menu.png
+%%PORTDOCS%%%%DOCSDIR%%/view_menu.png
+%%PORTDOCS%%%%DOCSDIR%%/w.ps
+%%PORTDOCS%%%%DOCSDIR%%/w1.png
+%%PORTDOCS%%%%DOCSDIR%%/w10.png
+%%PORTDOCS%%%%DOCSDIR%%/w11.png
+%%PORTDOCS%%%%DOCSDIR%%/w12.png
+%%PORTDOCS%%%%DOCSDIR%%/w13.png
+%%PORTDOCS%%%%DOCSDIR%%/w3.png
+%%PORTDOCS%%%%DOCSDIR%%/w4.png
+%%PORTDOCS%%%%DOCSDIR%%/w5.png
+%%PORTDOCS%%%%DOCSDIR%%/w6.png
+%%PORTDOCS%%%%DOCSDIR%%/w7.png
+%%PORTDOCS%%%%DOCSDIR%%/w8.png
+%%PORTDOCS%%%%DOCSDIR%%/w9.png
+%%PORTDOCS%%%%DOCSDIR%%/wps.png
+%%PORTDOCS%%%%DOCSDIR%%/zoom_submenu.png
 %%PORTDOCS%%share/examples/gtkwave/agonynan_bccom.vcd.gz
 %%PORTDOCS%%share/examples/gtkwave/pci.vcd.gz
 %%PORTDOCS%%share/examples/gtkwave/simple.vcd
@@ -63,5 +63,5 @@ share/gtkwave/pixmaps/vcd_mime.xpm
 @dirrm share/gtkwave/pixmaps
 @dirrm share/gtkwave
 %%PORTDOCS%%@dirrm share/examples/gtkwave
-%%PORTDOCS%%@dirrm share/doc/gtkwave
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/gtkwave
diff --git a/cad/mars/pkg-plist b/cad/mars/pkg-plist
index 95a3ad02a537..e70dd8905bbf 100644
--- a/cad/mars/pkg-plist
+++ b/cad/mars/pkg-plist
@@ -1,8 +1,8 @@
 bin/mars
-%%PORTDOCS%%share/doc/mars/proman/prog.ps
-%%PORTDOCS%%share/doc/mars/usrman/user.ps
-%%PORTDOCS%%share/doc/mars/motifman/Xmotif.ps
-%%PORTDOCS%%@dirrm share/doc/mars/proman
-%%PORTDOCS%%@dirrm share/doc/mars/usrman
-%%PORTDOCS%%@dirrm share/doc/mars/motifman
-%%PORTDOCS%%@dirrm share/doc/mars
+%%PORTDOCS%%%%DOCSDIR%%/proman/prog.ps
+%%PORTDOCS%%%%DOCSDIR%%/usrman/user.ps
+%%PORTDOCS%%%%DOCSDIR%%/motifman/Xmotif.ps
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/proman
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/usrman
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/motifman
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/cad/pcb/pkg-plist b/cad/pcb/pkg-plist
index d6c926de0415..c4750b372f1e 100644
--- a/cad/pcb/pkg-plist
+++ b/cad/pcb/pkg-plist
@@ -45,10 +45,10 @@ lib/pcb/m4/to.inc
 @unexec install-info --delete %D/info/pcb.info %D/info/dir
 info/pcb.info
 @exec install-info --section="Utilities" --entry="* PCB: (pcb).		Interactive printed circuit board layout system for X11" %D/info/pcb.info %D/info/dir
-share/doc/pcb/index.html
-share/doc/pcb/pcb.html
-share/doc/pcb/pcb.ps
-share/doc/pcb/refcard.ps
-@dirrm share/doc/pcb
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/pcb.html
+%%DOCSDIR%%/pcb.ps
+%%DOCSDIR%%/refcard.ps
+@dirrm %%DOCSDIR%%
 @dirrm lib/pcb/m4
 @dirrm lib/pcb
diff --git a/cad/sceptre/pkg-plist b/cad/sceptre/pkg-plist
index eb55af15093a..d06537b2b91b 100644
--- a/cad/sceptre/pkg-plist
+++ b/cad/sceptre/pkg-plist
@@ -10,6 +10,6 @@ lib/libx2.a
 lib/libx3.a
 lib/usrlib.a
 lib/modellib.dat
-%%PORTDOCS%%share/doc/sceptre/doc_en.pdf
-%%PORTDOCS%%share/doc/sceptre/doc_ger.pdf
-%%PORTDOCS%%@dirrm share/doc/sceptre
+%%PORTDOCS%%%%DOCSDIR%%/doc_en.pdf
+%%PORTDOCS%%%%DOCSDIR%%/doc_ger.pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%