52 files changed, 35 insertions, 34 deletions

diff --git a/devel/bnf/Makefile b/devel/bnf/Makefile
index 10acb74df75d..4641d8760e33 100644
--- a/devel/bnf/Makefile
+++ b/devel/bnf/Makefile
@@ -18,5 +18,6 @@ COMMENT=	Generate C parser given a grammar in BNF notation
 GNU_CONFIGURE=	yes
 
 INFO=		bnf
+PLIST_FILES=	bin/bnf
 
 .include <bsd.port.mk>
diff --git a/devel/bnf/pkg-plist b/devel/bnf/pkg-plist
deleted file mode 100644
index 6c23dfe45709..000000000000
--- a/devel/bnf/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/bnf
diff --git a/devel/c_parser/Makefile b/devel/c_parser/Makefile
index e5cb334af801..6fae463a43f5 100644
--- a/devel/c_parser/Makefile
+++ b/devel/c_parser/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C99 Parser
 
 NO_WRKSUBDIR=	yes
+PLIST_FILES=	bin/c_parser
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/c_parser ${PREFIX}/bin
diff --git a/devel/c_parser/pkg-plist b/devel/c_parser/pkg-plist
deleted file mode 100644
index d7223b9b739a..000000000000
--- a/devel/c_parser/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/c_parser
diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile
index 7a3238116dd8..02d2b25d2a2e 100644
--- a/devel/ccache/Makefile
+++ b/devel/ccache/Makefile
@@ -15,5 +15,6 @@ COMMENT=	A tool to minimize the compile time of C programs
 
 GNU_CONFIGURE=	yes
 MAN1=		ccache.1
+PLIST_FILES=	bin/ccache
 
 .include <bsd.port.mk>
diff --git a/devel/ccache/pkg-plist b/devel/ccache/pkg-plist
deleted file mode 100644
index bae29ebf502c..000000000000
--- a/devel/ccache/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/ccache
diff --git a/devel/codeworker/Makefile b/devel/codeworker/Makefile
index 0083b871e302..9d5cdf0eb1c2 100644
--- a/devel/codeworker/Makefile
+++ b/devel/codeworker/Makefile
@@ -16,6 +16,7 @@ DISTNAME=	CodeWorker_SRC${PORTVERSION:S/./_/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A parsing tool and a source code generator
 
+PLIST_FILES=	bin/codeworker
 USE_ZIP=	yes
 USE_REINPLACE=	yes
 NO_WRKSUBDIR=	yes
diff --git a/devel/codeworker/pkg-plist b/devel/codeworker/pkg-plist
deleted file mode 100644
index b0c3304f630e..000000000000
--- a/devel/codeworker/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/codeworker
diff --git a/devel/cvsadmin/Makefile b/devel/cvsadmin/Makefile
index e0c51ed02d5c..b41e2f6f4537 100644
--- a/devel/cvsadmin/Makefile
+++ b/devel/cvsadmin/Makefile
@@ -17,7 +17,8 @@ COMMENT=	A simple program to administrate users of a CVS repository
 
 GNU_CONFIGURE=	yes
 
-MAN1=	cvsadmin.1
+MAN1=		cvsadmin.1
+PLIST_FILES=	bin/cvsadmin
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/cvsadmin.1 ${MANPREFIX}/man/man1
diff --git a/devel/cvsadmin/pkg-plist b/devel/cvsadmin/pkg-plist
deleted file mode 100644
index 6ef94cadb76f..000000000000
--- a/devel/cvsadmin/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cvsadmin
diff --git a/devel/cvsps-devel/Makefile b/devel/cvsps-devel/Makefile
index a3f7d2f8dd51..4dd9965ed626 100644
--- a/devel/cvsps-devel/Makefile
+++ b/devel/cvsps-devel/Makefile
@@ -18,7 +18,8 @@ COMMENT=	CVS patchsets
 USE_GMAKE=	yes
 ALL_TARGET=	cvsps
 
-MAN1=	cvsps.1
+MAN1=		cvsps.1
+PLIST_FILES=	bin/cvsps
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cvsps ${PREFIX}/bin
diff --git a/devel/cvsps-devel/pkg-plist b/devel/cvsps-devel/pkg-plist
deleted file mode 100644
index a8c7fa9a2b6f..000000000000
--- a/devel/cvsps-devel/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cvsps
diff --git a/devel/cvsps/Makefile b/devel/cvsps/Makefile
index a3f7d2f8dd51..4dd9965ed626 100644
--- a/devel/cvsps/Makefile
+++ b/devel/cvsps/Makefile
@@ -18,7 +18,8 @@ COMMENT=	CVS patchsets
 USE_GMAKE=	yes
 ALL_TARGET=	cvsps
 
-MAN1=	cvsps.1
+MAN1=		cvsps.1
+PLIST_FILES=	bin/cvsps
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cvsps ${PREFIX}/bin
diff --git a/devel/cvsps/pkg-plist b/devel/cvsps/pkg-plist
deleted file mode 100644
index a8c7fa9a2b6f..000000000000
--- a/devel/cvsps/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cvsps
diff --git a/devel/dia2code/Makefile b/devel/dia2code/Makefile
index e4c5dab8c265..580e7e4335a1 100644
--- a/devel/dia2code/Makefile
+++ b/devel/dia2code/Makefile
@@ -26,6 +26,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		XML_CONFIG="${XML_CONFIG}"
 
 MAN1=		dia2code.1
+PLIST_FILES=	bin/dia2code
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|#include <malloc.h>||' ${WRKSRC}/dia2code/dia2code.h
diff --git a/devel/dia2code/pkg-plist b/devel/dia2code/pkg-plist
deleted file mode 100644
index c681af4d0b33..000000000000
--- a/devel/dia2code/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/dia2code
diff --git a/devel/ebnf2yacc/Makefile b/devel/ebnf2yacc/Makefile
index e8144eab43ad..ef7fc51dd727 100644
--- a/devel/ebnf2yacc/Makefile
+++ b/devel/ebnf2yacc/Makefile
@@ -17,4 +17,6 @@ COMMENT=	EBNF to YACC
 
 GNU_CONFIGURE=	yes
 
+PLIST_FILES=	bin/ebnf2yacc
+
 .include <bsd.port.mk>
diff --git a/devel/ebnf2yacc/pkg-plist b/devel/ebnf2yacc/pkg-plist
deleted file mode 100644
index 00698cd5047e..000000000000
--- a/devel/ebnf2yacc/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/ebnf2yacc
diff --git a/devel/elftoaout/Makefile b/devel/elftoaout/Makefile
index 3399e9591153..dcc15ea8ad52 100644
--- a/devel/elftoaout/Makefile
+++ b/devel/elftoaout/Makefile
@@ -16,6 +16,7 @@ COMMENT=	ELF to a.out conversion tool by Jakub Jelinek and Pete Zaitcev
 
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 MAN1=		elftoaout.1
+PLIST_FILES=	bin/elftoaout
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/elftoaout ${PREFIX}/bin
diff --git a/devel/elftoaout/pkg-plist b/devel/elftoaout/pkg-plist
deleted file mode 100644
index 241c8582d437..000000000000
--- a/devel/elftoaout/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/elftoaout
diff --git a/devel/f77flow/Makefile b/devel/f77flow/Makefile
index 57eb73af748b..2d05a8390101 100644
--- a/devel/f77flow/Makefile
+++ b/devel/f77flow/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=		ports@FreeBSD.org
 COMMENT=	Analyze the structure of a fortran77 program
 
 ALL_TARGET=
-MAN1=			flow.1
+MAN1=		flow.1
+PLIST_FILES=	bin/flow
 
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/flow ${PREFIX}/bin/flow
diff --git a/devel/f77flow/pkg-plist b/devel/f77flow/pkg-plist
deleted file mode 100644
index 2b5d0729871d..000000000000
--- a/devel/f77flow/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/flow
diff --git a/devel/freescope/Makefile b/devel/freescope/Makefile
index 793a145e451b..c707793631e2 100644
--- a/devel/freescope/Makefile
+++ b/devel/freescope/Makefile
@@ -21,7 +21,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
-MAN1=	freescope.1
+MAN1=		freescope.1
+PLIST_FILES=	bin/freescope
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/freescope/pkg-plist b/devel/freescope/pkg-plist
deleted file mode 100644
index 81a4a7075b38..000000000000
--- a/devel/freescope/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/freescope
diff --git a/devel/fsmgenerator/Makefile b/devel/fsmgenerator/Makefile
index 9e2fd5c8f8b4..d8197ba7bc32 100644
--- a/devel/fsmgenerator/Makefile
+++ b/devel/fsmgenerator/Makefile
@@ -17,6 +17,7 @@ DISTNAME=	FSMGenerator${PORTVERSION:S/.//g}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Finite State Machine generating software
 
+PLIST_FILES=	bin/fsmgenerator
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 
diff --git a/devel/fsmgenerator/pkg-plist b/devel/fsmgenerator/pkg-plist
deleted file mode 100644
index 7010b413bd7a..000000000000
--- a/devel/fsmgenerator/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/fsmgenerator
diff --git a/devel/g2c/Makefile b/devel/g2c/Makefile
index 973b280f0fe9..6d56e01a90b8 100644
--- a/devel/g2c/Makefile
+++ b/devel/g2c/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Glade to C translator
 
+PLIST_FILES=	bin/g2c
 USE_REINPLACE=	yes
 USE_GNOME=	gtk12 gnomehack libxml orbit
 WANT_GNOME=	yes
diff --git a/devel/g2c/pkg-plist b/devel/g2c/pkg-plist
deleted file mode 100644
index d0b39feb9ee9..000000000000
--- a/devel/g2c/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/g2c
diff --git a/devel/kimwitu++/Makefile b/devel/kimwitu++/Makefile
index 1fd34da7b152..58bf1cb7be66 100644
--- a/devel/kimwitu++/Makefile
+++ b/devel/kimwitu++/Makefile
@@ -21,6 +21,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-MAN1=	kc++.1
+MAN1=		kc++.1
+PLIST_FILES=	bin/kc++
 
 .include <bsd.port.mk>
diff --git a/devel/kimwitu++/pkg-plist b/devel/kimwitu++/pkg-plist
deleted file mode 100644
index a3987ba70257..000000000000
--- a/devel/kimwitu++/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/kc++
diff --git a/devel/mk/Makefile b/devel/mk/Makefile
index 9f4b607b3ff5..515e15569add 100644
--- a/devel/mk/Makefile
+++ b/devel/mk/Makefile
@@ -14,6 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Andrew Hume's mk by way of Research Unix, Plan 9, & Inferno
 
 MAN1=		mk.1
+PLIST_FILES=	bin/mk
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mk ${PREFIX}/bin
diff --git a/devel/mk/pkg-plist b/devel/mk/pkg-plist
deleted file mode 100644
index 6b7e855d61d2..000000000000
--- a/devel/mk/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/mk
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index 5837198f0931..18fae9d182b6 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses
 USE_PERL5=	YES
 
 NO_BUILD=	YES
+PLIST_FILES=	%%SITE_PERL%%/PV.pm
 
 do-install:
 	${MKDIR} -m 755 ${PREFIX}/lib/perl5/site_perl/${PERL_VER}
diff --git a/devel/p5-PV/pkg-plist b/devel/p5-PV/pkg-plist
deleted file mode 100644
index 7f8211a4c0dc..000000000000
--- a/devel/p5-PV/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%SITE_PERL%%/PV.pm
diff --git a/devel/p5-PerlMenu/Makefile b/devel/p5-PerlMenu/Makefile
index b9f9b642b70a..c90228eb3bda 100644
--- a/devel/p5-PerlMenu/Makefile
+++ b/devel/p5-PerlMenu/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses
 
 USE_PERL5=	yes
 NO_BUILD=	yes
+PLIST_FILES=	%%SITE_PERL%%/perlmenu.pm
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/perlmenu.pm ${SITE_PERL}
diff --git a/devel/p5-PerlMenu/pkg-plist b/devel/p5-PerlMenu/pkg-plist
deleted file mode 100644
index 5b96346397c6..000000000000
--- a/devel/p5-PerlMenu/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%SITE_PERL%%/perlmenu.pm
diff --git a/devel/p65/Makefile b/devel/p65/Makefile
index bceb47523fc4..823fd8a0c65c 100644
--- a/devel/p65/Makefile
+++ b/devel/p65/Makefile
@@ -21,6 +21,7 @@ EXTRACT_AFTER_ARGS=	${WRKSRC}
 USE_PERL5=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+PLIST_FILES=	bin/p65
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin/${PORTNAME}
diff --git a/devel/p65/pkg-plist b/devel/p65/pkg-plist
deleted file mode 100644
index 221fd4f83217..000000000000
--- a/devel/p65/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/p65
diff --git a/devel/py-dialog/Makefile b/devel/py-dialog/Makefile
index 1b61d4e641a1..8b349c9879ac 100644
--- a/devel/py-dialog/Makefile
+++ b/devel/py-dialog/Makefile
@@ -18,6 +18,7 @@ EXTRACT_SUFX=	.py
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python Dialog
 
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/dialog.py
 USE_PYTHON=	yes
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	# empty
diff --git a/devel/py-dialog/pkg-plist b/devel/py-dialog/pkg-plist
deleted file mode 100644
index 7f9010a2a044..000000000000
--- a/devel/py-dialog/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%PYTHON_SITELIBDIR%%/dialog.py
diff --git a/devel/qtk/Makefile b/devel/qtk/Makefile
index d0fbd7a5d1aa..a66deb69eb43 100644
--- a/devel/qtk/Makefile
+++ b/devel/qtk/Makefile
@@ -17,6 +17,7 @@ COMMENT=	A neat development tool for various languages
 
 RUN_DEPENDS=	${LOCALBASE}/bin/wish8.2:${PORTSDIR}/x11-toolkits/tk82
 
+PLIST_FILES=	bin/qtk
 USE_REINPLACE=	yes
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	# empty
diff --git a/devel/qtk/pkg-plist b/devel/qtk/pkg-plist
deleted file mode 100644
index 0a85157fa5e9..000000000000
--- a/devel/qtk/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/qtk
diff --git a/devel/ragel/Makefile b/devel/ragel/Makefile
index b136ac524520..3309347eba45 100644
--- a/devel/ragel/Makefile
+++ b/devel/ragel/Makefile
@@ -21,7 +21,8 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	AWK="${AWK}"
 
-MAN1=	ragel.1
+MAN1=		ragel.1
+PLIST_FILES=	bin/ragel
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/devel/ragel/pkg-plist b/devel/ragel/pkg-plist
deleted file mode 100644
index 2d32a35552e0..000000000000
--- a/devel/ragel/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/ragel
diff --git a/devel/sedsed/Makefile b/devel/sedsed/Makefile
index 83db4effa392..f9d391806d2a 100644
--- a/devel/sedsed/Makefile
+++ b/devel/sedsed/Makefile
@@ -15,6 +15,7 @@ EXTRACT_SUFX=	# empty
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Python script that masters SED scripts
 
+PLIST_FILES=	bin/sedsed
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	${WRKDIR}
diff --git a/devel/sedsed/pkg-plist b/devel/sedsed/pkg-plist
deleted file mode 100644
index ba8032c9679d..000000000000
--- a/devel/sedsed/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/sedsed
diff --git a/devel/showgrammar/Makefile b/devel/showgrammar/Makefile
index 6b007391b7ab..1d1c4b580228 100644
--- a/devel/showgrammar/Makefile
+++ b/devel/showgrammar/Makefile
@@ -18,6 +18,7 @@ COMMENT=	Convert a yacc grammar to syntax diagrams
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/spark.py:${PORTSDIR}/devel/py-spark
 
+PLIST_FILES=	bin/showgrammar
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	${WRKSRC}
diff --git a/devel/showgrammar/pkg-plist b/devel/showgrammar/pkg-plist
deleted file mode 100644
index 22f8e4fc0515..000000000000
--- a/devel/showgrammar/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/showgrammar
diff --git a/devel/sigslot/Makefile b/devel/sigslot/Makefile
index b9a9c83b8134..0207812b82b1 100644
--- a/devel/sigslot/Makefile
+++ b/devel/sigslot/Makefile
@@ -16,6 +16,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ Signal/Slot Library
 
+PLIST_FILES=	include/sigslot.h
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/devel/sigslot/pkg-plist b/devel/sigslot/pkg-plist
deleted file mode 100644
index 68d78827e570..000000000000
--- a/devel/sigslot/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-include/sigslot.h
diff --git a/devel/ucpp/Makefile b/devel/ucpp/Makefile
index cb6fbf64e7cb..2cef6da9e06f 100644
--- a/devel/ucpp/Makefile
+++ b/devel/ucpp/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=	http://pornin.nerim.net/ucpp/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C preprocessor and lexer
 
-MAN1=	ucpp.1
+MAN1=		ucpp.1
+PLIST_FILES=	bin/ucpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/devel/ucpp/pkg-plist b/devel/ucpp/pkg-plist
deleted file mode 100644
index dcdf7b0c3515..000000000000
--- a/devel/ucpp/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/ucpp