80 files changed, 45 insertions, 41 deletions

diff --git a/devel/ald/Makefile b/devel/ald/Makefile
index 8de270973284..8e7118a247f4 100644
--- a/devel/ald/Makefile
+++ b/devel/ald/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Debugger for assembly level programs
 GNU_CONFIGURE=	yes
 
 MAN8=		ald.8
+PLIST_FILES=	bin/ald
 ONLY_FOR_ARCHS=	i386
 
 .include <bsd.port.mk>
diff --git a/devel/ald/pkg-plist b/devel/ald/pkg-plist
deleted file mode 100644
index 5d1ba23ee226..000000000000
--- a/devel/ald/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/ald
diff --git a/devel/byaccj/Makefile b/devel/byaccj/Makefile
index 7dc4d81f6eb1..645e2a96e1e0 100644
--- a/devel/byaccj/Makefile
+++ b/devel/byaccj/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	byaccj1.1
 MAINTAINER=	davidxu@viatech.com.cn
 COMMENT=	A java extension of BSD YACC-compatible parser generator
 
+PLIST_FILES=	bin/byaccj
 WRKSRC=		$(WRKDIR)/byaccj1.1/src
 USE_REINPLACE=	yes
 
diff --git a/devel/byaccj/pkg-plist b/devel/byaccj/pkg-plist
deleted file mode 100644
index 893c47448cd0..000000000000
--- a/devel/byaccj/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/byaccj
diff --git a/devel/c2man/Makefile b/devel/c2man/Makefile
index 97e4f777576e..d4749af9d035 100644
--- a/devel/c2man/Makefile
+++ b/devel/c2man/Makefile
@@ -18,5 +18,6 @@ COMMENT=	Generates man pages from C sources
 NO_WRKSUBDIR=	yes
 
 MAN1=	c2man.1
+PLIST_FILES=	bin/c2man
 
 .include <bsd.port.mk>
diff --git a/devel/c2man/pkg-plist b/devel/c2man/pkg-plist
deleted file mode 100644
index 4e30d92b3f4c..000000000000
--- a/devel/c2man/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/c2man
diff --git a/devel/calibrator/Makefile b/devel/calibrator/Makefile
index 7a2952be0c01..3c3358ec5809 100644
--- a/devel/calibrator/Makefile
+++ b/devel/calibrator/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=		bms@FreeBSD.org
 COMMENT=		Cache Profiling Tool
 
 NO_WRKSUBDIR=		yes
+PLIST_FILES=		bin/calibrator
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/devel/calibrator/pkg-plist b/devel/calibrator/pkg-plist
deleted file mode 100644
index 6d1392336290..000000000000
--- a/devel/calibrator/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/calibrator
diff --git a/devel/cvs2cl/Makefile b/devel/cvs2cl/Makefile
index 63e40b62d60a..b3b251343eb7 100644
--- a/devel/cvs2cl/Makefile
+++ b/devel/cvs2cl/Makefile
@@ -21,6 +21,7 @@ USE_PERL5=	yes
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+PLIST_FILES=	bin/cvs2cl
 
 do-extract:
 	${MKDIR} ${WRKDIR}
diff --git a/devel/cvs2cl/pkg-plist b/devel/cvs2cl/pkg-plist
deleted file mode 100644
index 7e677f8bdb85..000000000000
--- a/devel/cvs2cl/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cvs2cl
diff --git a/devel/cvs2html/Makefile b/devel/cvs2html/Makefile
index a2f49e735745..140b38d9cb98 100644
--- a/devel/cvs2html/Makefile
+++ b/devel/cvs2html/Makefile
@@ -15,6 +15,7 @@ EXTRACT_SUFX=	.gz
 MAINTAINER=	sada@FreeBSD.org
 COMMENT=	Perl script to turn ``cvs log'' output into HTML
 
+PLIST_FILES=	bin/cvs2html
 USE_PERL5=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/devel/cvs2html/pkg-plist b/devel/cvs2html/pkg-plist
deleted file mode 100644
index 95f801851436..000000000000
--- a/devel/cvs2html/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cvs2html
diff --git a/devel/cvsdelta/Makefile b/devel/cvsdelta/Makefile
index 519fa9e28375..2c150a892e54 100644
--- a/devel/cvsdelta/Makefile
+++ b/devel/cvsdelta/Makefile
@@ -28,5 +28,6 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/cvsdelta.1 ${PREFIX}/man/man1/
 
 MAN1=		cvsdelta.1
+PLIST_FILES=	bin/cvsdelta
 
 .include <bsd.port.mk>
diff --git a/devel/cvsdelta/pkg-plist b/devel/cvsdelta/pkg-plist
deleted file mode 100644
index 7767d40707c4..000000000000
--- a/devel/cvsdelta/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cvsdelta
diff --git a/devel/cvsdiff2patch/Makefile b/devel/cvsdiff2patch/Makefile
index 5ecaa6808d88..af5ea460e5c3 100644
--- a/devel/cvsdiff2patch/Makefile
+++ b/devel/cvsdiff2patch/Makefile
@@ -15,4 +15,6 @@ USE_BZIP2=	yes
 MAINTAINER=	alfred@FreeBSD.org
 COMMENT=	Turn cvs diff output into patch input.
 
+PLIST_FILES=	bin/cvsdiff2patch
+
 .include <bsd.port.mk>
diff --git a/devel/cvsdiff2patch/pkg-plist b/devel/cvsdiff2patch/pkg-plist
deleted file mode 100644
index 203a392089d8..000000000000
--- a/devel/cvsdiff2patch/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cvsdiff2patch
diff --git a/devel/cvsplot/Makefile b/devel/cvsplot/Makefile
index f21b0eb01d0a..fb8a82d865ff 100644
--- a/devel/cvsplot/Makefile
+++ b/devel/cvsplot/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS=	${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
 		gnuplot:${PORTSDIR}/math/gnuplot
 
 NO_BUILD=	yes
+PLIST_FILES=	bin/cvsplot
 
 post-patch:
 	@${PERL} -pi -e "s,^#!/usr/bin/perl -w,#!/usr/bin/env perl -w,g" ${WRKSRC}/cvsplot.pl
diff --git a/devel/cvsplot/pkg-plist b/devel/cvsplot/pkg-plist
deleted file mode 100644
index 8db3b0685787..000000000000
--- a/devel/cvsplot/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cvsplot
diff --git a/devel/cvsstat/Makefile b/devel/cvsstat/Makefile
index afed9d893a4c..e6233fec2d15 100644
--- a/devel/cvsstat/Makefile
+++ b/devel/cvsstat/Makefile
@@ -19,6 +19,7 @@ COMMENT=	Transforms the output of 'cvs status' to a sorted ASCII table
 
 USE_PERL5=	yes
 NO_BUILD=	yes
+PLIST_FILES=	bin/cvsstat
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/devel/cvsstat/pkg-plist b/devel/cvsstat/pkg-plist
deleted file mode 100644
index efa89848b711..000000000000
--- a/devel/cvsstat/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cvsstat
diff --git a/devel/cvstrac/Makefile b/devel/cvstrac/Makefile
index 8fbdd13d1bca..05b4e59c6c6e 100644
--- a/devel/cvstrac/Makefile
+++ b/devel/cvstrac/Makefile
@@ -21,6 +21,7 @@ USE_GMAKE=	yes
 MAKE_ARGS=	SRCDIR=${WRKSRC} PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
 
 NOMAN=
+PLIST_FILES=	bin/cvstrac
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cvstrac ${PREFIX}/bin
diff --git a/devel/cvstrac/pkg-plist b/devel/cvstrac/pkg-plist
deleted file mode 100644
index e189c047f183..000000000000
--- a/devel/cvstrac/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cvstrac
diff --git a/devel/cxmon/Makefile b/devel/cxmon/Makefile
index bbc2ce731373..325059714ba0 100644
--- a/devel/cxmon/Makefile
+++ b/devel/cxmon/Makefile
@@ -16,5 +16,6 @@ COMMENT=	Interactive file manipulation tool and disassembler
 GNU_CONFIGURE=	yes
 
 MAN1=		cxmon.1
+PLIST_FILES=	bin/cxmon
 
 .include <bsd.port.mk>
diff --git a/devel/cxmon/pkg-plist b/devel/cxmon/pkg-plist
deleted file mode 100644
index 427ed7236049..000000000000
--- a/devel/cxmon/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cxmon
diff --git a/devel/doctorj/Makefile b/devel/doctorj/Makefile
index e1d00cdc94af..2b754cfa4a29 100644
--- a/devel/doctorj/Makefile
+++ b/devel/doctorj/Makefile
@@ -18,5 +18,6 @@ COMMENT=	A tool for analyzing Java code and documentation
 GNU_CONFIGURE=	yes
 
 MAN1=		doctorj.1
+PLIST_FILES=	bin/doctorj
 
 .include <bsd.port.mk>
diff --git a/devel/doctorj/pkg-plist b/devel/doctorj/pkg-plist
deleted file mode 100644
index 63b44cd2ac73..000000000000
--- a/devel/doctorj/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/doctorj
diff --git a/devel/elf/Makefile b/devel/elf/Makefile
index fcfa241e78ce..2f30f1b0497f 100644
--- a/devel/elf/Makefile
+++ b/devel/elf/Makefile
@@ -16,6 +16,7 @@ COMMENT=	A commandline based ELF header analyzer
 
 MAN1=		elf.1
 MANCOMPRESSED=	no
+PLIST_FILES=	bin/elf
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/devel/elf/pkg-plist b/devel/elf/pkg-plist
deleted file mode 100644
index 4bf1e6de90b4..000000000000
--- a/devel/elf/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/elf
diff --git a/devel/error/Makefile b/devel/error/Makefile
index 9de80eb3a105..ccbe35d2c0e2 100644
--- a/devel/error/Makefile
+++ b/devel/error/Makefile
@@ -18,6 +18,7 @@ COMMENT=	Analyze diagnostic error output from compilers and other processors
 MANSECTS=	1
 MAN1=		error.1
 MANCOMPRESSED=	maybe
+PLIST_FILES=	bin/error
 
 # MAN page COMPression SUFFIX
 .if !defined(NOMANCOMPRESS)
diff --git a/devel/error/pkg-plist b/devel/error/pkg-plist
deleted file mode 100644
index 14a58353c5d8..000000000000
--- a/devel/error/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/error
diff --git a/devel/funnelweb/Makefile b/devel/funnelweb/Makefile
index 3c89e9a8e237..46e06220bf90 100644
--- a/devel/funnelweb/Makefile
+++ b/devel/funnelweb/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	funnelweb_v320_source
 MAINTAINER=	jkoshy@freebsd.org
 COMMENT=	A powerful literate-programming macro pre-processor
 
+PLIST_FILES=	bin/fw
 WRKSRC=		fw_src/source
 
 do-build:
diff --git a/devel/funnelweb/pkg-plist b/devel/funnelweb/pkg-plist
deleted file mode 100644
index 93de108c2568..000000000000
--- a/devel/funnelweb/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/fw
diff --git a/devel/gdb53-act/Makefile b/devel/gdb53-act/Makefile
index ee0f4e49d1f5..12dad4216f9e 100644
--- a/devel/gdb53-act/Makefile
+++ b/devel/gdb53-act/Makefile
@@ -14,6 +14,7 @@ PKGNAMESUFFIX=	-act
 MAINTAINER=	john@johnrshannon.com
 COMMENT=	GDB 5.3 modified by ACT for Ada programming language
 
+PLIST_FILES=	bin/gdbada
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-suffix=ada
diff --git a/devel/gdb53-act/pkg-plist b/devel/gdb53-act/pkg-plist
deleted file mode 100644
index ff0a320f5e68..000000000000
--- a/devel/gdb53-act/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/gdbada
diff --git a/devel/gdbmods/Makefile b/devel/gdbmods/Makefile
index bab6ae1cdeaa..c18dc8d21288 100644
--- a/devel/gdbmods/Makefile
+++ b/devel/gdbmods/Makefile
@@ -17,6 +17,7 @@ MAINTAINER=	bms@spc.org
 COMMENT=	Wrapper for gdb -k to provide kld symbol information
 
 NO_BUILD=	yes
+PLIST_FILES=	bin/gdbmods
 
 do-install:
 	${INSTALL_SCRIPT} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} ${PREFIX}/bin
diff --git a/devel/gdbmods/pkg-plist b/devel/gdbmods/pkg-plist
deleted file mode 100644
index 0565efdcb168..000000000000
--- a/devel/gdbmods/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/gdbmods
diff --git a/devel/glg/Makefile b/devel/glg/Makefile
index 7dc38366fc74..24b7bc229198 100644
--- a/devel/glg/Makefile
+++ b/devel/glg/Makefile
@@ -18,6 +18,7 @@ MASTER_SITE_SUBDIR=	kris
 MAINTAINER=	lo_gafet@users.sourceforge.net
 COMMENT=	Open Application Builder (code generator) for the GTK and/or GNOME
 
+PLIST_FILES=	bin/glg
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
diff --git a/devel/glg/pkg-plist b/devel/glg/pkg-plist
deleted file mode 100644
index 5c7fa1da0b59..000000000000
--- a/devel/glg/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/glg
diff --git a/devel/hs-hdoc/Makefile b/devel/hs-hdoc/Makefile
index e797b66a27ad..8a1fed9c271a 100644
--- a/devel/hs-hdoc/Makefile
+++ b/devel/hs-hdoc/Makefile
@@ -16,6 +16,7 @@ COMMENT=	HTML documentation tool for Haskell
 
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
 
+PLIST_FILES=	bin/hdoc
 USE_SIZE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/devel/hs-hdoc/pkg-plist b/devel/hs-hdoc/pkg-plist
deleted file mode 100644
index 76086f13f688..000000000000
--- a/devel/hs-hdoc/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/hdoc
diff --git a/devel/hs-idoc/Makefile b/devel/hs-idoc/Makefile
index 8516f32dad5c..8b6503c13266 100644
--- a/devel/hs-idoc/Makefile
+++ b/devel/hs-idoc/Makefile
@@ -16,6 +16,7 @@ COMMENT=	A No Frills Haskell Interface Documentation System
 
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
 
+PLIST_FILES=	bin/idoc
 USE_SIZE=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/devel/hs-idoc/pkg-plist b/devel/hs-idoc/pkg-plist
deleted file mode 100644
index 45cbba74eda4..000000000000
--- a/devel/hs-idoc/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/idoc
diff --git a/devel/ifd-test/Makefile b/devel/ifd-test/Makefile
index ad552ee85e30..a2c7f308bc18 100644
--- a/devel/ifd-test/Makefile
+++ b/devel/ifd-test/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=    pcsclite.0:${PORTSDIR}/devel/pcsc-lite
 USE_GMAKE=	yes
 
 NOMAN=
+PLIST_FILES=	sbin/ifdtest
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ifdtest ${PREFIX}/sbin
diff --git a/devel/ifd-test/pkg-plist b/devel/ifd-test/pkg-plist
deleted file mode 100644
index ed05d2a243d2..000000000000
--- a/devel/ifd-test/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-sbin/ifdtest
diff --git a/devel/kimwitu/Makefile b/devel/kimwitu/Makefile
index cef821bf0171..46308c9018a2 100644
--- a/devel/kimwitu/Makefile
+++ b/devel/kimwitu/Makefile
@@ -18,7 +18,8 @@ COMMENT=	A tool for processing trees (i.e. terms)
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 ALL_TARGET=	
 
-MAN1=	kc.1
+MAN1=		kc.1
+PLIST_FILES=	bin/kc
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/Gen/kc ${PREFIX}/bin
diff --git a/devel/kimwitu/pkg-plist b/devel/kimwitu/pkg-plist
deleted file mode 100644
index f15098dc95d3..000000000000
--- a/devel/kimwitu/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/kc
diff --git a/devel/linux_kdump/Makefile b/devel/linux_kdump/Makefile
index 7e176fd049e8..ef13a120b776 100644
--- a/devel/linux_kdump/Makefile
+++ b/devel/linux_kdump/Makefile
@@ -18,6 +18,7 @@ BUILD_DEPENDS=	/compat/linux/usr/bin/gcc:${PORTSDIR}/devel/linux_devtools-6
 
 ONLY_FOR_ARCHS=	i386
 MAN1=		linux_kdump.1
+PLIST_FILES=	bin/linux_kdump
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/linux_kdump/pkg-plist b/devel/linux_kdump/pkg-plist
deleted file mode 100644
index 5fad65e8d171..000000000000
--- a/devel/linux_kdump/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/linux_kdump
diff --git a/devel/makedepend/Makefile b/devel/makedepend/Makefile
index 5cb446d93002..8362b5428dc9 100644
--- a/devel/makedepend/Makefile
+++ b/devel/makedepend/Makefile
@@ -19,6 +19,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/makedepend
 GNU_CONFIGURE=	YES
 
 MAN1=		makedepend.1
+PLIST_FILES=	bin/makedepend
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/makedepend ${PREFIX}/bin
diff --git a/devel/makedepend/pkg-plist b/devel/makedepend/pkg-plist
deleted file mode 100644
index 24121f4ff163..000000000000
--- a/devel/makedepend/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/makedepend
diff --git a/devel/msrc0/Makefile b/devel/msrc0/Makefile
index d95eebfb8341..b06f28d4cda5 100644
--- a/devel/msrc0/Makefile
+++ b/devel/msrc0/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	petef@FreeBSD.org
 COMMENT=	Meta source fake-out script for building ksb tools
 
 NO_BUILD=	yes
+PLIST_FILES=	bin/makeme
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.6
 
 do-install:
diff --git a/devel/msrc0/pkg-plist b/devel/msrc0/pkg-plist
deleted file mode 100644
index d7cfc5de2e42..000000000000
--- a/devel/msrc0/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/makeme
diff --git a/devel/p4delta/Makefile b/devel/p4delta/Makefile
index 5a1bcedc4c5e..13e35cddcbf7 100644
--- a/devel/p4delta/Makefile
+++ b/devel/p4delta/Makefile
@@ -27,5 +27,6 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/p4delta.1 ${PREFIX}/man/man1/
 
 MAN1=		p4delta.1
+PLIST_FILES=	bin/p4delta
 
 .include <bsd.port.mk>
diff --git a/devel/p4delta/pkg-plist b/devel/p4delta/pkg-plist
deleted file mode 100644
index 7107209425f7..000000000000
--- a/devel/p4delta/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/p4delta
diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index 4f263b277781..0fe35d33dc94 100644
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -19,6 +19,7 @@ CONFIGURE_ARGS=	--program-prefix=g
 USE_REINPLACE=	yes
 
 MAN1=		gpatch.1
+PLIST_FILES=	bin/gpatch
 
 post-patch:
 	@${REINPLACE_CMD} -e 's!HAVE_SETMODE!HAVE_SETMODE_DISABLE!' \
diff --git a/devel/patch/pkg-plist b/devel/patch/pkg-plist
deleted file mode 100644
index 80ac5b197b77..000000000000
--- a/devel/patch/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/gpatch
diff --git a/devel/picp/Makefile b/devel/picp/Makefile
index 5c8f9e62caad..081121e4a1fa 100644
--- a/devel/picp/Makefile
+++ b/devel/picp/Makefile
@@ -14,6 +14,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	bofh@stabilis.ru
 COMMENT=	Driver for the Microchip Picstart Plus development programmer
 
+PLIST_FILES=	bin/picp
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 do-install:
diff --git a/devel/picp/pkg-plist b/devel/picp/pkg-plist
deleted file mode 100644
index 41174690231e..000000000000
--- a/devel/picp/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/picp
diff --git a/devel/pinstall/Makefile b/devel/pinstall/Makefile
index e42a6db2c5e1..0d259a8c022b 100644
--- a/devel/pinstall/Makefile
+++ b/devel/pinstall/Makefile
@@ -18,6 +18,7 @@ COMMENT=	A tool for installing files according to a packing list
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
+PLIST_FILES=	bin/pinstall
 USE_PERL5=	yes
 
 SRC=		${.CURDIR}/src
diff --git a/devel/pinstall/pkg-plist b/devel/pinstall/pkg-plist
deleted file mode 100644
index f08bcb4d1968..000000000000
--- a/devel/pinstall/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/pinstall
diff --git a/devel/portcheckout/Makefile b/devel/portcheckout/Makefile
index c69b27cfbc53..5370ee92e9b7 100644
--- a/devel/portcheckout/Makefile
+++ b/devel/portcheckout/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Checkout and build ports and all depending ports
 USE_PERL5=	yes
 MAN1=		portcheckout.1
 MANCOMPRESSED=	maybe
+PLIST_FILES=	bin/portcheckout
 
 post-patch:
 	perl -pi -e 's^\#\!/usr/local/bin/perl^#!${PERL5}^' ${WRKSRC}/portcheckout.pl
diff --git a/devel/portcheckout/pkg-plist b/devel/portcheckout/pkg-plist
deleted file mode 100644
index 4d9dab92c11b..000000000000
--- a/devel/portcheckout/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/portcheckout
diff --git a/devel/py-fam/Makefile b/devel/py-fam/Makefile
index eb6a702d0efe..9df201d44905 100644
--- a/devel/py-fam/Makefile
+++ b/devel/py-fam/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Python Interface to the File Alteration Monitor
 
 LIB_DEPENDS=	fam.0:${PORTSDIR}/devel/fam
 
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/_fam.so
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
diff --git a/devel/py-fam/pkg-plist b/devel/py-fam/pkg-plist
deleted file mode 100644
index b31faad4bc64..000000000000
--- a/devel/py-fam/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%PYTHON_SITELIBDIR%%/_fam.so
diff --git a/devel/py-freebsd/Makefile b/devel/py-freebsd/Makefile
index 76cc97a0c6c9..dd65b9e001fb 100644
--- a/devel/py-freebsd/Makefile
+++ b/devel/py-freebsd/Makefile
@@ -16,6 +16,7 @@ DISTNAME=	py-freebsd-${PORTVERSION}
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	Python interface to FreeBSD-specific system libraries
 
+PLIST_FILES=	lib/%%PYTHON_VERSION%%/site-packages/freebsd.so
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
diff --git a/devel/py-freebsd/pkg-plist b/devel/py-freebsd/pkg-plist
deleted file mode 100644
index b71a2161de87..000000000000
--- a/devel/py-freebsd/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/%%PYTHON_VERSION%%/site-packages/freebsd.so
diff --git a/devel/py-pqueue/Makefile b/devel/py-pqueue/Makefile
index 87c9b70c7e8b..be803d3fd9ba 100644
--- a/devel/py-pqueue/Makefile
+++ b/devel/py-pqueue/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	PQueue-${PORTVERSION}
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	Fibonacci-Heap based Priority-Queue Extension for Python
 
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/pqueuemodule.so
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/py-pqueue/pkg-plist b/devel/py-pqueue/pkg-plist
deleted file mode 100644
index af97404d79cc..000000000000
--- a/devel/py-pqueue/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%PYTHON_SITELIBDIR%%/pqueuemodule.so
diff --git a/devel/replay/Makefile b/devel/replay/Makefile
index 5ba6dfc166bc..c619806edfc1 100644
--- a/devel/replay/Makefile
+++ b/devel/replay/Makefile
@@ -15,4 +15,6 @@ USE_BZIP2=	yes
 MAINTAINER=	alfred@FreeBSD.org
 COMMENT=	A program that helps you fix a build interactively.
 
+PLIST_FILES=	bin/replay
+
 .include <bsd.port.mk>
diff --git a/devel/replay/pkg-plist b/devel/replay/pkg-plist
deleted file mode 100644
index 86e03f35af28..000000000000
--- a/devel/replay/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/replay
diff --git a/devel/rinfo/Makefile b/devel/rinfo/Makefile
index 6a00f65afe8d..cafae05a0a57 100644
--- a/devel/rinfo/Makefile
+++ b/devel/rinfo/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	ftp://www.ctgi.net/pub/ctgi/
 MAINTAINER=	markc@ctgi.net
 COMMENT=	List status of files checked out of RCS repositories
 
+PLIST_FILES=	bin/rinfo
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rinfo ${PREFIX}/bin/rinfo
 
diff --git a/devel/rinfo/pkg-plist b/devel/rinfo/pkg-plist
deleted file mode 100644
index b568b7ccb256..000000000000
--- a/devel/rinfo/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/rinfo
diff --git a/devel/rvi/Makefile b/devel/rvi/Makefile
index eb5bec08e2f5..b882579edcbd 100644
--- a/devel/rvi/Makefile
+++ b/devel/rvi/Makefile
@@ -20,6 +20,7 @@ WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	"CC=${CXX}"
+PLIST_FILES=	bin/rvi
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rvi ${PREFIX}/bin
diff --git a/devel/rvi/pkg-plist b/devel/rvi/pkg-plist
deleted file mode 100644
index 8858ee585d3f..000000000000
--- a/devel/rvi/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/rvi
diff --git a/devel/tkref/Makefile b/devel/tkref/Makefile
index ea6249ee5852..7207799ce05b 100644
--- a/devel/tkref/Makefile
+++ b/devel/tkref/Makefile
@@ -17,6 +17,8 @@ COMMENT=	A programmer's GUI reference for Tcl/Tk and major packages
 
 RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
 
+PLIST_FILES=	bin/TkRef
+
 NO_BUILD=	yes
 
 USE_REINPLACE=	yes
diff --git a/devel/tkref/pkg-plist b/devel/tkref/pkg-plist
deleted file mode 100644
index 9de616a7c473..000000000000
--- a/devel/tkref/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/TkRef
diff --git a/devel/vb2c/Makefile b/devel/vb2c/Makefile
index df1ff4a3757f..280b9bce27a0 100644
--- a/devel/vb2c/Makefile
+++ b/devel/vb2c/Makefile
@@ -18,6 +18,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKEFILE=	${FILESDIR}/Makefile
 
 NO_MAN=
+PLIST_FILES=	bin/vb2c
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/vb2c/pkg-plist b/devel/vb2c/pkg-plist
deleted file mode 100644
index 2fef171a76b0..000000000000
--- a/devel/vb2c/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/vb2c
diff --git a/devel/xmake/Makefile b/devel/xmake/Makefile
index 2bba0074b97e..00103be123de 100644
--- a/devel/xmake/Makefile
+++ b/devel/xmake/Makefile
@@ -17,6 +17,7 @@ COMMENT=	A powerful make utility
 
 WRKSRC=		${WRKDIR}/xmake
 MAN1=		xmake.1
+PLIST_FILES=	bin/xmake
 
 pre-build:
 	@${RM} -rf ${WRKSRC}/obj
diff --git a/devel/xmake/pkg-plist b/devel/xmake/pkg-plist
deleted file mode 100644
index 6590b311b255..000000000000
--- a/devel/xmake/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xmake