17 files changed, 90 insertions, 90 deletions

diff --git a/archivers/arc/pkg-plist b/archivers/arc/pkg-plist
index 23486c68624a..f1c08f43176f 100644
--- a/archivers/arc/pkg-plist
+++ b/archivers/arc/pkg-plist
@@ -1,4 +1,4 @@
 bin/arc
 bin/marc
-share/doc/arc/Arc521.doc
-@dirrm share/doc/arc
+%%DOCSDIR%%/Arc521.doc
+@dirrm %%DOCSDIR%%
diff --git a/archivers/bzip2/pkg-plist b/archivers/bzip2/pkg-plist
index d8dfe5510cfc..fb95326b3911 100644
--- a/archivers/bzip2/pkg-plist
+++ b/archivers/bzip2/pkg-plist
@@ -13,16 +13,16 @@ include/bzlib.h
 lib/libbz2.a
 lib/libbz2.so
 lib/libbz2.so.1
-%%PORTDOCS%%share/doc/bzip2/manual.ps.bz2
-%%PORTDOCS%%share/doc/bzip2/manual.texi
-%%PORTDOCS%%share/doc/bzip2/manual_1.html
-%%PORTDOCS%%share/doc/bzip2/manual_2.html
-%%PORTDOCS%%share/doc/bzip2/manual_3.html
-%%PORTDOCS%%share/doc/bzip2/manual_4.html
-%%PORTDOCS%%share/doc/bzip2/manual_toc.html
-%%PORTDOCS%%share/doc/bzip2/manual.html
-%%PORTDOCS%%share/doc/bzip2/manual_abt.html
-%%PORTDOCS%%share/doc/bzip2/manual_ovr.html
-%%PORTDOCS%%share/doc/bzip2/manual.pdf
-%%PORTDOCS%%share/doc/bzip2/bzip2.txt
-%%PORTDOCS%%@dirrm share/doc/bzip2
+%%PORTDOCS%%%%DOCSDIR%%/manual.ps.bz2
+%%PORTDOCS%%%%DOCSDIR%%/manual.texi
+%%PORTDOCS%%%%DOCSDIR%%/manual_1.html
+%%PORTDOCS%%%%DOCSDIR%%/manual_2.html
+%%PORTDOCS%%%%DOCSDIR%%/manual_3.html
+%%PORTDOCS%%%%DOCSDIR%%/manual_4.html
+%%PORTDOCS%%%%DOCSDIR%%/manual_toc.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/manual_abt.html
+%%PORTDOCS%%%%DOCSDIR%%/manual_ovr.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.pdf
+%%PORTDOCS%%%%DOCSDIR%%/bzip2.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/archivers/fastjar/pkg-plist b/archivers/fastjar/pkg-plist
index 025f1b2db8a7..82f4dcb1ebf0 100644
--- a/archivers/fastjar/pkg-plist
+++ b/archivers/fastjar/pkg-plist
@@ -1,5 +1,5 @@
 bin/fastjar
 bin/grepjar
-%%PORTDOCS%%share/doc/fastjar/CHANGES
-%%PORTDOCS%%share/doc/fastjar/README
-%%PORTDOCS%%@dirrm share/doc/fastjar
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/archivers/gzip/pkg-plist b/archivers/gzip/pkg-plist
index 3a85200fdf81..0f1b294d7446 100644
--- a/archivers/gzip/pkg-plist
+++ b/archivers/gzip/pkg-plist
@@ -12,12 +12,12 @@ bin/zgrep
 bin/zless
 bin/zmore
 bin/znew
-%%PORTDOCS%%share/doc/gzip/AUTHORS
-%%PORTDOCS%%share/doc/gzip/COPYING
-%%PORTDOCS%%share/doc/gzip/INSTALL
-%%PORTDOCS%%share/doc/gzip/NEWS
-%%PORTDOCS%%share/doc/gzip/README
-%%PORTDOCS%%share/doc/gzip/README-alpha
-%%PORTDOCS%%share/doc/gzip/THANKS
-%%PORTDOCS%%share/doc/gzip/TODO
-%%PORTDOCS%%@dirrm share/doc/gzip
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README-alpha
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/archivers/lbrate/pkg-plist b/archivers/lbrate/pkg-plist
index 828cb19c3c75..3f053968b5fd 100644
--- a/archivers/lbrate/pkg-plist
+++ b/archivers/lbrate/pkg-plist
@@ -1,6 +1,6 @@
 bin/lbrate
-%%PORTDOCS%%share/doc/lbrate/COPYING
-%%PORTDOCS%%share/doc/lbrate/ChangeLog
-%%PORTDOCS%%share/doc/lbrate/README
-%%PORTDOCS%%share/doc/lbrate/TODO
-%%PORTDOCS%%@dirrm share/doc/lbrate
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/archivers/lzo/pkg-plist b/archivers/lzo/pkg-plist
index de5fcf20f09b..9951bb36e9a9 100644
--- a/archivers/lzo/pkg-plist
+++ b/archivers/lzo/pkg-plist
@@ -13,8 +13,8 @@ include/lzoutil.h
 lib/liblzo.a
 lib/liblzo.so
 lib/liblzo.so.1
-%%PORTDOCS%%share/doc/lzo/LTEST.TXT
-%%PORTDOCS%%share/doc/lzo/LZO.FAQ
-%%PORTDOCS%%share/doc/lzo/LZO.TXT
-%%PORTDOCS%%share/doc/lzo/LZOAPI.TXT
-%%PORTDOCS%%@dirrm share/doc/lzo
+%%PORTDOCS%%%%DOCSDIR%%/LTEST.TXT
+%%PORTDOCS%%%%DOCSDIR%%/LZO.FAQ
+%%PORTDOCS%%%%DOCSDIR%%/LZO.TXT
+%%PORTDOCS%%%%DOCSDIR%%/LZOAPI.TXT
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/archivers/lzo2/pkg-plist b/archivers/lzo2/pkg-plist
index de5fcf20f09b..9951bb36e9a9 100644
--- a/archivers/lzo2/pkg-plist
+++ b/archivers/lzo2/pkg-plist
@@ -13,8 +13,8 @@ include/lzoutil.h
 lib/liblzo.a
 lib/liblzo.so
 lib/liblzo.so.1
-%%PORTDOCS%%share/doc/lzo/LTEST.TXT
-%%PORTDOCS%%share/doc/lzo/LZO.FAQ
-%%PORTDOCS%%share/doc/lzo/LZO.TXT
-%%PORTDOCS%%share/doc/lzo/LZOAPI.TXT
-%%PORTDOCS%%@dirrm share/doc/lzo
+%%PORTDOCS%%%%DOCSDIR%%/LTEST.TXT
+%%PORTDOCS%%%%DOCSDIR%%/LZO.FAQ
+%%PORTDOCS%%%%DOCSDIR%%/LZO.TXT
+%%PORTDOCS%%%%DOCSDIR%%/LZOAPI.TXT
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/archivers/macutils/pkg-plist b/archivers/macutils/pkg-plist
index 4e030371235d..cd0dc454961f 100644
--- a/archivers/macutils/pkg-plist
+++ b/archivers/macutils/pkg-plist
@@ -5,14 +5,14 @@ bin/macsave
 bin/macstream
 bin/macunpack
 bin/tomac
-%%PORTDOCS%%share/doc/macutils/README
-%%PORTDOCS%%share/doc/macutils/README.crc
-%%PORTDOCS%%share/doc/macutils/README.crc.orig
-%%PORTDOCS%%share/doc/macutils/README.hexbin
-%%PORTDOCS%%share/doc/macutils/README.macget
-%%PORTDOCS%%share/doc/macutils/README.macput
-%%PORTDOCS%%share/doc/macutils/README.scan
-%%PORTDOCS%%share/doc/macutils/README.unpit
-%%PORTDOCS%%share/doc/macutils/README.unsit
-%%PORTDOCS%%share/doc/macutils/README.zoom
-%%PORTDOCS%%@dirrm share/doc/macutils
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.crc
+%%PORTDOCS%%%%DOCSDIR%%/README.crc.orig
+%%PORTDOCS%%%%DOCSDIR%%/README.hexbin
+%%PORTDOCS%%%%DOCSDIR%%/README.macget
+%%PORTDOCS%%%%DOCSDIR%%/README.macput
+%%PORTDOCS%%%%DOCSDIR%%/README.scan
+%%PORTDOCS%%%%DOCSDIR%%/README.unpit
+%%PORTDOCS%%%%DOCSDIR%%/README.unsit
+%%PORTDOCS%%%%DOCSDIR%%/README.zoom
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/archivers/mtf/pkg-plist b/archivers/mtf/pkg-plist
index a9ea57e88dbb..b8da8210ba7a 100644
--- a/archivers/mtf/pkg-plist
+++ b/archivers/mtf/pkg-plist
@@ -1,3 +1,3 @@
 bin/mtf
-%%PORTDOCS%%share/doc/mtf/README
-%%PORTDOCS%%@dirrm share/doc/mtf
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/archivers/rar/pkg-plist b/archivers/rar/pkg-plist
index aa0684023aab..336cfed09211 100644
--- a/archivers/rar/pkg-plist
+++ b/archivers/rar/pkg-plist
@@ -2,14 +2,14 @@ bin/rar
 bin/unrar
 lib/default.sfx
 etc/rarfiles.lst
-share/doc/rar/technote.txt
-share/doc/rar/rar_faq.txt
-share/doc/rar/rar_site.txt
-share/doc/rar/license.txt
-share/doc/rar/whatsnew.txt
-share/doc/rar/rereg.txt
-share/doc/rar/register.txt
-share/doc/rar/order.txt
-share/doc/rar/readme.txt
-share/doc/rar/file_id.diz
-@dirrm share/doc/rar
+%%DOCSDIR%%/technote.txt
+%%DOCSDIR%%/rar_faq.txt
+%%DOCSDIR%%/rar_site.txt
+%%DOCSDIR%%/license.txt
+%%DOCSDIR%%/whatsnew.txt
+%%DOCSDIR%%/rereg.txt
+%%DOCSDIR%%/register.txt
+%%DOCSDIR%%/order.txt
+%%DOCSDIR%%/readme.txt
+%%DOCSDIR%%/file_id.diz
+@dirrm %%DOCSDIR%%
diff --git a/archivers/szip/pkg-plist b/archivers/szip/pkg-plist
index 3f78d5de9836..79c8e8838a5b 100644
--- a/archivers/szip/pkg-plist
+++ b/archivers/szip/pkg-plist
@@ -1,5 +1,5 @@
 bin/szip
-%%PORTDOCS%%share/doc/szip/history.txt
-%%PORTDOCS%%share/doc/szip/readme.txt
-%%PORTDOCS%%share/doc/szip/techinfo.txt
-%%PORTDOCS%%@dirrm share/doc/szip
+%%PORTDOCS%%%%DOCSDIR%%/history.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/techinfo.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/archivers/ucl/pkg-plist b/archivers/ucl/pkg-plist
index 1c651af71543..4b30d23fd41e 100644
--- a/archivers/ucl/pkg-plist
+++ b/archivers/ucl/pkg-plist
@@ -5,7 +5,7 @@ include/ucl/uclutil.h
 lib/libucl.a
 lib/libucl.so
 lib/libucl.so.0
-%%PORTDOCS%%share/doc/ucl/COPYING
-%%PORTDOCS%%share/doc/ucl/README
-%%PORTDOCS%%@dirrm share/doc/ucl
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/ucl
diff --git a/archivers/unarj/pkg-plist b/archivers/unarj/pkg-plist
index a75726ff71a3..a3b852d9623f 100644
--- a/archivers/unarj/pkg-plist
+++ b/archivers/unarj/pkg-plist
@@ -1,4 +1,4 @@
 bin/unarj
-share/doc/unarj/unarj.doc
-share/doc/unarj/technote.doc
-@dirrm share/doc/unarj
+%%DOCSDIR%%/unarj.doc
+%%DOCSDIR%%/technote.doc
+@dirrm %%DOCSDIR%%
diff --git a/archivers/unrar/pkg-plist b/archivers/unrar/pkg-plist
index bf054ae38a73..df0fe6f745ba 100644
--- a/archivers/unrar/pkg-plist
+++ b/archivers/unrar/pkg-plist
@@ -1,4 +1,4 @@
 bin/unrar
-share/doc/unrar/license.txt
-share/doc/unrar/readme.txt
-@dirrm share/doc/unrar
+%%DOCSDIR%%/license.txt
+%%DOCSDIR%%/readme.txt
+@dirrm %%DOCSDIR%%
diff --git a/archivers/unzip/pkg-plist b/archivers/unzip/pkg-plist
index c58cae0bc9a0..ebe0cf8b981e 100644
--- a/archivers/unzip/pkg-plist
+++ b/archivers/unzip/pkg-plist
@@ -4,6 +4,6 @@ bin/unzip
 bin/funzip
 bin/unzipsfx
 bin/zipgrep
-%%PORTDOCS%%share/doc/unzip/README
-%%PORTDOCS%%share/doc/unzip/WHERE
-%%PORTDOCS%%@dirrm share/doc/unzip
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/WHERE
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/archivers/xdms/pkg-plist b/archivers/xdms/pkg-plist
index 7f0c145bbc84..925b727eff82 100644
--- a/archivers/xdms/pkg-plist
+++ b/archivers/xdms/pkg-plist
@@ -1,3 +1,3 @@
 bin/xdms
-%%PORTDOCS%%share/doc/xdms/xdms.txt
-%%PORTDOCS%%@dirrm share/doc/xdms
+%%PORTDOCS%%%%DOCSDIR%%/xdms.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/archivers/xmill/pkg-plist b/archivers/xmill/pkg-plist
index ec22bd5f1c85..caadc03cbabc 100644
--- a/archivers/xmill/pkg-plist
+++ b/archivers/xmill/pkg-plist
@@ -2,9 +2,9 @@ bin/xmill
 bin/xdemill
 bin/xbmill
 bin/xbdemill
-%%PORTDOCS%%share/doc/xmill/COPYRIGHT.txt
-%%PORTDOCS%%share/doc/xmill/LICENSE.txt
-%%PORTDOCS%%share/doc/xmill/MANUAL.txt
-%%PORTDOCS%%share/doc/xmill/README.txt
-%%PORTDOCS%%share/doc/xmill/xmill.ps.gz
-%%PORTDOCS%%@dirrm share/doc/xmill
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.txt
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/xmill.ps.gz
+%%PORTDOCS%%@dirrm %%DOCSDIR%%