114 files changed, 57 insertions, 58 deletions

diff --git a/audio/amp/Makefile b/audio/amp/Makefile
index ed52a9449f5a..0f885d9e4d4e 100644
--- a/audio/amp/Makefile
+++ b/audio/amp/Makefile
@@ -20,6 +20,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 MAN1=		amp.1
+PLIST_FILES=	bin/amp
 
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/amp ${PREFIX}/bin
diff --git a/audio/amp/pkg-plist b/audio/amp/pkg-plist
deleted file mode 100644
index 13c19e9d5c37..000000000000
--- a/audio/amp/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/amp
diff --git a/audio/ample/Makefile b/audio/ample/Makefile
index 056cf47e6a8f..0c14b530b653 100644
--- a/audio/ample/Makefile
+++ b/audio/ample/Makefile
@@ -19,5 +19,6 @@ GNU_CONFIGURE=	yes
 
 MAN1=		ample.1
 MAN5=		ample.conf.5 ample.html.5
+PLIST_FILES=	bin/ample
 
 .include <bsd.port.mk>
diff --git a/audio/ample/pkg-plist b/audio/ample/pkg-plist
deleted file mode 100644
index e5adcbeef210..000000000000
--- a/audio/ample/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/ample
diff --git a/audio/asmix/Makefile b/audio/asmix/Makefile
index cdc47c786af1..9350e77743de 100644
--- a/audio/asmix/Makefile
+++ b/audio/asmix/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	mtm@identd.net
 COMMENT=	Volume control dock-app for the AfterStep Window Manager
 
 MAN1=		${PORTNAME}.1x
+PLIST_FILES=	bin/asmix
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/audio/asmix/pkg-plist b/audio/asmix/pkg-plist
deleted file mode 100644
index d81b438eea64..000000000000
--- a/audio/asmix/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/asmix
diff --git a/audio/asmixer/Makefile b/audio/asmixer/Makefile
index 95000665a2f9..2c70c649af60 100644
--- a/audio/asmixer/Makefile
+++ b/audio/asmixer/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	mtm@identd.net
 COMMENT=	A mixer control for X, and specifically the AfterStep Window Manager
 
 MAN1=		${PORTNAME}.1x
+PLIST_FILES=	bin/asmixer
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/audio/asmixer/pkg-plist b/audio/asmixer/pkg-plist
deleted file mode 100644
index 6e4a0629195e..000000000000
--- a/audio/asmixer/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/asmixer
diff --git a/audio/bladeenc/Makefile b/audio/bladeenc/Makefile
index 0e0981c67724..d27cc363e8b0 100644
--- a/audio/bladeenc/Makefile
+++ b/audio/bladeenc/Makefile
@@ -16,5 +16,6 @@ MAINTAINER=	dirk@FreeBSD.org
 COMMENT=	MP3 encoder
 
 GNU_CONFIGURE=	yes
+PLIST_FILES=	bin/bladeenc
 
 .include <bsd.port.mk>
diff --git a/audio/bladeenc/pkg-plist b/audio/bladeenc/pkg-plist
deleted file mode 100644
index 90bc3c95364f..000000000000
--- a/audio/bladeenc/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/bladeenc
diff --git a/audio/cd-console/Makefile b/audio/cd-console/Makefile
index 6acc2ec55350..894ae9772529 100644
--- a/audio/cd-console/Makefile
+++ b/audio/cd-console/Makefile
@@ -13,5 +13,6 @@ MASTER_SITES=	http://www.cs.helsinki.fi/u/salerma/cd-console/ \
 
 MAINTAINER=	jdunn@aquezada.com
 COMMENT=	A curses-based console CD player
+PLIST_FILES=	bin/cd-console
 
 .include <bsd.port.mk>
diff --git a/audio/cd-console/pkg-plist b/audio/cd-console/pkg-plist
deleted file mode 100644
index 89ec796f8ba9..000000000000
--- a/audio/cd-console/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cd-console
diff --git a/audio/cd-discid/Makefile b/audio/cd-discid/Makefile
index e05b247efd68..cb201c94f979 100644
--- a/audio/cd-discid/Makefile
+++ b/audio/cd-discid/Makefile
@@ -19,5 +19,6 @@ WRKSRC=		${WRKDIR}/${PKGNAME}
 MAKE_ARGS=	prefix=${PREFIX} mandir=${PREFIX}/man/man1
 
 MAN1=	cd-discid.1
+PLIST_FILES=	bin/cd-discid
 
 .include <bsd.port.mk>
diff --git a/audio/cd-discid/pkg-plist b/audio/cd-discid/pkg-plist
deleted file mode 100644
index a92237e2d1f3..000000000000
--- a/audio/cd-discid/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cd-discid
diff --git a/audio/cdplay/Makefile b/audio/cdplay/Makefile
index 662f30106d34..98f3dbe07aac 100644
--- a/audio/cdplay/Makefile
+++ b/audio/cdplay/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	anttik@iki.fi
 COMMENT=	CD-player with text-based user interface
 
 MAN1=		cdplay.1
+PLIST_FILES=	bin/cdplay
 
 pre-patch:
 	@${GUNZIP_CMD} ${WRKSRC}/cdplay.1.gz
diff --git a/audio/cdplay/pkg-plist b/audio/cdplay/pkg-plist
deleted file mode 100644
index a29722e60e2b..000000000000
--- a/audio/cdplay/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cdplay
diff --git a/audio/cue2toc/Makefile b/audio/cue2toc/Makefile
index 59a47e07f654..28f3083bc60c 100644
--- a/audio/cue2toc/Makefile
+++ b/audio/cue2toc/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Perl script that converts CUE files into TOC files for cdrdao
 RUN_DEPENDS=	${SITE_PERL}/Audio/Wav.pm:${PORTSDIR}/audio/p5-Audio-Wav
 
 NO_BUILD=	yes
+PLIST_FILES=	bin/cue2toc
 USE_REINPLACE=	yes
 
 pre-patch:
diff --git a/audio/cue2toc/pkg-plist b/audio/cue2toc/pkg-plist
deleted file mode 100644
index c1b0bfd4c5e4..000000000000
--- a/audio/cue2toc/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cue2toc
diff --git a/audio/dagrab/Makefile b/audio/dagrab/Makefile
index cfb174f6272c..fcded9520315 100644
--- a/audio/dagrab/Makefile
+++ b/audio/dagrab/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	clkao@CirX.ORG
 COMMENT=	Read audio tracks from a CD into wav sound files
 
 MAN1=		dagrab.1
+PLIST_FILES=	bin/dagrab
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dagrab ${PREFIX}/bin
diff --git a/audio/dagrab/pkg-plist b/audio/dagrab/pkg-plist
deleted file mode 100644
index da06db0a628f..000000000000
--- a/audio/dagrab/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/dagrab
diff --git a/audio/dekagen/Makefile b/audio/dekagen/Makefile
index 7b48acfa7865..ce5adfd76048 100644
--- a/audio/dekagen/Makefile
+++ b/audio/dekagen/Makefile
@@ -32,6 +32,7 @@ RUN_DEPENDS+=	cdparanoia:${PORTSDIR}/audio/cdparanoia
 
 MAN1=		dekagen.1
 MANCOMPRESSED=	yes
+PLIST_FILES=	bin/dekagen
 
 .include <bsd.port.pre.mk>
 
diff --git a/audio/dekagen/pkg-plist b/audio/dekagen/pkg-plist
deleted file mode 100644
index a3fac2fb3d27..000000000000
--- a/audio/dekagen/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/dekagen
diff --git a/audio/discid/Makefile b/audio/discid/Makefile
index 97ecea935809..5a77063acb60 100644
--- a/audio/discid/Makefile
+++ b/audio/discid/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	${PORTNAME}-freebsd-${PORTVERSION}
 MAINTAINER=	ob@breuninger.org
 COMMENT=	Identify audio cd in your drive
 
+PLIST_FILES=	bin/discid
 WRKSRC=		${WRKDIR}/freebsd
 
 MAKE_ARGS=	discid
diff --git a/audio/discid/pkg-plist b/audio/discid/pkg-plist
deleted file mode 100644
index 4217721f0d51..000000000000
--- a/audio/discid/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/discid
diff --git a/audio/gkrellmms/Makefile b/audio/gkrellmms/Makefile
index 65f005f824ad..d4384df64d81 100644
--- a/audio/gkrellmms/Makefile
+++ b/audio/gkrellmms/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+PLIST_FILES=	libexec/gkrellm/plugins/gkrellmms.so
 USE_X_PREFIX=	yes
 USE_GNOME=	imlib
 
diff --git a/audio/gkrellmms/pkg-plist b/audio/gkrellmms/pkg-plist
deleted file mode 100644
index a3ae719f2e8d..000000000000
--- a/audio/gkrellmms/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-libexec/gkrellm/plugins/gkrellmms.so
diff --git a/audio/gkrellmvolume/Makefile b/audio/gkrellmvolume/Makefile
index 311c35e3ec73..2d85cee46aca 100644
--- a/audio/gkrellmvolume/Makefile
+++ b/audio/gkrellmvolume/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 WRKSRC=		${WRKDIR}/volume
 
+PLIST_FILES=	libexec/gkrellm/plugins/volume.so
 USE_X_PREFIX=	yes
 USE_GNOME=	imlib
 
diff --git a/audio/gkrellmvolume/pkg-plist b/audio/gkrellmvolume/pkg-plist
deleted file mode 100644
index df108a97623d..000000000000
--- a/audio/gkrellmvolume/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-libexec/gkrellm/plugins/volume.so
diff --git a/audio/gogo-petit/Makefile b/audio/gogo-petit/Makefile
index d9b6e77e33a4..0e15e47d7273 100644
--- a/audio/gogo-petit/Makefile
+++ b/audio/gogo-petit/Makefile
@@ -28,5 +28,6 @@ CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=	LIBS="${PTHREAD_LIBS}"
 
 ONLY_FOR_ARCHS=	i386
+PLIST_FILES=	bin/gogo-petit
 
 .include <bsd.port.mk>
diff --git a/audio/gogo-petit/pkg-plist b/audio/gogo-petit/pkg-plist
deleted file mode 100644
index b320cca44f38..000000000000
--- a/audio/gogo-petit/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/gogo-petit
diff --git a/audio/holyshout/Makefile b/audio/holyshout/Makefile
index c188066b433c..fe8f2649ff93 100644
--- a/audio/holyshout/Makefile
+++ b/audio/holyshout/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Streaming audio to Icecast/shoutcast supports multiple bitrate stream
 
 LIB_DEPENDS=	shout.2:${PORTSDIR}/audio/libshout
 
+PLIST_FILES=	bin/holyshout
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/audio/holyshout/pkg-plist b/audio/holyshout/pkg-plist
deleted file mode 100644
index d9553751d44f..000000000000
--- a/audio/holyshout/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/holyshout
diff --git a/audio/id3ren/Makefile b/audio/id3ren/Makefile
index c9aef2258981..978e608c9168 100644
--- a/audio/id3ren/Makefile
+++ b/audio/id3ren/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	id3ren97a
 MAINTAINER=	jonny@jonny.eng.br
 COMMENT=	Mpeg Audio Layer 3 util: rename files, edit tags, search, etc
 
+PLIST_FILES=	bin/id3ren
 USE_ZIP=	yes
 USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/id3ren/src
diff --git a/audio/id3ren/pkg-plist b/audio/id3ren/pkg-plist
deleted file mode 100644
index 95a80e3abe23..000000000000
--- a/audio/id3ren/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/id3ren
diff --git a/audio/id3tool/Makefile b/audio/id3tool/Makefile
index d4e865fe5055..5652bd62511e 100644
--- a/audio/id3tool/Makefile
+++ b/audio/id3tool/Makefile
@@ -15,5 +15,6 @@ COMMENT=	A utility for manipulating mp3 ID3 Tags
 
 GNU_CONFIGURE=	yes
 MAN1=		id3tool.1
+PLIST_FILES=	bin/id3tool
 
 .include <bsd.port.mk>
diff --git a/audio/id3tool/pkg-plist b/audio/id3tool/pkg-plist
deleted file mode 100644
index b5c6286861b2..000000000000
--- a/audio/id3tool/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/id3tool
diff --git a/audio/id3v2/Makefile b/audio/id3v2/Makefile
index f6c61050cba0..fbfa2d6638b7 100644
--- a/audio/id3v2/Makefile
+++ b/audio/id3v2/Makefile
@@ -24,6 +24,7 @@ CFLAGS+=	${CPPFLAGS}
 MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 
 MAN1=		id3v2.1
+PLIST_FILES=	bin/id3v2
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/id3v2 ${PREFIX}/bin
diff --git a/audio/id3v2/pkg-plist b/audio/id3v2/pkg-plist
deleted file mode 100644
index a4b118d0b2f4..000000000000
--- a/audio/id3v2/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/id3v2
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index 82e097aa51b2..b5e0eaefbaaf 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -24,5 +24,6 @@ CONFIGURE_ARGS+=	--enable-color-interface
 .endif
 
 MAN1=		mikmod.1
+PLIST_FILES=	bin/mikmod
 
 .include <bsd.port.mk>
diff --git a/audio/mikmod/pkg-plist b/audio/mikmod/pkg-plist
deleted file mode 100644
index 17e6148471cc..000000000000
--- a/audio/mikmod/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/mikmod
diff --git a/audio/mp3_check/Makefile b/audio/mp3_check/Makefile
index 6438aa7333c0..a94e2fb1382d 100644
--- a/audio/mp3_check/Makefile
+++ b/audio/mp3_check/Makefile
@@ -18,5 +18,6 @@ COMMENT=	Verifies the integrity of mp3 audio files
 USE_GETOPT_LONG=yes
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
+PLIST_FILES=	bin/mp3_check
 
 .include <bsd.port.mk>
diff --git a/audio/mp3_check/pkg-plist b/audio/mp3_check/pkg-plist
deleted file mode 100644
index 561c840da206..000000000000
--- a/audio/mp3_check/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/mp3_check
diff --git a/audio/mp3check/Makefile b/audio/mp3check/Makefile
index 5cdc72b43147..b254eab7b760 100644
--- a/audio/mp3check/Makefile
+++ b/audio/mp3check/Makefile
@@ -24,6 +24,7 @@ EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	${WRKSRC}
 NO_BUILD=	yes
+PLIST_FILES=	bin/mp3check
 
 pre-patch:
 	${REINPLACE_CMD} -E "s|^#!.+|#!${PERL}|" ${WRKSRC}/${DISTNAME}
diff --git a/audio/mp3check/pkg-plist b/audio/mp3check/pkg-plist
deleted file mode 100644
index 496b2e3e0343..000000000000
--- a/audio/mp3check/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/mp3check
diff --git a/audio/mp3ck/Makefile b/audio/mp3ck/Makefile
index da656ed9bd66..dd0235072d6a 100644
--- a/audio/mp3ck/Makefile
+++ b/audio/mp3ck/Makefile
@@ -15,5 +15,6 @@ MAINTAINER=	yar@FreeBSD.org
 COMMENT=	A consistency check utility for MPEG Layer 2 or 3 files or streams
 
 MAN1=		mp3ck.1
+PLIST_FILES=	bin/mp3ck
 
 .include <bsd.port.mk>
diff --git a/audio/mp3ck/pkg-plist b/audio/mp3ck/pkg-plist
deleted file mode 100644
index cfd0d9a15035..000000000000
--- a/audio/mp3ck/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/mp3ck
diff --git a/audio/mp3gain/Makefile b/audio/mp3gain/Makefile
index 992d5b9b507a..b60ee3437623 100644
--- a/audio/mp3gain/Makefile
+++ b/audio/mp3gain/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION:C/\.//g}_src${EXTSUFFIX}
 MAINTAINER=	corecode@corecode.ath.cx
 COMMENT=	A tool to normalize the gain of mp3 files
 
+PLIST_FILES=	bin/mp3gain
 USE_REINPLACE=	yes
 USE_ZIP=	yes
 
diff --git a/audio/mp3gain/pkg-plist b/audio/mp3gain/pkg-plist
deleted file mode 100644
index d6b7de0c350d..000000000000
--- a/audio/mp3gain/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/mp3gain
diff --git a/audio/mp3riot/Makefile b/audio/mp3riot/Makefile
index db27da76d829..180f145727f0 100644
--- a/audio/mp3riot/Makefile
+++ b/audio/mp3riot/Makefile
@@ -20,6 +20,7 @@ USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 
 PORTDOCS=	example.unix groupfile CHANGELOG MANUAL mp3table.sql README repl.dat TODO utf.dat
+PLIST_FILES=	bin/mp3riot
 
 .include <bsd.port.pre.mk>
 
diff --git a/audio/mp3riot/pkg-plist b/audio/mp3riot/pkg-plist
deleted file mode 100644
index 16443aea5d8a..000000000000
--- a/audio/mp3riot/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/mp3riot
diff --git a/audio/mppdec/Makefile b/audio/mppdec/Makefile
index 069ea8e4b882..a353a800306e 100644
--- a/audio/mppdec/Makefile
+++ b/audio/mppdec/Makefile
@@ -18,6 +18,7 @@ COMMENT=	Command-line player/decoder for musepack audio
 LIB_DEPENDS=	esd.2:${PORTSDIR}/audio/esound
 
 MAKEFILE=	Makefile.bsd
+PLIST_FILES=	bin/mppdec
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 
diff --git a/audio/mppdec/pkg-plist b/audio/mppdec/pkg-plist
deleted file mode 100644
index 0db411b31de4..000000000000
--- a/audio/mppdec/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/mppdec
diff --git a/audio/nosefart/Makefile b/audio/nosefart/Makefile
index 86fa3e88f493..964d07c06b65 100644
--- a/audio/nosefart/Makefile
+++ b/audio/nosefart/Makefile
@@ -22,6 +22,7 @@ USE_GMAKE=	yes
 MAKE_ENV=	INSTALL="${INSTALL}" COPY="${COPY}" STRIP="${STRIP}"\
 		BINGRP="${BINGRP}" BINMODE="${BINMODE}" BINOWN="${BINOWN}"\
 		LDFLAGS="${LDFLAGS}"
+PLIST_FILES=	bin/nosefart
 
 post-extract:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} clean)
diff --git a/audio/nosefart/pkg-plist b/audio/nosefart/pkg-plist
deleted file mode 100644
index 9a1e2c82811d..000000000000
--- a/audio/nosefart/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/nosefart
diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile
index bd2350d70a3e..31424396521e 100644
--- a/audio/py-ao/Makefile
+++ b/audio/py-ao/Makefile
@@ -17,6 +17,7 @@ COMMENT=	A python wrapper for ao, an audio device abstraction library
 
 LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao
 
+PLIST_FILES=	lib/%%PYTHON_VERSION%%/site-packages/aomodule.so
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 
diff --git a/audio/py-ao/pkg-plist b/audio/py-ao/pkg-plist
deleted file mode 100644
index d56e328ee4a9..000000000000
--- a/audio/py-ao/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/%%PYTHON_VERSION%%/site-packages/aomodule.so
diff --git a/audio/py-mad/Makefile b/audio/py-mad/Makefile
index dd059b9a6a95..95a125291d73 100644
--- a/audio/py-mad/Makefile
+++ b/audio/py-mad/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Python module that provides the MPEG Audio Decoder interface
 
 LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/mad
 
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/madmodule.so
 USE_REINPLACE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/audio/py-mad/pkg-plist b/audio/py-mad/pkg-plist
deleted file mode 100644
index 4ca08c48426b..000000000000
--- a/audio/py-mad/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%PYTHON_SITELIBDIR%%/madmodule.so
diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
index 3fc4d555fbf0..5d671a595046 100644
--- a/audio/py-vorbis/Makefile
+++ b/audio/py-vorbis/Makefile
@@ -20,6 +20,7 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:${PORTSDIR}/audio/py-ogg
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:${PORTSDIR}/audio/py-ogg
 LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
 
+PLIST_FILES=	lib/%%PYTHON_VERSION%%/site-packages/ogg/vorbis.so
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 
diff --git a/audio/py-vorbis/pkg-plist b/audio/py-vorbis/pkg-plist
deleted file mode 100644
index 1f4f0ab2d033..000000000000
--- a/audio/py-vorbis/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/%%PYTHON_VERSION%%/site-packages/ogg/vorbis.so
diff --git a/audio/rat30/Makefile b/audio/rat30/Makefile
index aed9a8c04e4b..dcde95806395 100644
--- a/audio/rat30/Makefile
+++ b/audio/rat30/Makefile
@@ -21,6 +21,7 @@ WRKSRC=		${WRKDIR}/rat-3.0
 USE_GMAKE=	yes
 MAN1=		rat.1
 MANCOMPRESSED=	no
+PLIST_FILES=	bin/rat30
 
 LATEST_LINK=	rat30
 
diff --git a/audio/rat30/pkg-plist b/audio/rat30/pkg-plist
deleted file mode 100644
index 4640490366a7..000000000000
--- a/audio/rat30/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/rat30
diff --git a/audio/rexima/Makefile b/audio/rexima/Makefile
index 335c1a34eef5..7c7beb3181c4 100644
--- a/audio/rexima/Makefile
+++ b/audio/rexima/Makefile
@@ -21,5 +21,6 @@ LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
 .endif
 
 MAN1=	rexima.1
+PLIST_FILES=	bin/rexima
 
 .include <bsd.port.post.mk>
diff --git a/audio/rexima/pkg-plist b/audio/rexima/pkg-plist
deleted file mode 100644
index f292465077c4..000000000000
--- a/audio/rexima/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/rexima
diff --git a/audio/ripenc/Makefile b/audio/ripenc/Makefile
index 1aad6b185b69..0ac6811d3bce 100644
--- a/audio/ripenc/Makefile
+++ b/audio/ripenc/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Script that automates the ripping, encoding, and naming of CD's
 WRKSRC=		${WRKDIR}/ripenc
 
 NO_BUILD=	Shell Script
+PLIST_FILES=	bin/ripenc
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/ripenc ${PREFIX}/bin
diff --git a/audio/ripenc/pkg-plist b/audio/ripenc/pkg-plist
deleted file mode 100644
index 81b6b5f39bb1..000000000000
--- a/audio/ripenc/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/ripenc
diff --git a/audio/ripit/Makefile b/audio/ripit/Makefile
index da3243980fbd..9ea733dbe2ea 100644
--- a/audio/ripit/Makefile
+++ b/audio/ripit/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 RUN_DEPENDS+=	dagrab:${PORTSDIR}/audio/dagrab
 
 NO_BUILD=	yes
+PLIST_FILES=	bin/ripit.pl
 USE_PERL5=	yes
 
 post-patch:
diff --git a/audio/ripit/pkg-plist b/audio/ripit/pkg-plist
deleted file mode 100644
index cd38f19aa1f6..000000000000
--- a/audio/ripit/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/ripit.pl
diff --git a/audio/s3mod/Makefile b/audio/s3mod/Makefile
index cb13b4185164..52dfd469b4ca 100644
--- a/audio/s3mod/Makefile
+++ b/audio/s3mod/Makefile
@@ -17,6 +17,7 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	MOD/S3M player
 
 ALL_TARGET=	freebsd
+PLIST_FILES=	bin/s3mod
 
 pre-patch:
 	@${CP} ${WRKSRC}/DspDrivers/linux_dsp.c ${WRKSRC}/dsp.c
diff --git a/audio/s3mod/pkg-plist b/audio/s3mod/pkg-plist
deleted file mode 100644
index f352230b12ae..000000000000
--- a/audio/s3mod/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/s3mod
diff --git a/audio/shorten/Makefile b/audio/shorten/Makefile
index 515f26618899..e9ded29bee4e 100644
--- a/audio/shorten/Makefile
+++ b/audio/shorten/Makefile
@@ -18,5 +18,6 @@ RESTRICTED=	"May not be sold, may not be used commercially."
 GNU_CONFIGURE=	yes
 
 MAN1=		shorten.1
+PLIST_FILES=	bin/shorten
 
 .include <bsd.port.mk>
diff --git a/audio/shorten/pkg-plist b/audio/shorten/pkg-plist
deleted file mode 100644
index b13b3d8906c7..000000000000
--- a/audio/shorten/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/shorten
diff --git a/audio/simplemod/Makefile b/audio/simplemod/Makefile
index 7f8ecc8592fb..61be4e4e3ae0 100644
--- a/audio/simplemod/Makefile
+++ b/audio/simplemod/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS=	mikmod.2:${PORTSDIR}/audio/libmikmod
 WRKSRC=		${WRKDIR}/simplemod
 
 ALL_TARGET=	simplemod
+PLIST_FILES=	bin/simplemod
 
 do-install:
 	${INSTALL} -o 0 -g 0 -s ${WRKSRC}/simplemod ${PREFIX}/bin
diff --git a/audio/simplemod/pkg-plist b/audio/simplemod/pkg-plist
deleted file mode 100644
index ba6533231b0a..000000000000
--- a/audio/simplemod/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/simplemod
diff --git a/audio/splay/Makefile b/audio/splay/Makefile
index cec9f2625ad4..42d89ab1e06e 100644
--- a/audio/splay/Makefile
+++ b/audio/splay/Makefile
@@ -17,5 +17,6 @@ COMMENT=	An audio player that decodes MPEG Layer I,II,III and WAV files
 
 GNU_CONFIGURE=		yes
 MAN1=			splay.1
+PLIST_FILES=		bin/splay
 
 .include <bsd.port.mk>
diff --git a/audio/splay/pkg-plist b/audio/splay/pkg-plist
deleted file mode 100644
index df1c853561db..000000000000
--- a/audio/splay/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/splay
diff --git a/audio/streamtuner-live365/Makefile b/audio/streamtuner-live365/Makefile
index e911616b454d..db32ae2cd41d 100644
--- a/audio/streamtuner-live365/Makefile
+++ b/audio/streamtuner-live365/Makefile
@@ -18,6 +18,7 @@ COMMENT=		A Live365 plugin for streamtuner
 BUILD_DEPENDS=		${X11BASE}/include/streamtuner/streamtuner.h:${PORTSDIR}/audio/streamtuner
 RUN_DEPENDS=		${X11BASE}/bin/streamtuner:${PORTSDIR}/audio/streamtuner
 
+PLIST_FILES=		lib/streamtuner/plugins/live365.so
 USE_X_PREFIX=		yes
 USE_LIBTOOL_VER=	15
 
diff --git a/audio/streamtuner-live365/pkg-plist b/audio/streamtuner-live365/pkg-plist
deleted file mode 100644
index 1ecf59f1bb60..000000000000
--- a/audio/streamtuner-live365/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/streamtuner/plugins/live365.so
-share/locale/fr/LC_MESSAGES/streamtuner-live365.mo
diff --git a/audio/timidity++-slang/Makefile b/audio/timidity++-slang/Makefile
index e3b4aca5ef20..2a190932bc2f 100644
--- a/audio/timidity++-slang/Makefile
+++ b/audio/timidity++-slang/Makefile
@@ -11,5 +11,6 @@ MAINTAINER=	yatt@luna2.org
 COMMENT=	Slang interface for TiMidity++
 
 MASTERDIR=	${.CURDIR}/../../audio/timidity++-emacs
+PLIST_FILES=	lib/timidity/interface_s.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/timidity++-slang/pkg-plist b/audio/timidity++-slang/pkg-plist
deleted file mode 100644
index a4026b981176..000000000000
--- a/audio/timidity++-slang/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/timidity/interface_s.so
diff --git a/audio/vat/Makefile b/audio/vat/Makefile
index 695d82b006d2..2921e30dbbf5 100644
--- a/audio/vat/Makefile
+++ b/audio/vat/Makefile
@@ -30,6 +30,7 @@ USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--with-gsm=${GSM_WORK}
 INSTALL_TARGET=	install install-man
 MAN1=		vat.1
+PLIST_FILES=	bin/vat
 
 .include <bsd.port.pre.mk>
 
diff --git a/audio/vat/pkg-plist b/audio/vat/pkg-plist
deleted file mode 100644
index 6a553559bfde..000000000000
--- a/audio/vat/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/vat
diff --git a/audio/waveplay/Makefile b/audio/waveplay/Makefile
index 8d781e790aa3..0c9e20b8de9e 100644
--- a/audio/waveplay/Makefile
+++ b/audio/waveplay/Makefile
@@ -17,6 +17,7 @@ COMMENT=	A simple wav file player
 MAN1=			waveplay.1
 MANLANG=		"" ja
 ONLY_FOR_ARCHS=		i386
+PLIST_FILES=		bin/waveplay
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/waveplay ${PREFIX}/bin/waveplay
diff --git a/audio/waveplay/pkg-plist b/audio/waveplay/pkg-plist
deleted file mode 100644
index 2593cfd76cad..000000000000
--- a/audio/waveplay/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/waveplay
diff --git a/audio/wmmixer/Makefile b/audio/wmmixer/Makefile
index 8b4f35d66314..c9c5ccb699e2 100644
--- a/audio/wmmixer/Makefile
+++ b/audio/wmmixer/Makefile
@@ -15,6 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	rneswold@enteract.com
 COMMENT=	An audio mixer for the WindowMaker dock
 
+PLIST_FILES=		bin/wmmixer
 WRKSRC=			${WRKDIR}/wmmixer
 USE_IMAKE=		yes
 USE_XPM=		yes
diff --git a/audio/wmmixer/pkg-plist b/audio/wmmixer/pkg-plist
deleted file mode 100644
index d4a0c424a334..000000000000
--- a/audio/wmmixer/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/wmmixer
diff --git a/audio/xmms-audiofile/Makefile b/audio/xmms-audiofile/Makefile
index 28f67ad96c45..143e1f031010 100644
--- a/audio/xmms-audiofile/Makefile
+++ b/audio/xmms-audiofile/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
+PLIST_FILES=	lib/xmms/Input/libaf.so
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
diff --git a/audio/xmms-audiofile/pkg-plist b/audio/xmms-audiofile/pkg-plist
deleted file mode 100644
index 3071b4827afc..000000000000
--- a/audio/xmms-audiofile/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/xmms/Input/libaf.so
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index d256568d721b..0161fd9e9b7e 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -30,6 +30,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}/plugins/xmms
 
 DESCR=		${PORTSDIR}/audio/faad/pkg-descr
 MD5_FILE=	${PORTSDIR}/audio/faad/distinfo
+PLIST_FILES=	lib/xmms/Input/libaac-XMMS.so
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/audio/xmms-faad/pkg-plist b/audio/xmms-faad/pkg-plist
deleted file mode 100644
index ea86a79606d8..000000000000
--- a/audio/xmms-faad/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/xmms/Input/libaac-XMMS.so
diff --git a/audio/xmms-fc/Makefile b/audio/xmms-fc/Makefile
index ee65ec8743da..ce8f4a771c10 100644
--- a/audio/xmms-fc/Makefile
+++ b/audio/xmms-fc/Makefile
@@ -18,6 +18,7 @@ COMMENT=	A XMMS future composer input plugin
 BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
+PLIST_FILES=	lib/xmms/Input/libfc.so
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
diff --git a/audio/xmms-fc/pkg-plist b/audio/xmms-fc/pkg-plist
deleted file mode 100644
index c8264ff491cb..000000000000
--- a/audio/xmms-fc/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/xmms/Input/libfc.so
diff --git a/audio/xmms-infopipe/Makefile b/audio/xmms-infopipe/Makefile
index 6922f0b55278..d3cdb042317e 100644
--- a/audio/xmms-infopipe/Makefile
+++ b/audio/xmms-infopipe/Makefile
@@ -27,6 +27,7 @@ SRCLIBDIR?=	src/.libs
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%X11BASE%%/lib/xmms/General
+PLIST_FILES=	lib/xmms/General/libinfopipe.so
 
 do-install:
 	cd ${WRKSRC}/${SRCLIBDIR};\
diff --git a/audio/xmms-infopipe/pkg-plist b/audio/xmms-infopipe/pkg-plist
deleted file mode 100644
index cabea48c1ebb..000000000000
--- a/audio/xmms-infopipe/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/xmms/General/libinfopipe.so
diff --git a/audio/xmms-ladspa/Makefile b/audio/xmms-ladspa/Makefile
index 24129217729d..2afecc004f28 100644
--- a/audio/xmms-ladspa/Makefile
+++ b/audio/xmms-ladspa/Makefile
@@ -16,6 +16,7 @@ COMMENT=	"XMMS Plugin that provides LADSPA Plugins to XMMS"
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+PLIST_FILES=	lib/xmms/Effect/ladspa.so
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
diff --git a/audio/xmms-ladspa/pkg-plist b/audio/xmms-ladspa/pkg-plist
deleted file mode 100644
index 725aa16c2d75..000000000000
--- a/audio/xmms-ladspa/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/xmms/Effect/ladspa.so
diff --git a/audio/xmms-liveice/Makefile b/audio/xmms-liveice/Makefile
index 92f46ef4af56..174c5ca550e9 100644
--- a/audio/xmms-liveice/Makefile
+++ b/audio/xmms-liveice/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
 
 WRKSRC=		${WRKDIR}/LiveIce-1.0.0
 
+PLIST_FILES=	lib/xmms/Effect/libliveice.so
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
diff --git a/audio/xmms-liveice/pkg-plist b/audio/xmms-liveice/pkg-plist
deleted file mode 100644
index 3c21a55ec613..000000000000
--- a/audio/xmms-liveice/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/xmms/Effect/libliveice.so
diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile
index b313e7994be0..70eaf2747449 100644
--- a/audio/xmms-mad/Makefile
+++ b/audio/xmms-mad/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/mad
 BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
+PLIST_FILES=	lib/xmms/Input/libxmmsmad.so
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
diff --git a/audio/xmms-mad/pkg-plist b/audio/xmms-mad/pkg-plist
deleted file mode 100644
index 1823049bd446..000000000000
--- a/audio/xmms-mad/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/xmms/Input/libxmmsmad.so
diff --git a/audio/xmms-musepack/Makefile b/audio/xmms-musepack/Makefile
index 972826b7baf4..e98038c4a430 100644
--- a/audio/xmms-musepack/Makefile
+++ b/audio/xmms-musepack/Makefile
@@ -16,6 +16,7 @@ COMMENT=	XMMS input plugin for playing MPC Musepack (.mpc, .mp+) files
 
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
+PLIST_FILES=	lib/xmms/Input/xmms-mpegplus-1.8.0.so
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
diff --git a/audio/xmms-musepack/pkg-plist b/audio/xmms-musepack/pkg-plist
deleted file mode 100644
index 1d772041811c..000000000000
--- a/audio/xmms-musepack/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/xmms/Input/xmms-mpegplus-1.8.0.so
diff --git a/audio/xmms-quix3dn/Makefile b/audio/xmms-quix3dn/Makefile
index 7a8ec59c06a6..35ab481e9382 100644
--- a/audio/xmms-quix3dn/Makefile
+++ b/audio/xmms-quix3dn/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
+PLIST_FILES=	lib/xmms/Effect/libquix3dn.so
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libquix3dn.so ${PREFIX}/lib/xmms/Effect/
diff --git a/audio/xmms-quix3dn/pkg-plist b/audio/xmms-quix3dn/pkg-plist
deleted file mode 100644
index ee1b2f75f4b8..000000000000
--- a/audio/xmms-quix3dn/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/xmms/Effect/libquix3dn.so
diff --git a/audio/xmms-sid/Makefile b/audio/xmms-sid/Makefile
index 57777ddef985..601be9f9cb9d 100644
--- a/audio/xmms-sid/Makefile
+++ b/audio/xmms-sid/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS=	sidplay.1:${PORTSDIR}/audio/libsidplay
 BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
+PLIST_FILES=	lib/xmms/Input/libsid.so
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
diff --git a/audio/xmms-sid/pkg-plist b/audio/xmms-sid/pkg-plist
deleted file mode 100644
index 934884896d36..000000000000
--- a/audio/xmms-sid/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/xmms/Input/libsid.so
diff --git a/audio/xmms-sndfile/Makefile b/audio/xmms-sndfile/Makefile
index b022937e2b3e..ac77d2c18823 100644
--- a/audio/xmms-sndfile/Makefile
+++ b/audio/xmms-sndfile/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
 
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 
+PLIST_FILES=	lib/xmms/Input/libxmms_sndfile.so
 USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_X_PREFIX=	yes
diff --git a/audio/xmms-sndfile/pkg-plist b/audio/xmms-sndfile/pkg-plist
deleted file mode 100644
index d126acc223ca..000000000000
--- a/audio/xmms-sndfile/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/xmms/Input/libxmms_sndfile.so
diff --git a/audio/xmms-speex/Makefile b/audio/xmms-speex/Makefile
index 5ee620de1155..6e60279a3587 100644
--- a/audio/xmms-speex/Makefile
+++ b/audio/xmms-speex/Makefile
@@ -19,6 +19,7 @@ BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 LIB_DEPENDS=	speex.2:${PORTSDIR}/audio/speex
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
+PLIST_FILES=	lib/xmms/Input/libspeex.so
 WRKSRC=		${WRKDIR}/speex-xmms
 
 USE_X_PREFIX=	yes
diff --git a/audio/xmms-speex/pkg-plist b/audio/xmms-speex/pkg-plist
deleted file mode 100644
index af8cf8f4cf44..000000000000
--- a/audio/xmms-speex/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/xmms/Input/libspeex.so
diff --git a/audio/xmms-volnorm/Makefile b/audio/xmms-volnorm/Makefile
index b9b730179004..eedf8f7f25b4 100644
--- a/audio/xmms-volnorm/Makefile
+++ b/audio/xmms-volnorm/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Volume Normalizer plugin for XMMS
 
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
+PLIST_FILES=	lib/xmms/Effect/libnormvol.so
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
diff --git a/audio/xmms-volnorm/pkg-plist b/audio/xmms-volnorm/pkg-plist
deleted file mode 100644
index 87b88377f208..000000000000
--- a/audio/xmms-volnorm/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/xmms/Effect/libnormvol.so
diff --git a/audio/xtuner/Makefile b/audio/xtuner/Makefile
index db7c74aff81e..ab8d017a66b6 100644
--- a/audio/xtuner/Makefile
+++ b/audio/xtuner/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Xwindows interface for the RadioREVEAL and RadioTrack FM radio cards!
 
 LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
 
+PLIST_FILES=	bin/xtuner
 USE_IMAKE=	YES
 USE_XPM=	YES
 
diff --git a/audio/xtuner/pkg-plist b/audio/xtuner/pkg-plist
deleted file mode 100644
index 94656a5c78c7..000000000000
--- a/audio/xtuner/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xtuner