7 files changed, 116 insertions, 116 deletions
diff --git a/astro/gkrellmoon/pkg-plist b/astro/gkrellmoon/pkg-plist
index e0b3e8dd4274..8045c71e4e40 100644
--- a/astro/gkrellmoon/pkg-plist
+++ b/astro/gkrellmoon/pkg-plist
@@ -1,3 +1,3 @@
 libexec/gkrellm/plugins/gkrellmoon.so
-%%PORTDOCS%%share/doc/gkrellmoon/README
-%%PORTDOCS%%@dirrm share/doc/gkrellmoon
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/astro/gkrellmseti/pkg-plist b/astro/gkrellmseti/pkg-plist
index 8599722a8a6f..62668f3c64d9 100644
--- a/astro/gkrellmseti/pkg-plist
+++ b/astro/gkrellmseti/pkg-plist
@@ -1,5 +1,5 @@
 libexec/gkrellm/plugins/seti.so
-%%PORTDOCS%%share/doc/seti/AUTHORS
-%%PORTDOCS%%share/doc/seti/README
-%%PORTDOCS%%share/doc/seti/TODO
-%%PORTDOCS%%@dirrm share/doc/seti
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/astro/gpsman/pkg-plist b/astro/gpsman/pkg-plist
index 9b33fd5b1ad9..4d7e038aff8c 100644
--- a/astro/gpsman/pkg-plist
+++ b/astro/gpsman/pkg-plist
@@ -215,95 +215,95 @@ share/gpsman/util/exerciser.tcl
 share/gpsman/util/gpsman.sh
 share/gpsman/util/mb2gmn.tcl
 share/gpsman/util/mou2gmn.tcl
-%%PORTDOCS%%share/doc/gpsman/GPSMandoc.pdf
-%%PORTDOCS%%share/doc/gpsman/GPSMandoc.ps
-%%PORTDOCS%%share/doc/gpsman/html/index.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_1.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_2.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_3.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_4.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_5.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_6.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_7.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_8.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_9.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_10.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_11.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_12.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_13.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_14.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_15.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_16.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_17.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_18.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_19.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_20.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_21.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_22.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_23.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_24.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_25.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_26.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_27.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_28.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_29.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_30.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_31.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_32.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_33.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_34.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_35.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_36.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_37.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_38.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_39.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_40.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_41.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_42.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_43.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_44.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_45.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_46.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_47.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_48.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_49.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_50.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_51.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_52.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_53.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_54.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_55.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_56.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_57.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_58.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_59.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_60.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_61.html
-%%PORTDOCS%%share/doc/gpsman/html/GPSMandoc_62.html
-%%PORTDOCS%%share/doc/gpsman/html/backgr.gif
-%%PORTDOCS%%share/doc/gpsman/html/blank.gif
-%%PORTDOCS%%share/doc/gpsman/html/boxes.gif
-%%PORTDOCS%%share/doc/gpsman/html/eqn1.gif
-%%PORTDOCS%%share/doc/gpsman/html/gpsman-logo-small.gif
-%%PORTDOCS%%share/doc/gpsman/html/gpsman-logo.gif
-%%PORTDOCS%%share/doc/gpsman/html/info/WPs.txt
-%%PORTDOCS%%share/doc/gpsman/html/info/coords.gif
-%%PORTDOCS%%share/doc/gpsman/html/info/l_realtime.doc.txt
-%%PORTDOCS%%share/doc/gpsman/html/info/lowrance.doc.txt
-%%PORTDOCS%%share/doc/gpsman/html/info/sample.txt
-%%PORTDOCS%%share/doc/gpsman/html/info/samplecpt.txt
-%%PORTDOCS%%share/doc/gpsman/html/info/samplemap.gif
-%%PORTDOCS%%share/doc/gpsman/html/info/samplemap.ps
-%%PORTDOCS%%share/doc/gpsman/html/info/sampletrrt.gif
-%%PORTDOCS%%share/doc/gpsman/html/newarr.gif
-%%PORTDOCS%%share/doc/gpsman/html/newearr.gif
-%%PORTDOCS%%share/doc/gpsman/html/next.gif
-%%PORTDOCS%%share/doc/gpsman/html/previous.gif
-%%PORTDOCS%%share/doc/gpsman/html/up.gif
-@dirrm %%PORTDOCS%%share/doc/gpsman/html/info
-@dirrm %%PORTDOCS%%share/doc/gpsman/html
-@dirrm %%PORTDOCS%%share/doc/gpsman
+%%PORTDOCS%%%%DOCSDIR%%/GPSMandoc.pdf
+%%PORTDOCS%%%%DOCSDIR%%/GPSMandoc.ps
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_9.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_10.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_11.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_12.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_13.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_14.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_15.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_16.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_17.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_18.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_19.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_20.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_21.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_22.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_23.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_24.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_25.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_26.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_27.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_28.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_29.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_30.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_31.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_32.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_33.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_34.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_35.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_36.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_37.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_38.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_39.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_40.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_41.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_42.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_43.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_44.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_45.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_46.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_47.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_48.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_49.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_50.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_51.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_52.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_53.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_54.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_55.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_56.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_57.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_58.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_59.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_60.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_61.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_62.html
+%%PORTDOCS%%%%DOCSDIR%%/html/backgr.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/blank.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/boxes.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/eqn1.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/gpsman-logo-small.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/gpsman-logo.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/info/WPs.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/info/coords.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/info/l_realtime.doc.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/info/lowrance.doc.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/info/sample.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/info/samplecpt.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/info/samplemap.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/info/samplemap.ps
+%%PORTDOCS%%%%DOCSDIR%%/html/info/sampletrrt.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/newarr.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/newearr.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/next.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/previous.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/up.gif
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/html/info
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/html
+@dirrm %%PORTDOCS%%%%DOCSDIR%%
 @dirrm share/gpsman/util
 @dirrm share/gpsman/gmsrc/gmicons
 @dirrm share/gpsman/gmsrc
diff --git a/astro/p5-SETI-Stats/pkg-plist b/astro/p5-SETI-Stats/pkg-plist
index 4615d7be5a4c..c8187318ebe9 100644
--- a/astro/p5-SETI-Stats/pkg-plist
+++ b/astro/p5-SETI-Stats/pkg-plist
@@ -1,7 +1,7 @@
 lib/perl5/site_perl/%%PERL_VER%%/SETI/Stats.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SETI-Stats/.packlist
-%%PORTDOCS%%share/doc/SETI-Stats/README
-%%PORTDOCS%%share/doc/SETI-Stats/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SETI-Stats
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/SETI
-%%PORTDOCS%%@dirrm share/doc/SETI-Stats
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/astro/spacechart/pkg-plist b/astro/spacechart/pkg-plist
index 961789efd5cf..e8e76c10c461 100644
--- a/astro/spacechart/pkg-plist
+++ b/astro/spacechart/pkg-plist
@@ -1,9 +1,9 @@
 bin/spacechart
 etc/sample-spacechartrc
 etc/spacechartrc
-%%PORTDOCS%%share/doc/spacechart/README
-%%PORTDOCS%%share/doc/spacechart/coordinates.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/coordinates.txt
 share/locale/es/LC_MESSAGES/spacechart.mo
 share/spacechart/gliese.dat
 @dirrm share/spacechart
-%%PORTDOCS%%@dirrm share/doc/spacechart
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/astro/starplot/pkg-plist b/astro/starplot/pkg-plist
index eb9aca011a17..4f557413f9d2 100644
--- a/astro/starplot/pkg-plist
+++ b/astro/starplot/pkg-plist
@@ -1,18 +1,18 @@
 bin/starplot
 bin/starconvert
-%%PORTDOCS%%share/doc/starplot/README
-%%PORTDOCS%%share/doc/starplot/examples/example.spec
-%%PORTDOCS%%share/doc/starplot/html/ch1.html
-%%PORTDOCS%%share/doc/starplot/html/images/bayerdes.png
-%%PORTDOCS%%share/doc/starplot/html/images/coords.png
-%%PORTDOCS%%share/doc/starplot/html/images/gcoords.png
-%%PORTDOCS%%share/doc/starplot/html/images/hrdiagram.png
-%%PORTDOCS%%share/doc/starplot/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/examples/example.spec
+%%PORTDOCS%%%%DOCSDIR%%/html/ch1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/images/bayerdes.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/coords.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/gcoords.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hrdiagram.png
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
 share/starplot/examples/sample.stars
 share/starplot/examples/test.stars
 @dirrm share/starplot/examples
 @dirrm share/starplot/
-%%PORTDOCS%%@dirrm share/doc/starplot/html/images
-%%PORTDOCS%%@dirrm share/doc/starplot/html
-%%PORTDOCS%%@dirrm share/doc/starplot/examples
-%%PORTDOCS%%@dirrm share/doc/starplot/
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/
diff --git a/astro/tkseti/pkg-plist b/astro/tkseti/pkg-plist
index 83975311c55b..c144fe3173be 100644
--- a/astro/tkseti/pkg-plist
+++ b/astro/tkseti/pkg-plist
@@ -1,4 +1,4 @@
 bin/tkseti
-%%PORTDOCS%%share/doc/tkseti/DOC
-%%PORTDOCS%%share/doc/tkseti/README
-%%PORTDOCS%%@dirrm share/doc/tkseti
+%%PORTDOCS%%%%DOCSDIR%%/DOC
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%