84 files changed, 44 insertions, 44 deletions

diff --git a/x11/cnslock/Makefile b/x11/cnslock/Makefile
index 1c9f7335f1bb..a70b6c7a892a 100644
--- a/x11/cnslock/Makefile
+++ b/x11/cnslock/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	http://www.dockapps.com/download.php/id/181/ \
 MAINTAINER=	danfe@regency.nsu.ru
 COMMENT=	A visual indicator of the states of the three "lock" buttons
 
+PLIST_FILES=	bin/cnslock
 USE_GETOPT_LONG=yes
 USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
diff --git a/x11/cnslock/pkg-plist b/x11/cnslock/pkg-plist
deleted file mode 100644
index 2d2b7b2c8aeb..000000000000
--- a/x11/cnslock/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cnslock
diff --git a/x11/deskmenu/Makefile b/x11/deskmenu/Makefile
index db2ba64a16de..2a956aa88c5b 100644
--- a/x11/deskmenu/Makefile
+++ b/x11/deskmenu/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	http://matt.peterson.org/FreeBSD/ports/ \
 MAINTAINER=	matt@peterson.org
 COMMENT=	X11 application launcher
 
+PLIST_FILES=	bin/deskmenu
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
diff --git a/x11/deskmenu/pkg-plist b/x11/deskmenu/pkg-plist
deleted file mode 100644
index 797cd5c8977f..000000000000
--- a/x11/deskmenu/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/deskmenu
diff --git a/x11/docker/Makefile b/x11/docker/Makefile
index 95bab673f24f..f654bcd03056 100644
--- a/x11/docker/Makefile
+++ b/x11/docker/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	http://www.kerneled.com/projects/docker/ \
 MAINTAINER=	samy@kerneled.com
 COMMENT=	A dockapp with support for GNOME2 and KDE3 tray icons
 
+PLIST_FILES=	bin/docker
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	glib20
diff --git a/x11/docker/pkg-plist b/x11/docker/pkg-plist
deleted file mode 100644
index 0cd79764254c..000000000000
--- a/x11/docker/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/docker
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 6c887a145d54..5e81402d079b 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -16,6 +16,7 @@ COMMENT=	A Fluxbox utility to create and manage icons on the desktop
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		Xft.2:${PORTSDIR}/x11-fonts/Xft
 
+PLIST_FILES=	bin/fbdesk
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/x11/fbdesk/pkg-plist b/x11/fbdesk/pkg-plist
deleted file mode 100644
index 0d0d7fa4e325..000000000000
--- a/x11/fbdesk/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/fbdesk
diff --git a/x11/fspanel/Makefile b/x11/fspanel/Makefile
index 383ef410a8dd..144efcf4a086 100644
--- a/x11/fspanel/Makefile
+++ b/x11/fspanel/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 
 USE_X_PREFIX=	yes
 HAS_CONFIGURE=	yes
+PLIST_FILES=	bin/fspanel
 ALL_TARGET=	fspanel
 
 do-install:
diff --git a/x11/fspanel/pkg-plist b/x11/fspanel/pkg-plist
deleted file mode 100644
index ea68c82d6eae..000000000000
--- a/x11/fspanel/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/fspanel
diff --git a/x11/gmessage/Makefile b/x11/gmessage/Makefile
index 82bcde681fd6..b14fc7c74d85 100644
--- a/x11/gmessage/Makefile
+++ b/x11/gmessage/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://www.brettnacher.org/users/dominik/FreeBSD/
 MAINTAINER=	domi@saargate.de
 COMMENT=	Gtk+ clone of xmessage. displays a given text in a X11 window
 
+PLIST_FILES=	bin/gmessage
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 
diff --git a/x11/gmessage/pkg-plist b/x11/gmessage/pkg-plist
deleted file mode 100644
index 32dabea35e62..000000000000
--- a/x11/gmessage/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/gmessage
diff --git a/x11/gnome-clipboard-daemon/Makefile b/x11/gnome-clipboard-daemon/Makefile
index be6bd08ef003..dd1964124f30 100644
--- a/x11/gnome-clipboard-daemon/Makefile
+++ b/x11/gnome-clipboard-daemon/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://members.chello.nl/~h.lai/gnome-clipboard-daemon/
 MAINTAINER=	mezz7@cox.net
 COMMENT=	A program that keeps the content of your X clipboard in memory
 
+PLIST_FILES=	bin/gnome-clipboard-daemon
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
diff --git a/x11/gnome-clipboard-daemon/pkg-plist b/x11/gnome-clipboard-daemon/pkg-plist
deleted file mode 100644
index 68b108d37a84..000000000000
--- a/x11/gnome-clipboard-daemon/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/gnome-clipboard-daemon
diff --git a/x11/gxset/Makefile b/x11/gxset/Makefile
index f1271b9823ea..1d164d92047a 100644
--- a/x11/gxset/Makefile
+++ b/x11/gxset/Makefile
@@ -24,5 +24,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 NOMAN=
+PLIST_FILES=	bin/gxset
 
 .include <bsd.port.mk>
diff --git a/x11/gxset/pkg-plist b/x11/gxset/pkg-plist
deleted file mode 100644
index 51b39df7f9a2..000000000000
--- a/x11/gxset/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/gxset
diff --git a/x11/kb2mb2/Makefile b/x11/kb2mb2/Makefile
index 84f100cbe043..63910affa428 100644
--- a/x11/kb2mb2/Makefile
+++ b/x11/kb2mb2/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 MAINTAINER=	sada@FreeBSD.org
 COMMENT=	Redirect any key to second mouse button
 
+PLIST_FILES=	bin/kb2mb2
 USE_IMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/kb2mb2/pkg-plist b/x11/kb2mb2/pkg-plist
deleted file mode 100644
index 6996de57ff55..000000000000
--- a/x11/kb2mb2/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/kb2mb2
diff --git a/x11/numlockx/Makefile b/x11/numlockx/Makefile
index f457d986e5cc..a2b42aad9e0f 100644
--- a/x11/numlockx/Makefile
+++ b/x11/numlockx/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	jb.quenot@caraldi.com
 COMMENT=	This little thingy allows you to start X with NumLock turned on
 
 GNU_CONFIGURE=	yes
+PLIST_FILES=	bin/numlockx
 USE_X_PREFIX=	yes
 
 # Needed for the "configure" program to find XTest and XKB header files
diff --git a/x11/numlockx/pkg-plist b/x11/numlockx/pkg-plist
deleted file mode 100644
index 21b1e6c79993..000000000000
--- a/x11/numlockx/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/numlockx
diff --git a/x11/offix-clipboard/Makefile b/x11/offix-clipboard/Makefile
index 05aba176fd1e..22587655df4f 100644
--- a/x11/offix-clipboard/Makefile
+++ b/x11/offix-clipboard/Makefile
@@ -22,5 +22,6 @@ GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_X_PREFIX=	YES
 MAN1=		clipboard.1
+PLIST_FILES=	bin/clipboard
 
 .include <bsd.port.mk>
diff --git a/x11/offix-clipboard/pkg-plist b/x11/offix-clipboard/pkg-plist
deleted file mode 100644
index 387312d6d500..000000000000
--- a/x11/offix-clipboard/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/clipboard
diff --git a/x11/offix-execute/Makefile b/x11/offix-execute/Makefile
index f98937b6d705..c11d4905987a 100644
--- a/x11/offix-execute/Makefile
+++ b/x11/offix-execute/Makefile
@@ -19,6 +19,7 @@ COMMENT=	Files executor from OffiX
 LIB_DEPENDS=	Dnd.1:${PORTSDIR}/x11/libdnd
 
 GNU_CONFIGURE=	YES
+PLIST_FILES=	bin/execute
 USE_GMAKE=	YES
 USE_X_PREFIX=	YES
 USE_XPM=	YES
diff --git a/x11/offix-execute/pkg-plist b/x11/offix-execute/pkg-plist
deleted file mode 100644
index fdfd6c9df476..000000000000
--- a/x11/offix-execute/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/execute
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index ee0b03ba2737..a38af9801cdf 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -27,6 +27,7 @@ CONFIGURE_ARGS=	--enable-utmp --enable-wtmp \
 		--with-xpm --enable-xpm-background --enable-transparency
 USE_BZIP2=	yes
 MAN1=		rxvt.1
+PLIST_FILES=	bin/rxvt
 
 # enable big5 support
 .if defined(WITH_BIG5)
diff --git a/x11/rxvt-unicode/pkg-plist b/x11/rxvt-unicode/pkg-plist
deleted file mode 100644
index 45ab4ea65bfd..000000000000
--- a/x11/rxvt-unicode/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/rxvt
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index ee0b03ba2737..a38af9801cdf 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -27,6 +27,7 @@ CONFIGURE_ARGS=	--enable-utmp --enable-wtmp \
 		--with-xpm --enable-xpm-background --enable-transparency
 USE_BZIP2=	yes
 MAN1=		rxvt.1
+PLIST_FILES=	bin/rxvt
 
 # enable big5 support
 .if defined(WITH_BIG5)
diff --git a/x11/rxvt/pkg-plist b/x11/rxvt/pkg-plist
deleted file mode 100644
index 45ab4ea65bfd..000000000000
--- a/x11/rxvt/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/rxvt
diff --git a/x11/settitle/Makefile b/x11/settitle/Makefile
index c1ba6a843f53..786661cfe4d0 100644
--- a/x11/settitle/Makefile
+++ b/x11/settitle/Makefile
@@ -19,5 +19,6 @@ WRKSRC=		${WRKDIR}/settitle
 
 MAN1=		settitle.1
 MANCOMPRESSED=	maybe
+PLIST_FILES=	bin/settitle
 
 .include <bsd.port.mk>
diff --git a/x11/settitle/pkg-plist b/x11/settitle/pkg-plist
deleted file mode 100644
index 36ab36b4c948..000000000000
--- a/x11/settitle/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/settitle
diff --git a/x11/wmblob/Makefile b/x11/wmblob/Makefile
index 8e9654cf5e11..792da4d687af 100644
--- a/x11/wmblob/Makefile
+++ b/x11/wmblob/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://dockapps.org/files/155/205/
 MAINTAINER=	pat@FreeBSD.org
 COMMENT=	Showing moving blobs
 
+PLIST_FILES=	bin/wmblob
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_BZIP2=	yes
diff --git a/x11/wmblob/pkg-plist b/x11/wmblob/pkg-plist
deleted file mode 100644
index cef5e6bdf7ec..000000000000
--- a/x11/wmblob/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/wmblob
diff --git a/x11/wmfstatus/Makefile b/x11/wmfstatus/Makefile
index 78962ba6aad3..8fd278a3bae3 100644
--- a/x11/wmfstatus/Makefile
+++ b/x11/wmfstatus/Makefile
@@ -18,5 +18,6 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 
 NO_MAN=
+PLIST_FILES=	bin/wmfstatus
 
 .include <bsd.port.mk>
diff --git a/x11/wmfstatus/pkg-plist b/x11/wmfstatus/pkg-plist
deleted file mode 100644
index b0a29c611f9b..000000000000
--- a/x11/wmfstatus/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/wmfstatus
diff --git a/x11/wmoldmenu2new/Makefile b/x11/wmoldmenu2new/Makefile
index dd827c8d51fe..2ab9e5e554b4 100644
--- a/x11/wmoldmenu2new/Makefile
+++ b/x11/wmoldmenu2new/Makefile
@@ -21,6 +21,7 @@ NO_WRKSUBDIR=	yes
 EXTRACT_AFTER_ARGS=	> ${PORTNAME}
 
 NOMAN=		# defined
+PLIST_FILES=	bin/wmoldmenu2new
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
diff --git a/x11/wmoldmenu2new/pkg-plist b/x11/wmoldmenu2new/pkg-plist
deleted file mode 100644
index 342e9709af16..000000000000
--- a/x11/wmoldmenu2new/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/wmoldmenu2new
diff --git a/x11/wmxss/Makefile b/x11/wmxss/Makefile
index 97d9613124e5..d5538551a20c 100644
--- a/x11/wmxss/Makefile
+++ b/x11/wmxss/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://nis-www.lanl.gov/~mgh/WindowMaker/
 MAINTAINER=	bms@spc.org
 COMMENT=	Run xscreensaver modules inside a WindowMaker dock
 
+PLIST_FILES=	bin/wmxss
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/Src
diff --git a/x11/wmxss/pkg-plist b/x11/wmxss/pkg-plist
deleted file mode 100644
index 3faa6c35bd52..000000000000
--- a/x11/wmxss/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/wmxss
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index b4079a5b6d12..5c5ebf064781 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -26,6 +26,7 @@ CONFIGURE_ARGS= --enable-transparency --enable-xpm-background \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include/WINGs"
 
 MAN1=		wterm.1
+PLIST_FILES=	bin/wterm
 
 post-extract:
 	${RM} -f ${WRKSRC}/config.cache
diff --git a/x11/wterm/pkg-plist b/x11/wterm/pkg-plist
deleted file mode 100644
index b3b338866352..000000000000
--- a/x11/wterm/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/wterm
diff --git a/x11/xaniroc/Makefile b/x11/xaniroc/Makefile
index 10948d2f6288..5a823f3d9d3a 100644
--- a/x11/xaniroc/Makefile
+++ b/x11/xaniroc/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Animate your root-cursor
 
 USE_IMAKE=	yes
 MAN1=		xaniroc.1
+PLIST_FILES=	bin/xaniroc
 
 post-extract:
 	${MV} ${WRKSRC}/manpage.1 ${WRKSRC}/xaniroc.man
diff --git a/x11/xaniroc/pkg-plist b/x11/xaniroc/pkg-plist
deleted file mode 100644
index 246ffd098440..000000000000
--- a/x11/xaniroc/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xaniroc
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index c9612d51729e..77a415cb3dc8 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -18,5 +18,6 @@ COMMENT=	Used to activate xlock after a user defined time of inactivity
 
 USE_IMAKE=	yes
 MAN1=		xautolock.1
+PLIST_FILES=	bin/xautolock
 
 .include <bsd.port.mk>
diff --git a/x11/xautolock/pkg-plist b/x11/xautolock/pkg-plist
deleted file mode 100644
index 90aee43ad7eb..000000000000
--- a/x11/xautolock/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xautolock
diff --git a/x11/xballoon/Makefile b/x11/xballoon/Makefile
index 63c9d6d2e9b9..7a39a3d697f7 100644
--- a/x11/xballoon/Makefile
+++ b/x11/xballoon/Makefile
@@ -20,5 +20,6 @@ USE_XPM=	yes
 
 MAN1=		xballoon.1
 MANCOMPRESSED=	yes
+PLIST_FILES=	bin/xballoon
 
 .include <bsd.port.mk>
diff --git a/x11/xballoon/pkg-plist b/x11/xballoon/pkg-plist
deleted file mode 100644
index 73db2292b0ee..000000000000
--- a/x11/xballoon/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xballoon
diff --git a/x11/xcmd/Makefile b/x11/xcmd/Makefile
index f84178c65089..47ad16eee9ea 100644
--- a/x11/xcmd/Makefile
+++ b/x11/xcmd/Makefile
@@ -18,6 +18,7 @@ COMMENT=	Xcmd is a front-end for starting programs under X11
 USE_IMAKE=	yes
 
 MANCOMPRESSED=	yes
-MAN1=	xcmd.1
+MAN1=		xcmd.1
+PLIST_FILES=	bin/xcmd
 
 .include <bsd.port.mk>
diff --git a/x11/xcmd/pkg-plist b/x11/xcmd/pkg-plist
deleted file mode 100644
index 9101cd28bd26..000000000000
--- a/x11/xcmd/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xcmd
diff --git a/x11/xcoloredit/Makefile b/x11/xcoloredit/Makefile
index 345ef4d87160..815286647b19 100644
--- a/x11/xcoloredit/Makefile
+++ b/x11/xcoloredit/Makefile
@@ -18,5 +18,6 @@ COMMENT=	Find colour values by graphical colour mixing
 USE_IMAKE=	yes
 MAN1=		xcoloredit.1
 MANCOMPRESSED=	yes
+PLIST_FILES=	bin/xcoloredit
 
 .include <bsd.port.mk>
diff --git a/x11/xcoloredit/pkg-plist b/x11/xcoloredit/pkg-plist
deleted file mode 100644
index 2735eb4e2765..000000000000
--- a/x11/xcoloredit/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xcoloredit
diff --git a/x11/xcut/Makefile b/x11/xcut/Makefile
index 1418cbbfe0ea..238a5356fe5c 100644
--- a/x11/xcut/Makefile
+++ b/x11/xcut/Makefile
@@ -16,5 +16,6 @@ COMMENT=	Manipulate X cut buffers from the commandline
 
 USE_IMAKE=	YES
 MAN1=		xcut.1
+PLIST_FILES=	bin/xcut
 
 .include <bsd.port.mk>
diff --git a/x11/xcut/pkg-plist b/x11/xcut/pkg-plist
deleted file mode 100644
index 25084980cd4d..000000000000
--- a/x11/xcut/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xcut
diff --git a/x11/xfishtank/Makefile b/x11/xfishtank/Makefile
index cd3c3972e2cd..090547d8ea98 100644
--- a/x11/xfishtank/Makefile
+++ b/x11/xfishtank/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.uni-koeln.de/windows/xcontrib/
 MAINTAINER=	jacs@gnome.co.uk
 COMMENT=	Make fish swim in the background of your screen
 
+PLIST_FILES=	bin/xfishtank
 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/xfishtank2.0
 
diff --git a/x11/xfishtank/pkg-plist b/x11/xfishtank/pkg-plist
deleted file mode 100644
index 793cc679f5f3..000000000000
--- a/x11/xfishtank/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xfishtank
diff --git a/x11/xkbctrl/Makefile b/x11/xkbctrl/Makefile
index c9ba2c451c52..ee02c9c218f7 100644
--- a/x11/xkbctrl/Makefile
+++ b/x11/xkbctrl/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	sanpei@FreeBSD.org
 COMMENT=	Display and manipulate XKB keyboard controls from the commandline
 
 DIST_SUBDIR=	xkbctrl
+PLIST_FILES=	bin/xkbctrl
 USE_IMAKE=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/x11/xkbctrl/pkg-plist b/x11/xkbctrl/pkg-plist
deleted file mode 100644
index 77827be0c272..000000000000
--- a/x11/xkbctrl/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xkbctrl
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index e079f65568be..7275cd2d7005 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/Makefile
@@ -17,5 +17,6 @@ COMMENT=	Graphically display and edit the keyboard mapping
 
 USE_IMAKE=	yes
 MAN1=		xkeycaps.1
+PLIST_FILES=	bin/xkeycaps
 
 .include <bsd.port.mk>
diff --git a/x11/xkeycaps/pkg-plist b/x11/xkeycaps/pkg-plist
deleted file mode 100644
index b3c55bb9e9a9..000000000000
--- a/x11/xkeycaps/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xkeycaps
diff --git a/x11/xmotd/Makefile b/x11/xmotd/Makefile
index 50eb7a455e5f..825c4b392678 100644
--- a/x11/xmotd/Makefile
+++ b/x11/xmotd/Makefile
@@ -19,6 +19,7 @@ NO_INSTALL_MANPAGES=	yes
 XFREE86_HTML_MAN=	no
 
 MAN8=		xmotd.8
+PLIST_FILES=	bin/xmotd
 
 .if defined(USE_HTML)
 MAKE_ARGS+=	-DHAVE_HTML
diff --git a/x11/xmotd/pkg-plist b/x11/xmotd/pkg-plist
deleted file mode 100644
index 790539962770..000000000000
--- a/x11/xmotd/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xmotd
diff --git a/x11/xmsg/Makefile b/x11/xmsg/Makefile
index ca3e3122a534..e624c6f163b0 100644
--- a/x11/xmsg/Makefile
+++ b/x11/xmsg/Makefile
@@ -15,6 +15,7 @@ COMMENT=	The X11R4 version of xmessage updated for X11R5 and renamed
 
 MAN1=		xmsg.1
 MANCOMPRESSED=	yes
+PLIST_FILES=	bin/xmsg
 USE_IMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/xmsg/pkg-plist b/x11/xmsg/pkg-plist
deleted file mode 100644
index 013f066b374b..000000000000
--- a/x11/xmsg/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xmsg
diff --git a/x11/xmx/Makefile b/x11/xmx/Makefile
index f402345c9e5f..44dfe4e55e48 100644
--- a/x11/xmx/Makefile
+++ b/x11/xmx/Makefile
@@ -17,6 +17,7 @@ COMMENT=	An X protocol multiplexor
 USE_X_PREFIX=	yes
 
 MAN1=		xmx.1
+PLIST_FILES=	bin/xmx
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/xmx
diff --git a/x11/xmx/pkg-plist b/x11/xmx/pkg-plist
deleted file mode 100644
index b603772a3aa4..000000000000
--- a/x11/xmx/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xmx
diff --git a/x11/xnodecor/Makefile b/x11/xnodecor/Makefile
index 7837ae9e29f6..5599cec47c7a 100644
--- a/x11/xnodecor/Makefile
+++ b/x11/xnodecor/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	katsura@cc.osaka-kyoiku.ac.jp
 COMMENT=	Utility to set override_redirect in XWindowAttributes to True
 
 NO_WRKSUBDIR=	yes
+PLIST_FILES=	bin/xnodecor
 USE_X_PREFIX=	yes
 
 do-extract:
diff --git a/x11/xnodecor/pkg-plist b/x11/xnodecor/pkg-plist
deleted file mode 100644
index 4f5f18e94dbe..000000000000
--- a/x11/xnodecor/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xnodecor
diff --git a/x11/xprompt/Makefile b/x11/xprompt/Makefile
index 4467fa5d167b..60a425821807 100644
--- a/x11/xprompt/Makefile
+++ b/x11/xprompt/Makefile
@@ -18,5 +18,6 @@ USE_IMAKE=	yes
 
 MAN1=		xprompt.1
 MANCOMPRESSED=	yes
+PLIST_FILES=	bin/xprompt
 
 .include <bsd.port.mk>
diff --git a/x11/xprompt/pkg-plist b/x11/xprompt/pkg-plist
deleted file mode 100644
index ddb0010b0795..000000000000
--- a/x11/xprompt/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xprompt
diff --git a/x11/xrestop/Makefile b/x11/xrestop/Makefile
index 6b1ce0556931..49b9f5a1af0b 100644
--- a/x11/xrestop/Makefile
+++ b/x11/xrestop/Makefile
@@ -24,6 +24,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS=-I${X11BASE}/include \
 		LDFLAGS=-L${X11BASE}/lib
 
-MAN1=	xrestop.1
+MAN1=		xrestop.1
+PLIST_FILES=	bin/xrestop
 
 .include <bsd.port.mk>
diff --git a/x11/xrestop/pkg-plist b/x11/xrestop/pkg-plist
deleted file mode 100644
index 6ae1dbe36ca7..000000000000
--- a/x11/xrestop/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xrestop
diff --git a/x11/xrootconsole/Makefile b/x11/xrootconsole/Makefile
index 0748a9bc1a1b..06cbefed6c0d 100644
--- a/x11/xrootconsole/Makefile
+++ b/x11/xrootconsole/Makefile
@@ -22,6 +22,7 @@ CFLAGS+=	-I${X11BASE}/include
 USE_GMAKE=	yes
 
 MAN1=		xrootconsole.1
+PLIST_FILES=	bin/xrootconsole
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|^CC|#CC|g" \
diff --git a/x11/xrootconsole/pkg-plist b/x11/xrootconsole/pkg-plist
deleted file mode 100644
index a07463916785..000000000000
--- a/x11/xrootconsole/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xrootconsole
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index 921b19566bbd..200cea61d3dc 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Create a snowy and Santa-y desktop
 USE_IMAKE=	yes
 USE_XPM=	yes
 MAN6=		xsnow.6
+PLIST_FILES=	bin/xsnow
 
 pre-build:
 	@cd ${WRKSRC} && ${MV} Makefile Makefile~  && ${SED} \
diff --git a/x11/xsnow/pkg-plist b/x11/xsnow/pkg-plist
deleted file mode 100644
index ce9251522032..000000000000
--- a/x11/xsnow/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xsnow
diff --git a/x11/xstarroll/Makefile b/x11/xstarroll/Makefile
index 9be544ba9991..e5c60175eb4a 100644
--- a/x11/xstarroll/Makefile
+++ b/x11/xstarroll/Makefile
@@ -20,5 +20,6 @@ USE_XPM=	yes
 
 MAN1=		xstarroll.1
 MANCOMPRESSED=	yes
+PLIST_FILES=	bin/xstarroll
 
 .include <bsd.port.mk>
diff --git a/x11/xstarroll/pkg-plist b/x11/xstarroll/pkg-plist
deleted file mode 100644
index a1915918be90..000000000000
--- a/x11/xstarroll/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xstarroll
diff --git a/x11/xtacy/Makefile b/x11/xtacy/Makefile
index 11dd15ed8bdc..b41a83046935 100644
--- a/x11/xtacy/Makefile
+++ b/x11/xtacy/Makefile
@@ -18,6 +18,7 @@ COMMENT=	An X11 trippy color-cycling toy
 
 USE_IMAKE=	yes
 MAN1=		xtacy.1
+PLIST_FILES=	bin/xtacy
 
 WRKSRC=		${WRKDIR}/Xtacy
 
diff --git a/x11/xtacy/pkg-plist b/x11/xtacy/pkg-plist
deleted file mode 100644
index 55b035c8dca2..000000000000
--- a/x11/xtacy/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xtacy
diff --git a/x11/xtestpicture/Makefile b/x11/xtestpicture/Makefile
index 7524e4442066..747ae7c3bb26 100644
--- a/x11/xtestpicture/Makefile
+++ b/x11/xtestpicture/Makefile
@@ -15,5 +15,6 @@ COMMENT=	Create a full-screen image to adjust your monitor
 
 USE_IMAKE=	yes
 MAN1=		xtestpicture.1
+PLIST_FILES=	bin/xtestpicture
 
 .include <bsd.port.mk>
diff --git a/x11/xtestpicture/pkg-plist b/x11/xtestpicture/pkg-plist
deleted file mode 100644
index b157caac309f..000000000000
--- a/x11/xtestpicture/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xtestpicture
diff --git a/x11/xwit/Makefile b/x11/xwit/Makefile
index ae736da6a72b..9d9c7719eba1 100644
--- a/x11/xwit/Makefile
+++ b/x11/xwit/Makefile
@@ -15,5 +15,6 @@ COMMENT=	X interface tool
 
 USE_IMAKE=	yes
 MAN1=		xwit.1
+PLIST_FILES=	bin/xwit
 
 .include <bsd.port.mk>
diff --git a/x11/xwit/pkg-plist b/x11/xwit/pkg-plist
deleted file mode 100644
index 1440e17403a5..000000000000
--- a/x11/xwit/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xwit
diff --git a/x11/xzoom/Makefile b/x11/xzoom/Makefile
index ae6c4e35e8a8..ee14e2e46d70 100644
--- a/x11/xzoom/Makefile
+++ b/x11/xzoom/Makefile
@@ -17,5 +17,6 @@ COMMENT=	Magnify, rotate, mirror the image on the X screen
 
 USE_IMAKE=	yes
 MAN1=		xzoom.1
+PLIST_FILES=	bin/xzoom
 
 .include <bsd.port.mk>
diff --git a/x11/xzoom/pkg-plist b/x11/xzoom/pkg-plist
deleted file mode 100644
index eb52dec5b420..000000000000
--- a/x11/xzoom/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xzoom