8 files changed, 177 insertions, 180 deletions

diff --git a/misc/chord2html/Makefile b/misc/chord2html/Makefile
index a19b3bc1df1d..1846d4963860 100644
--- a/misc/chord2html/Makefile
+++ b/misc/chord2html/Makefile
@@ -21,6 +21,9 @@ NO_BUILD=	yes
 
 MAN1=	chord2html.1
 
+PLIST_FILES=	bin/chord2html share/chord2html/chord2html.css
+PLIST_DIR=	share/chord2html
+
 post-patch:
 	@${PERL} -pi -e "s,/usr/bin/perl,${PERL},g ; \
 		s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/chord2html
diff --git a/misc/chord2html/pkg-plist b/misc/chord2html/pkg-plist
deleted file mode 100644
index f3eb9b294064..000000000000
--- a/misc/chord2html/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/chord2html
-share/chord2html/chord2html.css
-@dirrm share/chord2html
diff --git a/misc/colortail/pkg-plist b/misc/colortail/pkg-plist
index 6a41fb1bc909..603fc1721775 100644
--- a/misc/colortail/pkg-plist
+++ b/misc/colortail/pkg-plist
@@ -1,7 +1,7 @@
 bin/colortail
-%%PORTDOCS%%share/examples/colortail/conf.daemon
-%%PORTDOCS%%share/examples/colortail/conf.kernel
-%%PORTDOCS%%share/examples/colortail/conf.messages
-%%PORTDOCS%%share/examples/colortail/conf.secure
-%%PORTDOCS%%share/examples/colortail/conf.xferlog
-%%PORTDOCS%%@dirrm share/examples/colortail
+%%PORTDOCS%%%%EXAMPLESDIR%%/conf.daemn
+%%PORTDOCS%%%%EXAMPLESDIR%%/conf.kernel
+%%PORTDOCS%%%%EXAMPLESDIR%%/conf.messages
+%%PORTDOCS%%%%EXAMPLESDIR%%/conf.secure
+%%PORTDOCS%%%%EXAMPLESDIR%%/conf.xferlog
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/misc/cwish/Makefile b/misc/cwish/Makefile
index 78a2dedba089..cd62afb3b97c 100644
--- a/misc/cwish/Makefile
+++ b/misc/cwish/Makefile
@@ -17,12 +17,13 @@ COMMENT=	Curses based user friendly windowing shell
 NO_WRKSUBDIR=	yes
 ALL_TARGET=	cwish
 MAN1=		cwish.1
+PLIST_FILES=	bin/cwish
 
 pre-configure:
 	${CP} ${WRKSRC}/Makefile.FreeBSD ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cwish ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/cwish.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/cwish.1 ${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/misc/cwish/pkg-plist b/misc/cwish/pkg-plist
deleted file mode 100644
index d73bee80bf88..000000000000
--- a/misc/cwish/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $FreeBSD$
-bin/cwish
diff --git a/misc/dejagnu/pkg-plist b/misc/dejagnu/pkg-plist
index 060a0de7c9a4..918d86fbd8ce 100644
--- a/misc/dejagnu/pkg-plist
+++ b/misc/dejagnu/pkg-plist
@@ -1,166 +1,166 @@
 bin/runtest
 include/dejagnu.h
-share/dejagnu/baseboards/README
-share/dejagnu/baseboards/a29k-udi.exp
-share/dejagnu/baseboards/arc-sim.exp
-share/dejagnu/baseboards/arm-ice.exp
-share/dejagnu/baseboards/arm-sid.exp
-share/dejagnu/baseboards/arm-sim.exp
-share/dejagnu/baseboards/basic-sid.exp
-share/dejagnu/baseboards/basic-sim.exp
-share/dejagnu/baseboards/cf.exp
-share/dejagnu/baseboards/cygmon.exp
-share/dejagnu/baseboards/cygwin.exp
-share/dejagnu/baseboards/d10v-sim.exp
-share/dejagnu/baseboards/d10v.exp
-share/dejagnu/baseboards/d30v-sim.exp
-share/dejagnu/baseboards/danlite-elf.exp
-share/dejagnu/baseboards/dos.exp
-share/dejagnu/baseboards/fr30-cygmon.exp
-share/dejagnu/baseboards/fr30-elf.exp
-share/dejagnu/baseboards/fr30-sim.exp
-share/dejagnu/baseboards/frv-elf.exp
-share/dejagnu/baseboards/frv-sim.exp
-share/dejagnu/baseboards/frv-tiger.exp
-share/dejagnu/baseboards/frv-tomcat.exp
-share/dejagnu/baseboards/gdbserver-sample.exp
-share/dejagnu/baseboards/h8300-sim.exp
-share/dejagnu/baseboards/h8300.exp
-share/dejagnu/baseboards/i386-bozo.exp
-share/dejagnu/baseboards/i386-sid.exp
-share/dejagnu/baseboards/i960-cyclone.exp
-share/dejagnu/baseboards/i960-sim.exp
-share/dejagnu/baseboards/jmr3904-sim.exp
-share/dejagnu/baseboards/linux-gdbserver.exp
-share/dejagnu/baseboards/linux-libremote.exp
-share/dejagnu/baseboards/m32r-elf.exp
-share/dejagnu/baseboards/m32r-sid.exp
-share/dejagnu/baseboards/m32r-sim.exp
-share/dejagnu/baseboards/m68hc11-sim.exp
-share/dejagnu/baseboards/m68k-emc.exp
-share/dejagnu/baseboards/m68k-sid.exp
-share/dejagnu/baseboards/mcore-elf.exp
-share/dejagnu/baseboards/mcore-moto-sim.exp
-share/dejagnu/baseboards/mcore-pe.exp
-share/dejagnu/baseboards/mcore-sim.exp
-share/dejagnu/baseboards/mips-idt.exp
-share/dejagnu/baseboards/mips-lnews-sim.exp
-share/dejagnu/baseboards/mips-lsi-sim.exp
-share/dejagnu/baseboards/mips-sim-idt32.exp
-share/dejagnu/baseboards/mips-sim-idt64.exp
-share/dejagnu/baseboards/mips-sim.exp
-share/dejagnu/baseboards/mips64-sim.exp
-share/dejagnu/baseboards/mips64vr4100-sim.exp
-share/dejagnu/baseboards/mmixware-sim.exp
-share/dejagnu/baseboards/mn10200-cygmon.exp
-share/dejagnu/baseboards/mn10200-sim.exp
-share/dejagnu/baseboards/mn10300-cygmon.exp
-share/dejagnu/baseboards/mn10300-sim.exp
-share/dejagnu/baseboards/msparc-cygmon.exp
-share/dejagnu/baseboards/op50n.exp
-share/dejagnu/baseboards/powerpc-bug.exp
-share/dejagnu/baseboards/powerpc-bug1.exp
-share/dejagnu/baseboards/powerpc-sim.exp
-share/dejagnu/baseboards/powerpcle-sim.exp
-share/dejagnu/baseboards/rom68k-idp.exp
-share/dejagnu/baseboards/sh-hms-sim.exp
-share/dejagnu/baseboards/sh-hms.exp
-share/dejagnu/baseboards/sh-sid.exp
-share/dejagnu/baseboards/sparc64-sim.exp
-share/dejagnu/baseboards/sparclet-aout.exp
-share/dejagnu/baseboards/sparclite-coff.exp
-share/dejagnu/baseboards/sparclite-cygmon.exp
-share/dejagnu/baseboards/sparclite-sim-le.exp
-share/dejagnu/baseboards/tic80-sim.exp
-share/dejagnu/baseboards/tx39-dve.exp
-share/dejagnu/baseboards/tx39-sim.exp
-share/dejagnu/baseboards/unix.exp
-share/dejagnu/baseboards/v850-sim.exp
-share/dejagnu/baseboards/vr4100-ddb.exp
-share/dejagnu/baseboards/sparclite-sim.exp
-share/dejagnu/baseboards/vr4100-sim.exp
-share/dejagnu/baseboards/vr4111-sim.exp
-share/dejagnu/baseboards/vr4300-ddb.exp
-share/dejagnu/baseboards/vr4300-sim.exp
-share/dejagnu/baseboards/vr4300.exp
-share/dejagnu/baseboards/vr5000-ddb.exp
-share/dejagnu/baseboards/strongarm-cygmon.exp
-share/dejagnu/baseboards/vx4300.exp
-share/dejagnu/baseboards/vx68k.exp
-share/dejagnu/baseboards/vx960.exp
-share/dejagnu/baseboards/usparc-cygmon.exp
-share/dejagnu/baseboards/vxsparc.exp
-share/dejagnu/baseboards/x86-cygmon.exp
-share/dejagnu/baseboards/xscale-cygmon.exp
-share/dejagnu/baseboards/xtensa-sim.exp
-share/dejagnu/config/README
-share/dejagnu/config/arc.exp
-share/dejagnu/config/arm-ice.exp
-share/dejagnu/config/base-config.exp
-share/dejagnu/config/base68k.exp
-share/dejagnu/config/bug.exp
-share/dejagnu/config/cfdbug.exp
-share/dejagnu/config/cygmon.exp
-share/dejagnu/config/d10v.exp
-share/dejagnu/config/ddb-ether.exp
-share/dejagnu/config/ddb.exp
-share/dejagnu/config/default.exp
-share/dejagnu/config/dos.exp
-share/dejagnu/config/dve.exp
-share/dejagnu/config/gdb-comm.exp
-share/dejagnu/config/gdb_stub.exp
-share/dejagnu/config/h8300.exp
-share/dejagnu/config/i386-bozo.exp
-share/dejagnu/config/i960.exp
-share/dejagnu/config/m32r-stub.exp
-share/dejagnu/config/m32r.exp
-share/dejagnu/config/m68hc11.exp
-share/dejagnu/config/m68k-emc.exp
-share/dejagnu/config/mips-idt.exp
-share/dejagnu/config/mn10200-eval.exp
-share/dejagnu/config/mn10300-eval.exp
-share/dejagnu/config/netware.exp
-share/dejagnu/config/powerpc-bug.exp
-share/dejagnu/config/proelf.exp
-share/dejagnu/config/rom68k.exp
-share/dejagnu/config/sh.exp
-share/dejagnu/config/sid.exp
-share/dejagnu/config/sim.exp
-share/dejagnu/config/slite.exp
-share/dejagnu/config/sparclet.exp
-share/dejagnu/config/tic80.exp
-share/dejagnu/config/udi.exp
-share/dejagnu/config/unix.exp
-share/dejagnu/config/vr4100.exp
-share/dejagnu/config/vr4300.exp
-share/dejagnu/config/vr5000.exp
-share/dejagnu/config/vrtx.exp
-share/dejagnu/config/vxworks.exp
-share/dejagnu/debugger.exp
-share/dejagnu/dejagnu.exp
-share/dejagnu/dg.exp
-share/dejagnu/framework.exp
-share/dejagnu/ftp.exp
-share/dejagnu/i960glue.c
-share/dejagnu/kermit.exp
-share/dejagnu/libexec/config.guess
-share/dejagnu/libgloss.exp
-share/dejagnu/mondfe.exp
-share/dejagnu/remote.exp
-share/dejagnu/rlogin.exp
-share/dejagnu/rsh.exp
-share/dejagnu/runtest.exp
-share/dejagnu/standard.exp
-share/dejagnu/stub-loader.c
-share/dejagnu/target.exp
-share/dejagnu/targetdb.exp
-share/dejagnu/telnet.exp
-share/dejagnu/testglue.c
-share/dejagnu/tip.exp
-share/dejagnu/util-defs.exp
-share/dejagnu/utils.exp
-share/dejagnu/xsh.exp
-@dirrm share/dejagnu/libexec
-@dirrm share/dejagnu/baseboards
-@dirrm share/dejagnu/config
-@dirrm share/dejagnu
+%%DATADIR%%/baseboards/README
+%%DATADIR%%/baseboards/a29k-udi.exp
+%%DATADIR%%/baseboards/arc-sim.exp
+%%DATADIR%%/baseboards/arm-ice.exp
+%%DATADIR%%/baseboards/arm-sid.exp
+%%DATADIR%%/baseboards/arm-sim.exp
+%%DATADIR%%/baseboards/basic-sid.exp
+%%DATADIR%%/baseboards/basic-sim.exp
+%%DATADIR%%/baseboards/cf.exp
+%%DATADIR%%/baseboards/cygmon.exp
+%%DATADIR%%/baseboards/cygwin.exp
+%%DATADIR%%/baseboards/d10v-sim.exp
+%%DATADIR%%/baseboards/d10v.exp
+%%DATADIR%%/baseboards/d30v-sim.exp
+%%DATADIR%%/baseboards/danlite-elf.exp
+%%DATADIR%%/baseboards/dos.exp
+%%DATADIR%%/baseboards/fr30-cygmon.exp
+%%DATADIR%%/baseboards/fr30-elf.exp
+%%DATADIR%%/baseboards/fr30-sim.exp
+%%DATADIR%%/baseboards/frv-elf.exp
+%%DATADIR%%/baseboards/frv-sim.exp
+%%DATADIR%%/baseboards/frv-tiger.exp
+%%DATADIR%%/baseboards/frv-tomcat.exp
+%%DATADIR%%/baseboards/gdbserver-sample.exp
+%%DATADIR%%/baseboards/h8300-sim.exp
+%%DATADIR%%/baseboards/h8300.exp
+%%DATADIR%%/baseboards/i386-bozo.exp
+%%DATADIR%%/baseboards/i386-sid.exp
+%%DATADIR%%/baseboards/i960-cyclone.exp
+%%DATADIR%%/baseboards/i960-sim.exp
+%%DATADIR%%/baseboards/jmr3904-sim.exp
+%%DATADIR%%/baseboards/linux-gdbserver.exp
+%%DATADIR%%/baseboards/linux-libremote.exp
+%%DATADIR%%/baseboards/m32r-elf.exp
+%%DATADIR%%/baseboards/m32r-sid.exp
+%%DATADIR%%/baseboards/m32r-sim.exp
+%%DATADIR%%/baseboards/m68hc11-sim.exp
+%%DATADIR%%/baseboards/m68k-emc.exp
+%%DATADIR%%/baseboards/m68k-sid.exp
+%%DATADIR%%/baseboards/mcore-elf.exp
+%%DATADIR%%/baseboards/mcore-moto-sim.exp
+%%DATADIR%%/baseboards/mcore-pe.exp
+%%DATADIR%%/baseboards/mcore-sim.exp
+%%DATADIR%%/baseboards/mips-idt.exp
+%%DATADIR%%/baseboards/mips-lnews-sim.exp
+%%DATADIR%%/baseboards/mips-lsi-sim.exp
+%%DATADIR%%/baseboards/mips-sim-idt32.exp
+%%DATADIR%%/baseboards/mips-sim-idt64.exp
+%%DATADIR%%/baseboards/mips-sim.exp
+%%DATADIR%%/baseboards/mips64-sim.exp
+%%DATADIR%%/baseboards/mips64vr4100-sim.exp
+%%DATADIR%%/baseboards/mmixware-sim.exp
+%%DATADIR%%/baseboards/mn10200-cygmon.exp
+%%DATADIR%%/baseboards/mn10200-sim.exp
+%%DATADIR%%/baseboards/mn10300-cygmon.exp
+%%DATADIR%%/baseboards/mn10300-sim.exp
+%%DATADIR%%/baseboards/msparc-cygmon.exp
+%%DATADIR%%/baseboards/op50n.exp
+%%DATADIR%%/baseboards/powerpc-bug.exp
+%%DATADIR%%/baseboards/powerpc-bug1.exp
+%%DATADIR%%/baseboards/powerpc-sim.exp
+%%DATADIR%%/baseboards/powerpcle-sim.exp
+%%DATADIR%%/baseboards/rom68k-idp.exp
+%%DATADIR%%/baseboards/sh-hms-sim.exp
+%%DATADIR%%/baseboards/sh-hms.exp
+%%DATADIR%%/baseboards/sh-sid.exp
+%%DATADIR%%/baseboards/sparc64-sim.exp
+%%DATADIR%%/baseboards/sparclet-aout.exp
+%%DATADIR%%/baseboards/sparclite-coff.exp
+%%DATADIR%%/baseboards/sparclite-cygmon.exp
+%%DATADIR%%/baseboards/sparclite-sim-le.exp
+%%DATADIR%%/baseboards/tic80-sim.exp
+%%DATADIR%%/baseboards/tx39-dve.exp
+%%DATADIR%%/baseboards/tx39-sim.exp
+%%DATADIR%%/baseboards/unix.exp
+%%DATADIR%%/baseboards/v850-sim.exp
+%%DATADIR%%/baseboards/vr4100-ddb.exp
+%%DATADIR%%/baseboards/sparclite-sim.exp
+%%DATADIR%%/baseboards/vr4100-sim.exp
+%%DATADIR%%/baseboards/vr4111-sim.exp
+%%DATADIR%%/baseboards/vr4300-ddb.exp
+%%DATADIR%%/baseboards/vr4300-sim.exp
+%%DATADIR%%/baseboards/vr4300.exp
+%%DATADIR%%/baseboards/vr5000-ddb.exp
+%%DATADIR%%/baseboards/strongarm-cygmon.exp
+%%DATADIR%%/baseboards/vx4300.exp
+%%DATADIR%%/baseboards/vx68k.exp
+%%DATADIR%%/baseboards/vx960.exp
+%%DATADIR%%/baseboards/usparc-cygmon.exp
+%%DATADIR%%/baseboards/vxsparc.exp
+%%DATADIR%%/baseboards/x86-cygmon.exp
+%%DATADIR%%/baseboards/xscale-cygmon.exp
+%%DATADIR%%/baseboards/xtensa-sim.exp
+%%DATADIR%%/config/README
+%%DATADIR%%/config/arc.exp
+%%DATADIR%%/config/arm-ice.exp
+%%DATADIR%%/config/base-config.exp
+%%DATADIR%%/config/base68k.exp
+%%DATADIR%%/config/bug.exp
+%%DATADIR%%/config/cfdbug.exp
+%%DATADIR%%/config/cygmon.exp
+%%DATADIR%%/config/d10v.exp
+%%DATADIR%%/config/ddb-ether.exp
+%%DATADIR%%/config/ddb.exp
+%%DATADIR%%/config/default.exp
+%%DATADIR%%/config/dos.exp
+%%DATADIR%%/config/dve.exp
+%%DATADIR%%/config/gdb-comm.exp
+%%DATADIR%%/config/gdb_stub.exp
+%%DATADIR%%/config/h8300.exp
+%%DATADIR%%/config/i386-bozo.exp
+%%DATADIR%%/config/i960.exp
+%%DATADIR%%/config/m32r-stub.exp
+%%DATADIR%%/config/m32r.exp
+%%DATADIR%%/config/m68hc11.exp
+%%DATADIR%%/config/m68k-emc.exp
+%%DATADIR%%/config/mips-idt.exp
+%%DATADIR%%/config/mn10200-eval.exp
+%%DATADIR%%/config/mn10300-eval.exp
+%%DATADIR%%/config/netware.exp
+%%DATADIR%%/config/powerpc-bug.exp
+%%DATADIR%%/config/proelf.exp
+%%DATADIR%%/config/rom68k.exp
+%%DATADIR%%/config/sh.exp
+%%DATADIR%%/config/sid.exp
+%%DATADIR%%/config/sim.exp
+%%DATADIR%%/config/slite.exp
+%%DATADIR%%/config/sparclet.exp
+%%DATADIR%%/config/tic80.exp
+%%DATADIR%%/config/udi.exp
+%%DATADIR%%/config/unix.exp
+%%DATADIR%%/config/vr4100.exp
+%%DATADIR%%/config/vr4300.exp
+%%DATADIR%%/config/vr5000.exp
+%%DATADIR%%/config/vrtx.exp
+%%DATADIR%%/config/vxworks.exp
+%%DATADIR%%/debugger.exp
+%%DATADIR%%/dejagnu.exp
+%%DATADIR%%/dg.exp
+%%DATADIR%%/framework.exp
+%%DATADIR%%/ftp.exp
+%%DATADIR%%/i960glue.c
+%%DATADIR%%/kermit.exp
+%%DATADIR%%/libexec/config.guess
+%%DATADIR%%/libgloss.exp
+%%DATADIR%%/mondfe.exp
+%%DATADIR%%/remote.exp
+%%DATADIR%%/rlogin.exp
+%%DATADIR%%/rsh.exp
+%%DATADIR%%/runtest.exp
+%%DATADIR%%/standard.exp
+%%DATADIR%%/stub-loader.c
+%%DATADIR%%/target.exp
+%%DATADIR%%/targetdb.exp
+%%DATADIR%%/telnet.exp
+%%DATADIR%%/testglue.c
+%%DATADIR%%/tip.exp
+%%DATADIR%%/util-defs.exp
+%%DATADIR%%/utils.exp
+%%DATADIR%%/xsh.exp
+@dirrm %%DATADIR%%/libexec
+@dirrm %%DATADIR%%/baseboards
+@dirrm %%DATADIR%%/config
+@dirrm %%DATADIR%%
diff --git a/misc/demoniac/Makefile b/misc/demoniac/Makefile
index 333829cb739c..3abc674af2bb 100644
--- a/misc/demoniac/Makefile
+++ b/misc/demoniac/Makefile
@@ -24,6 +24,8 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LDFLAGS="${PTHREAD_LIBS}"
+PLIST_FILES=	bin/demoniac share/demoniac/pixmaps/logo.xpm
+PLIST_DIRS=	share/demoniac/pixmaps share/demoniac
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
diff --git a/misc/demoniac/pkg-plist b/misc/demoniac/pkg-plist
deleted file mode 100644
index 7968b7a8b1cc..000000000000
--- a/misc/demoniac/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/demoniac
-share/demoniac/pixmaps/logo.xpm
-@dirrm share/demoniac/pixmaps
-@dirrm share/demoniac