9 files changed, 22 insertions, 37 deletions

diff --git a/audio/xmms-bonk/Makefile b/audio/xmms-bonk/Makefile
index e561e148ef6c..8e3e60b02a96 100644
--- a/audio/xmms-bonk/Makefile
+++ b/audio/xmms-bonk/Makefile
@@ -10,12 +10,14 @@ DISTNAME=	bonk-xmms-${PORTVERSION}
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	XMMS input plugin to play bonk files
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
-NO_STAGE=	yes
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
 ALL_TARGET=
 
+PLIST_FILES=	lib/xmms/Input/libbonk.so
+
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/libbonk.so ${PREFIX}/lib/xmms/Input
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/Input
+	${INSTALL_DATA} ${WRKSRC}/libbonk.so ${STAGEDIR}${PREFIX}/lib/xmms/Input
 
 .include <bsd.port.mk>
diff --git a/audio/xmms-bonk/pkg-plist b/audio/xmms-bonk/pkg-plist
deleted file mode 100644
index 54a15467f7bf..000000000000
--- a/audio/xmms-bonk/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $FreeBSD$
-lib/xmms/Input/libbonk.so
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index 8d23c5e88c64..d1dfc8eac819 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -9,13 +9,12 @@ DISTNAME=	flac-${PORTVERSION}
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	XMMS input plugin for playing FLAC files
 
-LIB_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms \
-		FLAC:${PORTSDIR}/audio/flac \
-		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
-		ogg:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms \
+		libFLAC.so:${PORTSDIR}/audio/flac \
+		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
+		libogg.so:${PORTSDIR}/audio/libogg
 
 USES=		gettext iconv
-NO_STAGE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk12
 USE_XORG=	x11 xau xcb xdmcp xext xi
@@ -28,8 +27,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS=	LIBTOOL="${LIBTOOL} --tag=disable-static"
 MAKEFILE=	${FILESDIR}/Makefile
 
-# XXX
-post-install:
-	${RM} ${PREFIX}/lib/xmms/Input/libxmms-flac.la
+PLIST_FILES=	lib/xmms/Input/libxmms-flac.so
 
 .include <bsd.port.mk>
diff --git a/audio/xmms-flac/pkg-plist b/audio/xmms-flac/pkg-plist
deleted file mode 100644
index 86f5f1c65107..000000000000
--- a/audio/xmms-flac/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $FreeBSD$
-lib/xmms/Input/libxmms-flac.so
diff --git a/audio/xmms-shn/Makefile b/audio/xmms-shn/Makefile
index ceb33fc43feb..73da5cfb3313 100644
--- a/audio/xmms-shn/Makefile
+++ b/audio/xmms-shn/Makefile
@@ -14,15 +14,12 @@ BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
 USE_GNOME=	gtk12
-NO_STAGE=	yes
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/xmms-shn/pkg-plist b/audio/xmms-shn/pkg-plist
index dd40011464ea..d6b78c7026ea 100644
--- a/audio/xmms-shn/pkg-plist
+++ b/audio/xmms-shn/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-lib/xmms/Input/libshn.la
 lib/xmms/Input/libshn.so
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/xmms-wavpack/Makefile b/audio/xmms-wavpack/Makefile
index f92a8d8624fa..a74c1bafaf90 100644
--- a/audio/xmms-wavpack/Makefile
+++ b/audio/xmms-wavpack/Makefile
@@ -9,17 +9,15 @@ MASTER_SITES=	http://www.wavpack.com/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	XMMS input plugin to play WavPack files
 
-LIB_DEPENDS=	wavpack.2:${PORTSDIR}/audio/wavpack \
-		xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack \
+		libxmms.so:${PORTSDIR}/multimedia/xmms
 
 USES=		pkgconfig
-NO_STAGE=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-post-install:
-	${RM} ${PREFIX}/lib/xmms/Input/libwavpack.la
+PLIST_FILES=	lib/xmms/Input/libwavpack.so
 
 .include <bsd.port.mk>
diff --git a/audio/xmms-wavpack/pkg-plist b/audio/xmms-wavpack/pkg-plist
deleted file mode 100644
index 4b3b82dcdfb5..000000000000
--- a/audio/xmms-wavpack/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $FreeBSD$
-lib/xmms/Input/libwavpack.so
diff --git a/audio/xmms-xf86audio/Makefile b/audio/xmms-xf86audio/Makefile
index 7b57a516649c..5f2159d95091 100644
--- a/audio/xmms-xf86audio/Makefile
+++ b/audio/xmms-xf86audio/Makefile
@@ -8,19 +8,17 @@ MASTER_SITES=	http://www.devin.com/xmms-xf86audio/download/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	XF86Audio multimedia-key support for XMMS
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
 MAKE_ARGS=	CC="${CC}" OPT="${CFLAGS}" DEBUG=""
-NO_STAGE=	yes
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/General
 	${INSTALL_DATA} ${WRKSRC}/libxf86audio.so \
-		`xmms-config --general-plugin-dir`
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+	    ${STAGEDIR}${PREFIX}/lib/xmms/General
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>