32 files changed, 19 insertions, 18 deletions

diff --git a/security/bubblegum/Makefile b/security/bubblegum/Makefile
index d041d209bfb7..5218ea0dd15a 100644
--- a/security/bubblegum/Makefile
+++ b/security/bubblegum/Makefile
@@ -18,6 +18,7 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		bubblegum.1
 MANCOMPRESSED=	no
+PLIST_FILES=	bin/bubblegum
 
 pre-build:
 	${CP} ${WRKSRC}/doc/bubblegum.man ${WRKSRC}/doc/bubblegum.1
diff --git a/security/bubblegum/pkg-plist b/security/bubblegum/pkg-plist
deleted file mode 100644
index bc0bd784da04..000000000000
--- a/security/bubblegum/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/bubblegum
diff --git a/security/cp2fwb/Makefile b/security/cp2fwb/Makefile
index c50128f785ea..4e4b61faa080 100644
--- a/security/cp2fwb/Makefile
+++ b/security/cp2fwb/Makefile
@@ -18,6 +18,7 @@ COMMENT=	Checkpoint FW1 to Firewall Builder ruleset converter
 RUN_DEPENDS=	${SITE_PERL}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
 
+PLIST_FILES=	bin/cp2fwbuilder
 USE_PERL5=	yes
 NO_BUILD=	yes
 
diff --git a/security/cp2fwb/pkg-plist b/security/cp2fwb/pkg-plist
deleted file mode 100644
index 96e75f77b2ec..000000000000
--- a/security/cp2fwb/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cp2fwbuilder
diff --git a/security/fragrouter/Makefile b/security/fragrouter/Makefile
index f46556ceefe3..8d06e0fa4ea2 100644
--- a/security/fragrouter/Makefile
+++ b/security/fragrouter/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Tool for testing network IDS implementations
 
 GNU_CONFIGURE=	yes
 
-MAN8=	fragrouter.8
+MAN8=		fragrouter.8
+PLIST_FILES=	sbin/fragrouter
 
 .include <bsd.port.mk>
diff --git a/security/fragrouter/pkg-plist b/security/fragrouter/pkg-plist
deleted file mode 100644
index af1ae81c033f..000000000000
--- a/security/fragrouter/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-sbin/fragrouter
diff --git a/security/fuzz/Makefile b/security/fuzz/Makefile
index c934ac0c32c8..1853957aa288 100644
--- a/security/fuzz/Makefile
+++ b/security/fuzz/Makefile
@@ -18,6 +18,7 @@ COMMENT=	Tool for testing software by bombarding the program with random data
 GNU_CONFIGURE=	yes
 
 MAN1=		fuzz.1
+PLIST_FILES=	bin/fuzz
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/security/fuzz/pkg-plist b/security/fuzz/pkg-plist
deleted file mode 100644
index 54f0daf1808d..000000000000
--- a/security/fuzz/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/fuzz
diff --git a/security/gnome-ssh-askpass/Makefile b/security/gnome-ssh-askpass/Makefile
index e1e71a089db1..586b2448c0cc 100644
--- a/security/gnome-ssh-askpass/Makefile
+++ b/security/gnome-ssh-askpass/Makefile
@@ -19,6 +19,7 @@ WRKSRC=		${WRKDIR}/openssh-3.6p1
 BUILD_WRKSRC=	${WRKSRC}/contrib
 ALL_TARGET=	gnome-ssh-askpass2
 
+PLIST_FILES=	bin/gnome-ssh-askpass2
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 
diff --git a/security/gnome-ssh-askpass/pkg-plist b/security/gnome-ssh-askpass/pkg-plist
deleted file mode 100644
index d1594cb80898..000000000000
--- a/security/gnome-ssh-askpass/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/gnome-ssh-askpass2
diff --git a/security/gsfv/Makefile b/security/gsfv/Makefile
index 2515b9a410ce..ded7356f284d 100644
--- a/security/gsfv/Makefile
+++ b/security/gsfv/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR=	ijliao
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Create or verify Simple File Verification (SFV) checksum files
 
+PLIST_FILES=	bin/gsfv
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
diff --git a/security/gsfv/pkg-plist b/security/gsfv/pkg-plist
deleted file mode 100644
index 4ea2ed977377..000000000000
--- a/security/gsfv/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/gsfv
diff --git a/security/lxnb/Makefile b/security/lxnb/Makefile
index 499e64b097bf..4f37ac4259c5 100644
--- a/security/lxnb/Makefile
+++ b/security/lxnb/Makefile
@@ -15,6 +15,8 @@ DISTFILES=	linux-netbus-client-v${PORTVERSION}.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NetBus client
 
+PLIST_FILES=	bin/lxnb
+
 pre-build:
 	rm -f ${WRKSRC}/lxnetbus
 
diff --git a/security/lxnb/pkg-plist b/security/lxnb/pkg-plist
deleted file mode 100644
index a789015cb0ed..000000000000
--- a/security/lxnb/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/lxnb
diff --git a/security/mdcrack/Makefile b/security/mdcrack/Makefile
index 0adfbf249ab3..02dffee5826a 100644
--- a/security/mdcrack/Makefile
+++ b/security/mdcrack/Makefile
@@ -15,5 +15,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Bruteforce password MD5 hashes
 
 ALL_TARGET=	little
+PLIST_FILES=	bin/mdcrack
 
 .include <bsd.port.mk>
diff --git a/security/mdcrack/pkg-plist b/security/mdcrack/pkg-plist
deleted file mode 100644
index 943873839dc5..000000000000
--- a/security/mdcrack/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/mdcrack
diff --git a/security/nofgpg/Makefile b/security/nofgpg/Makefile
index 57ee9e679c7c..6c60a315397b 100644
--- a/security/nofgpg/Makefile
+++ b/security/nofgpg/Makefile
@@ -22,7 +22,8 @@ USE_REINPLACE=	yes
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
-MAN1=	nofgpg.1
+MAN1=		nofgpg.1
+PLIST_FILES=	bin/nofgpg
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,/usr/share,${X11BASE}/share/gnome,g" ${WRKSRC}/nofgpg
diff --git a/security/nofgpg/pkg-plist b/security/nofgpg/pkg-plist
deleted file mode 100644
index 0074fbcf355b..000000000000
--- a/security/nofgpg/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/nofgpg
diff --git a/security/py-fchksum/Makefile b/security/py-fchksum/Makefile
index cce3317bd3ec..f24816736aca 100644
--- a/security/py-fchksum/Makefile
+++ b/security/py-fchksum/Makefile
@@ -16,6 +16,7 @@ DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python module to find the checksum of files
 
+PLIST_FILES=	lib/%%PYTHON_VERSION%%/site-packages/fchksum.so
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 GNU_CONFIGURE=	yes
diff --git a/security/py-fchksum/pkg-plist b/security/py-fchksum/pkg-plist
deleted file mode 100644
index 8d677e4add82..000000000000
--- a/security/py-fchksum/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/%%PYTHON_VERSION%%/site-packages/fchksum.so
diff --git a/security/py-mcrypt/Makefile b/security/py-mcrypt/Makefile
index 267d83b26d3d..1c74adb76ef9 100644
--- a/security/py-mcrypt/Makefile
+++ b/security/py-mcrypt/Makefile
@@ -19,6 +19,7 @@ COMMENT=	A comprehensive Python interface to the mcrypt library
 
 LIB_DEPENDS=	mcrypt:${PORTSDIR}/security/libmcrypt
 
+PLIST_FILES=	lib/%%PYTHON_VERSION%%/site-packages/mcrypt.so
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 USE_REINPLACE=	yes
diff --git a/security/py-mcrypt/pkg-plist b/security/py-mcrypt/pkg-plist
deleted file mode 100644
index 0366bc1892b2..000000000000
--- a/security/py-mcrypt/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/%%PYTHON_VERSION%%/site-packages/mcrypt.so
diff --git a/security/py-mhash/Makefile b/security/py-mhash/Makefile
index 97212f44ca12..e086996336e2 100644
--- a/security/py-mhash/Makefile
+++ b/security/py-mhash/Makefile
@@ -19,6 +19,7 @@ COMMENT=	Python mhash module
 
 LIB_DEPENDS=	mhash:${PORTSDIR}/security/mhash
 
+PLIST_FILES=	lib/%%PYTHON_VERSION%%/site-packages/mhash.so
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 USE_REINPLACE=	yes
diff --git a/security/py-mhash/pkg-plist b/security/py-mhash/pkg-plist
deleted file mode 100644
index 9546f4543bec..000000000000
--- a/security/py-mhash/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/%%PYTHON_VERSION%%/site-packages/mhash.so
diff --git a/security/sig2dot/Makefile b/security/sig2dot/Makefile
index 8a5596e84bb1..be2c422ef043 100644
--- a/security/sig2dot/Makefile
+++ b/security/sig2dot/Makefile
@@ -16,6 +16,7 @@ EXTRACT_SUFX=	.pl
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GPG/PGP Keyring Graph Generator
 
+PLIST_FILES=	bin/sig2dot
 USE_PERL5=	yes
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=
diff --git a/security/sig2dot/pkg-plist b/security/sig2dot/pkg-plist
deleted file mode 100644
index be48b9195b8d..000000000000
--- a/security/sig2dot/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/sig2dot
diff --git a/security/trinokiller/Makefile b/security/trinokiller/Makefile
index 56f86d101046..434c29b4437e 100644
--- a/security/trinokiller/Makefile
+++ b/security/trinokiller/Makefile
@@ -18,6 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Remotely kill trino nodes
 
 NO_WRKSUBDIR=	yes
+PLIST_FILES=	sbin/trinokiller
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
diff --git a/security/trinokiller/pkg-plist b/security/trinokiller/pkg-plist
deleted file mode 100644
index a497093226d0..000000000000
--- a/security/trinokiller/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-sbin/trinokiller
diff --git a/security/vlock/Makefile b/security/vlock/Makefile
index 345d64fed049..eeeaf7a96af6 100644
--- a/security/vlock/Makefile
+++ b/security/vlock/Makefile
@@ -15,5 +15,6 @@ MAINTAINER=		ports@FreeBSD.org
 COMMENT=	Locks a terminal
 
 MAN1=			vlock.1
+PLIST_FILES=	bin/vlock
 
 .include <bsd.port.mk>
diff --git a/security/vlock/pkg-plist b/security/vlock/pkg-plist
deleted file mode 100644
index 325915dc2c45..000000000000
--- a/security/vlock/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/vlock
diff --git a/security/vlog/Makefile b/security/vlog/Makefile
index 191156474ea7..268ac466e13f 100644
--- a/security/vlog/Makefile
+++ b/security/vlog/Makefile
@@ -25,6 +25,7 @@ USE_PERL5=	yes
 
 MAN1=		vlog.1
 MANCOMPRESSED=	no
+PLIST_FILES=	bin/vlog
 
 post-patch:
 	${REINPLACE_CMD} -e "s@/usr/local@${PREFIX}@g" ${WRKSRC}/Makefile
diff --git a/security/vlog/pkg-plist b/security/vlog/pkg-plist
deleted file mode 100644
index a83ed21389d4..000000000000
--- a/security/vlog/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/vlog