7 files changed, 39 insertions, 39 deletions

diff --git a/converters/chmview/pkg-plist b/converters/chmview/pkg-plist
index 677d264eacc5..e046d8cd082b 100644
--- a/converters/chmview/pkg-plist
+++ b/converters/chmview/pkg-plist
@@ -1,3 +1,3 @@
 bin/chmview
-share/doc/chmview/chmformat.html
-@dirrm share/doc/chmview
+%%DOCSDIR%%/chmformat.html
+@dirrm %%DOCSDIR%%
diff --git a/converters/enca/pkg-plist b/converters/enca/pkg-plist
index 5f02ed4c0521..3feda7cbcfa2 100644
--- a/converters/enca/pkg-plist
+++ b/converters/enca/pkg-plist
@@ -9,12 +9,12 @@ lib/libenca.a
 lib/libenca.so
 lib/libenca.so.3
 libdata/pkgconfig/enca.pc
-%%PORTDOCS%%share/doc/enca/libenca/c4.html
-%%PORTDOCS%%share/doc/enca/libenca/index.html
-%%PORTDOCS%%share/doc/enca/libenca/index.sgml
-%%PORTDOCS%%share/doc/enca/libenca/libenca-analyser.html
-%%PORTDOCS%%share/doc/enca/libenca/libenca-auxiliary-functions.html
-%%PORTDOCS%%share/doc/enca/libenca/libenca-charsets-and-surfaces.html
-%%PORTDOCS%%share/doc/enca/libenca/libenca-typedefs-and-constants.html
-%%PORTDOCS%%@dirrm share/doc/enca/libenca
-%%PORTDOCS%%@dirrm share/doc/enca
+%%PORTDOCS%%%%DOCSDIR%%/libenca/c4.html
+%%PORTDOCS%%%%DOCSDIR%%/libenca/index.html
+%%PORTDOCS%%%%DOCSDIR%%/libenca/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/libenca/libenca-analyser.html
+%%PORTDOCS%%%%DOCSDIR%%/libenca/libenca-auxiliary-functions.html
+%%PORTDOCS%%%%DOCSDIR%%/libenca/libenca-charsets-and-surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/libenca/libenca-typedefs-and-constants.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/libenca
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/converters/mule-ucs/pkg-plist b/converters/mule-ucs/pkg-plist
index 87f37ba022c4..67995c347d09 100644
--- a/converters/mule-ucs/pkg-plist
+++ b/converters/mule-ucs/pkg-plist
@@ -97,11 +97,11 @@
 @dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213
 @dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata
 @dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs
-%%PORTDOCS%%share/doc/mule-ucs/ChangeLog
-%%PORTDOCS%%share/doc/mule-ucs/ChangeLog.jisx0213
-%%PORTDOCS%%share/doc/mule-ucs/MuleUni.txt
-%%PORTDOCS%%share/doc/mule-ucs/README
-%%PORTDOCS%%share/doc/mule-ucs/README.Unicode
-%%PORTDOCS%%share/doc/mule-ucs/README.big5conv
-%%PORTDOCS%%share/doc/mule-ucs/README.jisx0213
-%%PORTDOCS%%@dirrm share/doc/mule-ucs
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.jisx0213
+%%PORTDOCS%%%%DOCSDIR%%/MuleUni.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.Unicode
+%%PORTDOCS%%%%DOCSDIR%%/README.big5conv
+%%PORTDOCS%%%%DOCSDIR%%/README.jisx0213
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/converters/utf8conv/pkg-plist b/converters/utf8conv/pkg-plist
index 065d810ed7d7..b3c562fd432d 100644
--- a/converters/utf8conv/pkg-plist
+++ b/converters/utf8conv/pkg-plist
@@ -1,3 +1,3 @@
 bin/utf8conv
-%%PORTDOCS%%share/doc/utf8conv/README
-%%PORTDOCS%%@dirrm share/doc/utf8conv
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/converters/uudeview/pkg-plist b/converters/uudeview/pkg-plist
index 45cdbac2303e..dc6c9cadfd30 100644
--- a/converters/uudeview/pkg-plist
+++ b/converters/uudeview/pkg-plist
@@ -1,5 +1,5 @@
 bin/uudeview
 bin/uuenview
-%%PORTDOCS%%share/doc/uudeview/HISTORY
-%%PORTDOCS%%share/doc/uudeview/porting.notes
-%%PORTDOCS%%@dirrm share/doc/uudeview
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY
+%%PORTDOCS%%%%DOCSDIR%%/porting.notes
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/converters/uulib/pkg-plist b/converters/uulib/pkg-plist
index cb91049d7218..c1a127a0caa4 100644
--- a/converters/uulib/pkg-plist
+++ b/converters/uulib/pkg-plist
@@ -2,16 +2,16 @@ lib/libuu.a
 lib/libuu.so
 lib/libuu.so.2
 include/uudeview.h
-%%PORTDOCS%%share/doc/uulib/Makefile
-%%PORTDOCS%%share/doc/uulib/README
-%%PORTDOCS%%share/doc/uulib/binhex.fig
-%%PORTDOCS%%share/doc/uulib/library.ltx
-%%PORTDOCS%%share/doc/uulib/structure.fig
-%%PORTDOCS%%share/doc/uulib/td-v1.c
-%%PORTDOCS%%share/doc/uulib/td-v2.c
-%%PORTDOCS%%share/doc/uulib/td-v3.c
-%%PORTDOCS%%share/doc/uulib/test.txt
-%%PORTDOCS%%share/doc/uulib/porting.notes
-%%PORTDOCS%%share/doc/uulib/HISTORY
-%%PORTDOCS%%share/doc/uulib/COPYING
-%%PORTDOCS%%@dirrm share/doc/uulib
+%%PORTDOCS%%%%DOCSDIR%%/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/binhex.fig
+%%PORTDOCS%%%%DOCSDIR%%/library.ltx
+%%PORTDOCS%%%%DOCSDIR%%/structure.fig
+%%PORTDOCS%%%%DOCSDIR%%/td-v1.c
+%%PORTDOCS%%%%DOCSDIR%%/td-v2.c
+%%PORTDOCS%%%%DOCSDIR%%/td-v3.c
+%%PORTDOCS%%%%DOCSDIR%%/test.txt
+%%PORTDOCS%%%%DOCSDIR%%/porting.notes
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/converters/xdeview/pkg-plist b/converters/xdeview/pkg-plist
index 1aeedf24fa32..90ab037f8eb2 100644
--- a/converters/xdeview/pkg-plist
+++ b/converters/xdeview/pkg-plist
@@ -1,4 +1,4 @@
 bin/uuwish
 bin/xdeview
-%%PORTDOCS%%share/doc/xdeview/porting.notes
-%%PORTDOCS%%@dirrm share/doc/xdeview
+%%PORTDOCS%%%%DOCSDIR%%/porting.notes
+%%PORTDOCS%%@dirrm %%DOCSDIR%%