42 files changed, 25 insertions, 23 deletions

diff --git a/x11/9box/Makefile b/x11/9box/Makefile
index dda5bb397d4d..2d36d850613c 100644
--- a/x11/9box/Makefile
+++ b/x11/9box/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	http://freesoftware.fsf.org/download/9box/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	9box can "pack" windows inside itself
 
+PLIST_FILES=	bin/9box
 USE_REINPLACE=	yes
 USE_XLIB=	yes
 USE_X_PREFIX=	yes
diff --git a/x11/9box/pkg-plist b/x11/9box/pkg-plist
deleted file mode 100644
index 9db05c2be4c2..000000000000
--- a/x11/9box/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/9box
diff --git a/x11/9menu/Makefile b/x11/9menu/Makefile
index dbb813033f02..3d4de56df70f 100644
--- a/x11/9menu/Makefile
+++ b/x11/9menu/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple menu patterened after plan9
 #BROKEN=		unfetchable
 
+PLIST_FILES=		bin/9menu
 USE_XLIB=		yes
 EXTRACT_CMD=		zcat
 EXTRACT_BEFORE_ARGS=
diff --git a/x11/9menu/pkg-plist b/x11/9menu/pkg-plist
deleted file mode 100644
index c2b402d15782..000000000000
--- a/x11/9menu/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/9menu
diff --git a/x11/9term/Makefile b/x11/9term/Makefile
index 3feee89347c8..52d687512324 100644
--- a/x11/9term/Makefile
+++ b/x11/9term/Makefile
@@ -21,5 +21,6 @@ NO_WRKSUBDIR=	yes
 USE_X_PREFIX=	yes
 MAKE_ENV=	SAMDIR=${WRKDIRPREFIX}${.CURDIR}/../../editors/sam/work
 MAN1=		9term.1
+PLIST_FILES=	bin/9term
 
 .include <bsd.port.mk>
diff --git a/x11/9term/pkg-plist b/x11/9term/pkg-plist
deleted file mode 100644
index f1f94970c6a4..000000000000
--- a/x11/9term/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/9term
diff --git a/x11/blast/Makefile b/x11/blast/Makefile
index 4eaae8cefa17..19164dbf52d5 100644
--- a/x11/blast/Makefile
+++ b/x11/blast/Makefile
@@ -19,6 +19,7 @@ COMMENT=	Blast blows holes through windows
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_X_PREFIX=	yes
 MAN1=		blast.1
+PLIST_FILES=	bin/blast
 
 do-build:
 	${CC} ${CFLAGS} ${WRKSRC}/blast.c -I${X11BASE}/include -L${X11BASE}/lib -lX11 -lXext -o ${WRKSRC}/blast
diff --git a/x11/blast/pkg-plist b/x11/blast/pkg-plist
deleted file mode 100644
index 9fff8b827d9c..000000000000
--- a/x11/blast/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/blast
diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile
index e613e8d55c4b..6e6ee775a512 100644
--- a/x11/dxpc/Makefile
+++ b/x11/dxpc/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Compressing X protocol proxy designed to support X11 over slow links
 LIB_DEPENDS=	lzo.1:${PORTSDIR}/archivers/lzo
 
 MAN1=		dxpc.1
+PLIST_FILES=	bin/dxpc
 
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
diff --git a/x11/dxpc/pkg-plist b/x11/dxpc/pkg-plist
deleted file mode 100644
index efaa89d74ede..000000000000
--- a/x11/dxpc/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/dxpc
diff --git a/x11/ebuttons/Makefile b/x11/ebuttons/Makefile
index 5395adfbe508..20f76e2c050e 100644
--- a/x11/ebuttons/Makefile
+++ b/x11/ebuttons/Makefile
@@ -17,6 +17,8 @@ COMMENT=	A simple epplet that contains several buttons used to launch programs
 
 LIB_DEPENDS=	epplet.1:${PORTSDIR}/x11-wm/libepplet
 
+PLIST_FILES=	bin/E-Buttons.epplet
+
 WRKSRC=		${WRKDIR}/E-buttons
 
 USE_X_PREFIX=	yes
diff --git a/x11/ebuttons/pkg-plist b/x11/ebuttons/pkg-plist
deleted file mode 100644
index 636633d39efb..000000000000
--- a/x11/ebuttons/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/E-Buttons.epplet
diff --git a/x11/erun/Makefile b/x11/erun/Makefile
index 91054f728f2c..aeb7a6db1b69 100644
--- a/x11/erun/Makefile
+++ b/x11/erun/Makefile
@@ -17,6 +17,8 @@ COMMENT=	A simple epplet for launching arbitrary programs
 
 LIB_DEPENDS=	epplet.1:${PORTSDIR}/x11-wm/libepplet
 
+PLIST_FILES=	bin/E-Run.epplet
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
diff --git a/x11/erun/pkg-plist b/x11/erun/pkg-plist
deleted file mode 100644
index 4b66b6ac1adf..000000000000
--- a/x11/erun/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/E-Run.epplet
diff --git a/x11/grabc/Makefile b/x11/grabc/Makefile
index e5c3be4ddc14..a463f80b416a 100644
--- a/x11/grabc/Makefile
+++ b/x11/grabc/Makefile
@@ -16,6 +16,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Grab a color from screen
 
+PLIST_FILES=	bin/grabc
 USE_XLIB=	yes
 CFLAGS+=	-I${X11BASE}/include
 LIBS+=		-L${X11BASE}/lib -lX11
diff --git a/x11/grabc/pkg-plist b/x11/grabc/pkg-plist
deleted file mode 100644
index 310cce9b0b66..000000000000
--- a/x11/grabc/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/grabc
diff --git a/x11/gyroscope/Makefile b/x11/gyroscope/Makefile
index ef8477538432..d0a5da25c06a 100644
--- a/x11/gyroscope/Makefile
+++ b/x11/gyroscope/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://soupnazi.org/FreeBSD/ports/distfiles/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTML color picker written using GTK
 
+PLIST_FILES=	bin/gyroscope
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
diff --git a/x11/gyroscope/pkg-plist b/x11/gyroscope/pkg-plist
deleted file mode 100644
index 34828a4f571c..000000000000
--- a/x11/gyroscope/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/gyroscope
diff --git a/x11/sxpc/Makefile b/x11/sxpc/Makefile
index a2370a79f13c..d88317869255 100644
--- a/x11/sxpc/Makefile
+++ b/x11/sxpc/Makefile
@@ -22,5 +22,6 @@ EXTRACT_BEFORE_ARGS=	-dc
 EXTRACT_AFTER_ARGS=	| ${SH}
 
 MAN1=		sxpc.1
+PLIST_FILES=	bin/sxpc
 
 .include <bsd.port.mk>
diff --git a/x11/sxpc/pkg-plist b/x11/sxpc/pkg-plist
deleted file mode 100644
index 5055acf2f746..000000000000
--- a/x11/sxpc/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/sxpc
diff --git a/x11/wmmatrix/Makefile b/x11/wmmatrix/Makefile
index 9448c9495ca5..bb9dc7fe2bc6 100644
--- a/x11/wmmatrix/Makefile
+++ b/x11/wmmatrix/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	wmMatrix-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A DockApp that runs a version of the xmatrix screenhack
 
+PLIST_FILES=	bin/wmmatrix
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/x11/wmmatrix/pkg-plist b/x11/wmmatrix/pkg-plist
deleted file mode 100644
index e0085485fe3e..000000000000
--- a/x11/wmmatrix/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/wmmatrix
diff --git a/x11/xantfarm/Makefile b/x11/xantfarm/Makefile
index 2f4e4e6b7103..1e91a7e095cc 100644
--- a/x11/xantfarm/Makefile
+++ b/x11/xantfarm/Makefile
@@ -17,5 +17,6 @@ COMMENT=	Ant hill simulation on X11 root window
 WRKSRC=		${WRKDIR}/xantfarm
 USE_IMAKE=	yes
 MAN1=		xantfarm.1
+PLIST_FILES=	bin/xantfarm
 
 .include <bsd.port.mk>
diff --git a/x11/xantfarm/pkg-plist b/x11/xantfarm/pkg-plist
deleted file mode 100644
index bc0a878a6c04..000000000000
--- a/x11/xantfarm/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xantfarm
diff --git a/x11/xbindkeys_config/Makefile b/x11/xbindkeys_config/Makefile
index ed01203c1d67..a178e4f7087c 100644
--- a/x11/xbindkeys_config/Makefile
+++ b/x11/xbindkeys_config/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR=	trevor
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An easy to use gtk program for configuring Xbindkeys
 
+PLIST_FILES=	bin/xbindkeys_config
 USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 MAKE_ENV=	CC="${CC} ${CFLAGS}"
diff --git a/x11/xbindkeys_config/pkg-plist b/x11/xbindkeys_config/pkg-plist
deleted file mode 100644
index 93834ee2a89f..000000000000
--- a/x11/xbindkeys_config/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xbindkeys_config
diff --git a/x11/xclip/Makefile b/x11/xclip/Makefile
index f826748fb7b6..12e085f1ee78 100644
--- a/x11/xclip/Makefile
+++ b/x11/xclip/Makefile
@@ -17,6 +17,7 @@ COMMENT=	An interface to X selections ("the clipboard") from the command line
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_IMAKE=	yes
 
-MAN1=	xclip.1
+MAN1=		xclip.1
+PLIST_FILES=	bin/xclip
 
 .include <bsd.port.mk>
diff --git a/x11/xclip/pkg-plist b/x11/xclip/pkg-plist
deleted file mode 100644
index b1e75b98dfbc..000000000000
--- a/x11/xclip/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xclip
diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile
index f9173193ed1b..9c40419e1226 100644
--- a/x11/xinput/Makefile
+++ b/x11/xinput/Makefile
@@ -17,5 +17,6 @@ COMMENT=	Very useful utility for configuring and testing XInput devices
 USE_IMAKE=	yes
 
 MAN1=		xinput.1
+PLIST_FILES=	bin/xinput
 
 .include <bsd.port.mk>
diff --git a/x11/xinput/pkg-plist b/x11/xinput/pkg-plist
deleted file mode 100644
index 94c3093614c5..000000000000
--- a/x11/xinput/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xinput
diff --git a/x11/xmold/Makefile b/x11/xmold/Makefile
index 7d45d5cc374a..f1fbde176607 100644
--- a/x11/xmold/Makefile
+++ b/x11/xmold/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Mold spreading over your X11 screen
 
 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
+PLIST_FILES=	bin/xmold
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xmold ${PREFIX}/bin
diff --git a/x11/xmold/pkg-plist b/x11/xmold/pkg-plist
deleted file mode 100644
index 739d41ef43ab..000000000000
--- a/x11/xmold/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xmold
diff --git a/x11/xsel/Makefile b/x11/xsel/Makefile
index 3558ca92c047..3efee54456ac 100644
--- a/x11/xsel/Makefile
+++ b/x11/xsel/Makefile
@@ -25,7 +25,8 @@ NO_WRKSUBDIR=	yes
 CFLAGS+=	`${GTK_CONFIG} --cflags`
 LDFLAGS+=	`${GTK_CONFIG} --libs` -lXt -lXaw
 
-MAN1=	xsel.1
+MAN1=		xsel.1
+PLIST_FILES=	bin/xsel
 
 do-build:
 	(cd ${WRKSRC} && ${CC} ${CFLAGS} xsel.c -o xsel ${LDFLAGS})
diff --git a/x11/xsel/pkg-plist b/x11/xsel/pkg-plist
deleted file mode 100644
index f42e4ea51e66..000000000000
--- a/x11/xsel/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xsel
diff --git a/x11/xskyroot/Makefile b/x11/xskyroot/Makefile
index 2161221f81d3..895877943f20 100644
--- a/x11/xskyroot/Makefile
+++ b/x11/xskyroot/Makefile
@@ -22,5 +22,6 @@ DIST_SUBDIR=	${PORTNAME}
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
+PLIST_FILES=	bin/xskyroot
 
 .include <bsd.port.mk>
diff --git a/x11/xskyroot/pkg-plist b/x11/xskyroot/pkg-plist
deleted file mode 100644
index cb5ec3b549dd..000000000000
--- a/x11/xskyroot/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xskyroot
diff --git a/x11/xtattr/Makefile b/x11/xtattr/Makefile
index 30f134e88a0b..2e6641e26b62 100644
--- a/x11/xtattr/Makefile
+++ b/x11/xtattr/Makefile
@@ -18,5 +18,6 @@ COMMENT=	A tool for changing xterm attributes
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAN1=		xtattr.1
 MANCOMPRESSED=	maybe
+PLIST_FILES=	bin/xtattr
 
 .include <bsd.port.mk>
diff --git a/x11/xtattr/pkg-plist b/x11/xtattr/pkg-plist
deleted file mode 100644
index c26ca10c8c18..000000000000
--- a/x11/xtattr/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xtattr
diff --git a/x11/xtoolwait/Makefile b/x11/xtoolwait/Makefile
index bbeb05573d38..3328b7d29efa 100644
--- a/x11/xtoolwait/Makefile
+++ b/x11/xtoolwait/Makefile
@@ -16,5 +16,6 @@ COMMENT=	Tool startup utility for X11
 
 USE_IMAKE=	yes
 MAN1=		xtoolwait.1
+PLIST_FILES=	bin/xtoolwait
 
 .include <bsd.port.mk>
diff --git a/x11/xtoolwait/pkg-plist b/x11/xtoolwait/pkg-plist
deleted file mode 100644
index 5a8760887f70..000000000000
--- a/x11/xtoolwait/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xtoolwait
diff --git a/x11/xwatchwin/Makefile b/x11/xwatchwin/Makefile
index 7230fd677853..abdb96fc8823 100644
--- a/x11/xwatchwin/Makefile
+++ b/x11/xwatchwin/Makefile
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Watch a window on another X server
 
 MAN1=		xwatchwin.1
+PLIST_FILES=	bin/xwatchwin
 
 USE_IMAKE=	yes
 
diff --git a/x11/xwatchwin/pkg-plist b/x11/xwatchwin/pkg-plist
deleted file mode 100644
index dc045dc6267d..000000000000
--- a/x11/xwatchwin/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xwatchwin