5 files changed, 10 insertions, 23 deletions

diff --git a/audio/bmp-scrobbler/Makefile b/audio/bmp-scrobbler/Makefile
index 1fc42fc4ab6e..70f02e5d1e6c 100644
--- a/audio/bmp-scrobbler/Makefile
+++ b/audio/bmp-scrobbler/Makefile
@@ -29,4 +29,6 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=	--enable-prefer-ape
 .endif
 
+PLIST_FILES=	lib/bmp/General/libbmp_scrobbler.so
+
 .include <bsd.port.mk>
diff --git a/audio/bmp-scrobbler/pkg-plist b/audio/bmp-scrobbler/pkg-plist
deleted file mode 100644
index cf789cc2f2c7..000000000000
--- a/audio/bmp-scrobbler/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/bmp/General/libbmp_scrobbler.so
-@unexec rmdir %D/lib/bmp/General 2> /dev/null || true
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile
index c0ec9cc264c8..05bddf710e89 100644
--- a/multimedia/beep-media-player/Makefile
+++ b/multimedia/beep-media-player/Makefile
@@ -36,7 +36,9 @@ INPUT_PLUGINS=	cdaudio,mpg123
 OUTPUT_PLUGINS=	OSS
 VISUALIZATION_PLUGINS=	blur_scope
 
-PLIST_SUB=	DATADIR="share"
+OPTIONS=	VORBIS	"Enable Ogg Vorbis support" on \
+		ESOUND	"Enable Esound support"  off \
+		3DNOW	"Enable 3DNow! optimized decoding routines" on
 
 .include <bsd.port.pre.mk>
 
@@ -60,7 +62,7 @@ CONFIGURE_ARGS+=	--disable-vorbis
 PLIST_SUB+=	VORBISPLUGIN:="@comment "
 .endif
 
-.if ${HAVE_GNOME:Mesound}!=""
+.if defined(WITH_ESOUND)
 USE_GNOME+=	esound
 OUTPUT_PLUGINS+=	esd
 PLIST_SUB+=	ESDPLUGIN:=""
@@ -91,24 +93,6 @@ post-extract:
 	  ${WRKSRC}/Visualization/blur_scope/Makefile.in
 .endif
 
-pre-extract:
-.if !defined(WITHOUT_MIKMOD) || !defined(WITHOUT_VORBIS) || ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 ) || ${HAVE_GNOME:Mesound}!=""
-	@${ECHO_MSG}
-.if !defined(WITHOUT_MIKMOD)
-	@${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."
-.endif
-.if !defined(WITHOUT_VORBIS)
-	@${ECHO_MSG} "You can disable support for vorbis by defining WITHOUT_VORBIS."
-.endif
-.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021
-	@${ECHO_MSG} "You can disable 3DNow! optimized decoding routines by defining WITHOUT_3DNOW."
-.endif
-.if ${HAVE_GNOME:Mesound}!=""
-	@${ECHO_MSG} "You can disable support for esound by defining WITHOUT_GNOME=esound."
-.endif
-	@${ECHO_MSG}
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile.in
@@ -119,6 +103,7 @@ post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
 
 post-install:
+	@${MKDIR} ${PREFIX}/lib/bmp/General
 	@${MKDIR} ${PREFIX}/share/beep/Skins
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/multimedia/beep-media-player/pkg-plist b/multimedia/beep-media-player/pkg-plist
index dd9849275525..036ec5c44007 100644
--- a/multimedia/beep-media-player/pkg-plist
+++ b/multimedia/beep-media-player/pkg-plist
@@ -71,6 +71,7 @@ share/locale/sk/LC_MESSAGES/bmp.mo
 share/locale/sv/LC_MESSAGES/bmp.mo
 share/locale/zh_CN/LC_MESSAGES/bmp.mo
 @unexec rmdir %D/share/applications 2>/dev/null || true
+@exec mkdir -p %D/share/beep/Skins
 @dirrm share/beep/Skins
 @dirrm share/beep
 @dirrm share/bmp/Skins/Default
@@ -81,5 +82,7 @@ share/locale/zh_CN/LC_MESSAGES/bmp.mo
 @dirrm lib/bmp/Visualization
 @dirrm lib/bmp/Output
 @dirrm lib/bmp/Input
+@exec mkdir -p %D/lib/bmp/General
+@dirrm lib/bmp/General
 @dirrm lib/bmp
 @dirrm include/bmp
diff --git a/multimedia/bmp-extra-plugins/pkg-plist b/multimedia/bmp-extra-plugins/pkg-plist
index faae23cec080..fc67c7d84bf9 100644
--- a/multimedia/bmp-extra-plugins/pkg-plist
+++ b/multimedia/bmp-extra-plugins/pkg-plist
@@ -22,4 +22,3 @@ share/bmp/status_docklet/timetre-idle.xpm
 share/bmp/status_docklet/timetre-paused-anim.xpm
 share/bmp/status_docklet/timetre-playing-anim.xpm
 @dirrm share/bmp/status_docklet
-@dirrm lib/bmp/General