7 files changed, 45 insertions, 48 deletions

diff --git a/misc/diction/Makefile b/misc/diction/Makefile
index f8a7ed7e4ad1..3929fe1036e3 100644
--- a/misc/diction/Makefile
+++ b/misc/diction/Makefile
@@ -17,6 +17,10 @@ COMMENT=	GNU diction and style
 
 USE_AUTOCONF=	yes
 
+PLIST_FILES=	bin/diction bin/style share/diction/C share/diction/de \
+		share/diction/en
+PLIST_DIRS=	share/diction
+
 MAN1=		diction.1 style.1
 
 .include <bsd.port.mk>
diff --git a/misc/diction/pkg-plist b/misc/diction/pkg-plist
deleted file mode 100644
index 028fab46de39..000000000000
--- a/misc/diction/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/diction
-bin/style
-share/diction/C
-share/diction/de
-share/diction/en
-@dirrm share/diction
diff --git a/misc/dotfile/pkg-plist b/misc/dotfile/pkg-plist
index 9c23e0e7a39f..eb2e766e7a55 100644
--- a/misc/dotfile/pkg-plist
+++ b/misc/dotfile/pkg-plist
@@ -337,35 +337,35 @@ lib/%%DISTNAME%%/japanese/fvwm2/style.template
 lib/%%DISTNAME%%/japanese/fvwm2/tools.tcl
 lib/%%DISTNAME%%/japanese/fvwm2/version
 lib/%%DISTNAME%%/japanese/fvwm2/virtual.template
-%%PORTDOCS%%share/doc/dotfile/dotfile/config_page.jpg
-%%PORTDOCS%%share/doc/dotfile/dotfile/extentry1.jpg
-%%PORTDOCS%%share/doc/dotfile/dotfile/extentry2.jpg
-%%PORTDOCS%%share/doc/dotfile/dotfile/index.html
-%%PORTDOCS%%share/doc/dotfile/dotfile/job_control.gif
-%%PORTDOCS%%share/doc/dotfile/dotfile/logo.gif
-%%PORTDOCS%%share/doc/dotfile/dotfile/menu_window.jpg
-%%PORTDOCS%%share/doc/dotfile/dotfile/prompt.jpg
-%%PORTDOCS%%share/doc/dotfile/index.html
-%%PORTDOCS%%share/doc/dotfile/procmail/backup.jpg
-%%PORTDOCS%%share/doc/dotfile/procmail/general.jpg
-%%PORTDOCS%%share/doc/dotfile/procmail/gray-g3.gif
-%%PORTDOCS%%share/doc/dotfile/procmail/header.jpg
-%%PORTDOCS%%share/doc/dotfile/procmail/index.html
-%%PORTDOCS%%share/doc/dotfile/procmail/main.jpg
-%%PORTDOCS%%share/doc/dotfile/procmail/recipes-with-numbers.jpg
-%%PORTDOCS%%share/doc/dotfile/procmail/recipes.jpg
-%%PORTDOCS%%share/doc/dotfile/tcsh/index.html
-%%PORTDOCS%%share/doc/dotfile/tcsh/lil2cent.gif
-%%PORTDOCS%%share/doc/dotfile/tcsh/pattern.gif
-%%PORTDOCS%%share/doc/dotfile/tcsh/pattern2.gif
-%%PORTDOCS%%share/doc/dotfile/tcsh/posdef.gif
-%%PORTDOCS%%share/doc/dotfile/tcsh/prompt.gif
-%%PORTDOCS%%share/doc/dotfile/tcsh/time.gif
-%%PORTDOCS%%share/doc/dotfile/tcsh/userdef.gif
-%%PORTDOCS%%@dirrm share/doc/dotfile/tcsh
-%%PORTDOCS%%@dirrm share/doc/dotfile/procmail
-%%PORTDOCS%%@dirrm share/doc/dotfile/dotfile
-%%PORTDOCS%%@dirrm share/doc/dotfile
+%%PORTDOCS%%%%DOCSDIR%%/dotfile/config_page.jpg
+%%PORTDOCS%%%%DOCSDIR%%/dotfile/extentry1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/dotfile/extentry2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/dotfile/index.html
+%%PORTDOCS%%%%DOCSDIR%%/dotfile/job_control.gif
+%%PORTDOCS%%%%DOCSDIR%%/dotfile/logo.gif
+%%PORTDOCS%%%%DOCSDIR%%/dotfile/menu_window.jpg
+%%PORTDOCS%%%%DOCSDIR%%/dotfile/prompt.jpg
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/procmail/backup.jpg
+%%PORTDOCS%%%%DOCSDIR%%/procmail/general.jpg
+%%PORTDOCS%%%%DOCSDIR%%/procmail/gray-g3.gif
+%%PORTDOCS%%%%DOCSDIR%%/procmail/header.jpg
+%%PORTDOCS%%%%DOCSDIR%%/procmail/index.html
+%%PORTDOCS%%%%DOCSDIR%%/procmail/main.jpg
+%%PORTDOCS%%%%DOCSDIR%%/procmail/recipes-with-numbers.jpg
+%%PORTDOCS%%%%DOCSDIR%%/procmail/recipes.jpg
+%%PORTDOCS%%%%DOCSDIR%%/tcsh/index.html
+%%PORTDOCS%%%%DOCSDIR%%/tcsh/lil2cent.gif
+%%PORTDOCS%%%%DOCSDIR%%/tcsh/pattern.gif
+%%PORTDOCS%%%%DOCSDIR%%/tcsh/pattern2.gif
+%%PORTDOCS%%%%DOCSDIR%%/tcsh/posdef.gif
+%%PORTDOCS%%%%DOCSDIR%%/tcsh/prompt.gif
+%%PORTDOCS%%%%DOCSDIR%%/tcsh/time.gif
+%%PORTDOCS%%%%DOCSDIR%%/tcsh/userdef.gif
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tcsh
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/procmail
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/dotfile
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/%%DISTNAME%%/japanese/fvwm2/save-files
 @dirrm lib/%%DISTNAME%%/japanese/fvwm2/exports
 @dirrm lib/%%DISTNAME%%/japanese/fvwm2
diff --git a/misc/earthview/Makefile b/misc/earthview/Makefile
index 094599cd53a6..dbc835edd544 100644
--- a/misc/earthview/Makefile
+++ b/misc/earthview/Makefile
@@ -20,6 +20,13 @@ USE_XLIB=	yes
 CFLAGS+=	-I${X11BASE}/include
 ALL_TARGET=	earthview
 
+PLIST_FILES=	bin/earthview share/earthview/topography/topography.cps \
+		share/earthview/topography/1440x720-2x2.az2 \
+		share/earthview/population/population.cps \
+		share/earthview/population/4320x2160-6x6.pz2
+PLIST_DIRS=	share/earthview/topography share/earthview/population \
+		share/earthview
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%CC%%|${CC}|g" \
 		-e "s|%%CFLAGS%%|${CFLAGS}|g" -e "s|%%X11BASE%%|${X11BASE}|g" \
diff --git a/misc/earthview/pkg-plist b/misc/earthview/pkg-plist
deleted file mode 100644
index 97913a31470c..000000000000
--- a/misc/earthview/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/earthview
-share/earthview/topography/topography.cps
-share/earthview/topography/1440x720-2x2.az2
-share/earthview/population/population.cps
-share/earthview/population/4320x2160-6x6.pz2
-@dirrm share/earthview/topography
-@dirrm share/earthview/population
-@dirrm share/earthview
diff --git a/misc/estic/Makefile b/misc/estic/Makefile
index 1c0a06f5a624..b6452766525f 100644
--- a/misc/estic/Makefile
+++ b/misc/estic/Makefile
@@ -26,9 +26,9 @@ AUTHOR=			"Ullrich von Bassewitz" <uz@ibb.schwaben.com>
 # Personal Preferences, Where to install.
 PBX_VAR=${PREFIX}/var/log/pbx
 PBX_ETC=${PREFIX}/etc/pbx
-PBX_MAN=${PREFIX}/man/man1
+PBX_MAN=${MANPREFIX}/man/man1
 PBX_BIN=${PREFIX}/bin
-PBX_DOC=${PREFIX}/share/doc/estic
+PBX_DOC=${DOCSDIR}
 ESTIC=${WRKSRC}/estic
 MAKE_E= make X11BASE=${X11BASE} -f make/freebsd${X_OR_NOT}.mak
 
diff --git a/misc/estic/pkg-plist b/misc/estic/pkg-plist
index 1e67e0a2839a..78cbba12207a 100644
--- a/misc/estic/pkg-plist
+++ b/misc/estic/pkg-plist
@@ -4,11 +4,11 @@ etc/pbx/aliases.example
 etc/pbx/config
 etc/pbx/estic.ini.freebsd_example
 etc/pbx/estic.ini.generic_example
-share/doc/estic/README
-share/doc/estic/estic.doc
+%%DOCSDIR%%/README
+%%DOCSDIR%%/estic.doc
 var/log/pbx/debug
 @dirrm etc/pbx
-@dirrm share/doc/estic
+@dirrm %%DOCSDIR%%
 @dirrm var/log/pbx
 @dirrm var/log
 @dirrm var