2 files changed, 28 insertions, 36 deletions

diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index bef90add1476..3b46a379853b 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -3,15 +3,15 @@
 
 PORTNAME=	xmms
 PORTVERSION=	1.2.11
-PORTREVISION?=	21	# Also chinese/xmms and russian/xmms
-CATEGORIES+=	multimedia audio ipv6
+PORTREVISION=	22
+CATEGORIES=	multimedia audio ipv6
 MASTER_SITES=	http://www.xmms.org/files/1.2.x/ \
 		http://legacy.xmms2.org/ \
 		LOCAL/beech
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER?=	naddy@FreeBSD.org
-COMMENT?=	X Multimedia System -- An audio player with Winamp GUI
+MAINTAINER=	naddy@FreeBSD.org
+COMMENT=	X Multimedia System -- audio player with Winamp GUI
 
 LICENSE=	GPLv2
 
@@ -33,12 +33,15 @@ INPUT_PLUGINS=	cdaudio mpg123 tonegen wav
 OUTPUT_PLUGINS=	OSS disk_writer
 VISUALIZATION_PLUGINS=	blur_scope sanalyzer
 
-OPTIONS_DEFINE=	IPV6 MIKMOD NLS SPEC VFILEINFO VORBIS RUSXMMS_PATCHES
+OPTIONS_DEFINE=	ESOUND IPV6 MIKMOD NLS SPEC VFILEINFO VORBIS RUSXMMS_PATCHES
 OPTIONS_DEFAULT=MIKMOD VORBIS
 OPTIONS_DEFINE_i386=	SIMD
 OPTIONS_DEFAULT_i386=	SIMD
 OPTIONS_SUB=	yes
 
+ESOUND_CONFIGURE_ENABLE=esd
+ESOUND_USE=		GNOME=esound
+
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 MIKMOD_CONFIGURE_ENABLE=mikmod
@@ -82,6 +85,10 @@ AUTOMAKE_ARGS=	--add-missing --force-missing
 USE_OPENSSL=	yes
 .endif
 
+.if ${PORT_OPTIONS:MESOUND}
+OUTPUT_PLUGINS+=	esd
+.endif
+
 .if ${PORT_OPTIONS:MMIKMOD}
 INPUT_PLUGINS+=	mikmod
 .endif
@@ -96,23 +103,6 @@ VISUALIZATION_PLUGINS+=	opengl_spectrum
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mesound}!=""
-USE_GNOME+=	esound
-OUTPUT_PLUGINS+=	esd
-PLIST_SUB+=	ESDPLUGIN:=""
-.else
-CONFIGURE_ARGS+=	--disable-esd
-PLIST_SUB+=	ESDPLUGIN:="@comment "
-.endif
-
-pre-everything::
-.if ${HAVE_GNOME:Mesound}!=""
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You can disable support for esound by defining"
-	@${ECHO_MSG} "WITHOUT_GNOME=esound."
-	@${ECHO_MSG} ""
-.endif
-
 post-patch:
 .if ${PORT_OPTIONS:MRUSXMMS_PATCHES}
 	@${REINPLACE_CMD} -e 's/AM_PATH_ALSA.*/have_alsa=no/' \
diff --git a/multimedia/xmms/pkg-plist b/multimedia/xmms/pkg-plist
index f47f6aa89025..ed9613bbc488 100644
--- a/multimedia/xmms/pkg-plist
+++ b/multimedia/xmms/pkg-plist
@@ -9,41 +9,43 @@ include/xmms/plugin.h
 include/xmms/titlestring.h
 include/xmms/util.h
 include/xmms/xmmsctrl.h
+lib/libxmms.la
 lib/libxmms.so
 lib/libxmms.so.4
-lib/libxmms.la
 lib/xmms/Effect/libecho.la
-lib/xmms/Effect/libstereo.la
-lib/xmms/Effect/libvoice.la
 lib/xmms/Effect/libecho.so
+lib/xmms/Effect/libstereo.la
 lib/xmms/Effect/libstereo.so
+lib/xmms/Effect/libvoice.la
 lib/xmms/Effect/libvoice.so
 lib/xmms/General/libir.so
-lib/xmms/General/libsong_change.so
 lib/xmms/General/libir.la
 lib/xmms/General/libsong_change.la
-lib/xmms/Input/libcdaudio.so
+lib/xmms/General/libsong_change.so
 lib/xmms/Input/libcdaudio.la
-lib/xmms/Input/libmikmod.la
-lib/xmms/Input/libmpg123.la
-lib/xmms/Input/libtonegen.la
-lib/xmms/Input/libvorbis.la
-lib/xmms/Input/libwav.la
+lib/xmms/Input/libcdaudio.so
+%%MIKMOD%%lib/xmms/Input/libmikmod.la
 %%MIKMOD%%lib/xmms/Input/libmikmod.so
+lib/xmms/Input/libmpg123.la
 lib/xmms/Input/libmpg123.so
+lib/xmms/Input/libtonegen.la
 lib/xmms/Input/libtonegen.so
+%%VORBIS%%lib/xmms/Input/libvorbis.la
 %%VORBIS%%lib/xmms/Input/libvorbis.so
+lib/xmms/Input/libwav.la
 lib/xmms/Input/libwav.so
-%%ESDPLUGIN:%%lib/xmms/Output/libesdout.so
+%%ESOUND%%lib/xmms/Output/libesdout.la
+%%ESOUND%%lib/xmms/Output/libesdout.so
 lib/xmms/Output/libOSS.la
-lib/xmms/Output/libdisk_writer.la
 lib/xmms/Output/libOSS.so
+lib/xmms/Output/libdisk_writer.la
 lib/xmms/Output/libdisk_writer.so
+%%SPEC%%lib/xmms/Visualization/libogl_spectrum.la
 %%SPEC%%lib/xmms/Visualization/libogl_spectrum.so
-lib/xmms/Visualization/libbscope.so
-lib/xmms/Visualization/libsanalyzer.so
 lib/xmms/Visualization/libbscope.la
+lib/xmms/Visualization/libbscope.so
 lib/xmms/Visualization/libsanalyzer.la
+lib/xmms/Visualization/libsanalyzer.so
 man/man1/wmxmms.1.gz
 man/man1/xmms.1.gz
 share/aclocal/xmms.m4