5 files changed, 100 insertions, 106 deletions

diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 17b24a4608a5..89be41524ebd 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -7,9 +7,10 @@
 
 PORTNAME=	xmms
 PORTVERSION=	1.2.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES+=	multimedia audio ipv6
-MASTER_SITES=	http://www.xmms.org/files/1.2.x/
+MASTER_SITES=	http://www.xmms.org/files/1.2.x/ \
+		LOCAL/beech
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	beech@FreeBSD.org
@@ -19,45 +20,39 @@ USE_BZIP2=	yes
 USE_GL=		gl
 USE_GNOME=	gtk12 gnomehack
 USE_GMAKE=	yes
+USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	aclocal:19 automake:19 autoheader:262 autoconf:262 libtool:15
-ACLOCAL_ARGS=	--force
+USE_AUTOTOOLS=	automake:19 autoconf:262 libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		INPUT_PLUGINS="${INPUT_PLUGINS}" \
 		OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
 		VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
+CONFIGURE_ARGS=	--enable-static=no
 MAN1=		wmxmms.1 xmms.1
+SUB_FILES=	pkg-message
 
-CONFLICTS=	ru-xmms-*
+CONFLICTS=	ru-xmms-[0-9]*
 
 INPUT_PLUGINS=	cdaudio mpg123 tonegen wav
 OUTPUT_PLUGINS=	OSS disk_writer
-VISUALIZATION_PLUGINS=	blur_scope sanalyzer opengl_spectrum
-
-PLIST_SUB+=	DATADIR="share"
+VISUALIZATION_PLUGINS=	blur_scope sanalyzer
 
-OPTIONS=	NLS 		"Internationalization" on \
-		IPV6		"Enable ipv6" on \
-		VFILEINFO	"Enable Extended Vorbis Fileinfo" off \
-		VORBIS		"Enable Vorbis Plugin"	on \
+OPTIONS=	IPV6		"Enable ipv6" off \
 		MIKMOD		"Enable Mikemod Plugin" on \
-		SIMD		"Enable x86 SIMD (3DNow!/MMX)" on
+		SIMD		"Enable x86 SIMD (3DNow!/MMX)" on \
+		SPEC		"Visualization opengl_spectrum" off \
+		VFILEINFO	"Enable Extended Vorbis Fileinfo" off \
+		VORBIS		"Enable Vorbis Plugin" on
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if !defined(WITHOUT_IPV6)
+.if defined(WITH_IPV6)
 CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if defined(WITH_RUSXMMS_PATCHES)
@@ -109,6 +104,14 @@ WITHOUT_SIMD+=	yes
 CONFIGURE_ARGS+=	--enable-simd
 .endif
 
+.if defined(WITH_SPEC)
+PLIST_SUB+=	SPEC=""
+VISUALIZATION_PLUGINS+=	opengl_spectrum
+.else
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-Visualization_Makefile.am
+PLIST_SUB+=	SPEC="@comment "
+.endif
+
 .if defined(WITHOUT_SIMD)
 post-extract:
 	(cd ${WRKSRC}/Input/mpg123 && ${MV} decode_i586.s decode_i586.S && \
@@ -155,26 +158,6 @@ post-patch:
 	${REINPLACE_CMD} -e '/AM_PATH_ESD/,/have_esd=no/d' ${WRKSRC}/configure.in
 .endif
 
-# There are patches to configure.in and Makefile.in, recreate configure
-# scripts
-run-autotools:
-	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-		${ACLOCAL_ARGS})
-	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
-		${AUTOHEADER_ARGS})
-	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
-		${AUTOCONF_ARGS})
-	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
-		${AUTOMAKE_ARGS})
-	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-		${ACLOCAL_ARGS})
-	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
-		${AUTOHEADER_ARGS})
-	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
-		${AUTOCONF_ARGS})
-	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
-		${AUTOMAKE_ARGS})
-
 post-install:
 	@${MKDIR} ${PREFIX}/share/xmms/Skins
 	@${CAT} ${PKGMESSAGE}
diff --git a/multimedia/xmms/files/extra-patch-Visualization_Makefile.am b/multimedia/xmms/files/extra-patch-Visualization_Makefile.am
new file mode 100644
index 000000000000..bc16a87345d2
--- /dev/null
+++ b/multimedia/xmms/files/extra-patch-Visualization_Makefile.am
@@ -0,0 +1,6 @@
+--- Visualization/Makefile.am.orig	2001-01-19 07:37:43.000000000 -0900
++++ Visualization/Makefile.am	2008-09-28 14:03:48.000000000 -0800
+@@ -1,2 +1,2 @@
+-ALL_PLUGINS = blur_scope sanalyzer opengl_spectrum
++ALL_PLUGINS = blur_scope sanalyzer
+ SUBDIRS = @VISUALIZATION_PLUGINS@
diff --git a/multimedia/xmms/files/pkg-message.in b/multimedia/xmms/files/pkg-message.in
new file mode 100644
index 000000000000..a11e67bb1a67
--- /dev/null
+++ b/multimedia/xmms/files/pkg-message.in
@@ -0,0 +1,6 @@
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+Xmms supports Gzipped and uncompressed skins.  If you would like to use
+Zip format skins you will need to ensure archivers/unzip is installed.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/multimedia/xmms/pkg-message b/multimedia/xmms/pkg-message
deleted file mode 100644
index 852df17c577e..000000000000
--- a/multimedia/xmms/pkg-message
+++ /dev/null
@@ -1,2 +0,0 @@
-Xmms supports Gzipped and uncompressed skins.  If you would like to use
-Zip format skins you will need to ensure archivers/unzip is installed.
diff --git a/multimedia/xmms/pkg-plist b/multimedia/xmms/pkg-plist
index ddff3a2665a4..7d7db026b2f4 100644
--- a/multimedia/xmms/pkg-plist
+++ b/multimedia/xmms/pkg-plist
@@ -9,7 +9,6 @@ include/xmms/plugin.h
 include/xmms/titlestring.h
 include/xmms/util.h
 include/xmms/xmmsctrl.h
-lib/libxmms.a
 lib/libxmms.so
 lib/libxmms.so.4
 lib/xmms/Effect/libecho.so
@@ -18,74 +17,76 @@ lib/xmms/Effect/libvoice.so
 lib/xmms/General/libir.so
 lib/xmms/General/libsong_change.so
 lib/xmms/Input/libcdaudio.so
+%%MIKMODPLUGIN:%%lib/xmms/Input/libmikmod.so
 lib/xmms/Input/libmpg123.so
 lib/xmms/Input/libtonegen.so
-lib/xmms/Input/libwav.so
-%%MIKMODPLUGIN:%%lib/xmms/Input/libmikmod.so
 %%VORBISPLUGIN:%%lib/xmms/Input/libvorbis.so
+lib/xmms/Input/libwav.so
+%%ESDPLUGIN:%%lib/xmms/Output/libesdout.so
 lib/xmms/Output/libOSS.so
 lib/xmms/Output/libdisk_writer.so
-%%ESDPLUGIN:%%lib/xmms/Output/libesdout.so
+%%SPEC%%lib/xmms/Visualization/libogl_spectrum.so
 lib/xmms/Visualization/libbscope.so
-lib/xmms/Visualization/libogl_spectrum.so
 lib/xmms/Visualization/libsanalyzer.so
 share/aclocal/xmms.m4
-%%DATADIR%%/xmms/wmxmms.xpm
-%%NLS%%share/locale/af/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/az/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/be/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/bg/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/bs/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/cy/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/da/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/de/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/el/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/en/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/es/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/et/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/id/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/it/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/ka/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/mk/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/no/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/sq/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/sr@Latn/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/tg/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/th/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/uz/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/wa/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/xmms.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/xmms.mo
+share/locale/af/LC_MESSAGES/xmms.mo
+share/locale/az/LC_MESSAGES/xmms.mo
+share/locale/be/LC_MESSAGES/xmms.mo
+share/locale/bg/LC_MESSAGES/xmms.mo
+share/locale/bs/LC_MESSAGES/xmms.mo
+share/locale/ca/LC_MESSAGES/xmms.mo
+share/locale/cs/LC_MESSAGES/xmms.mo
+share/locale/cy/LC_MESSAGES/xmms.mo
+share/locale/da/LC_MESSAGES/xmms.mo
+share/locale/de/LC_MESSAGES/xmms.mo
+share/locale/el/LC_MESSAGES/xmms.mo
+share/locale/en/LC_MESSAGES/xmms.mo
+share/locale/en_GB/LC_MESSAGES/xmms.mo
+share/locale/eo/LC_MESSAGES/xmms.mo
+share/locale/es/LC_MESSAGES/xmms.mo
+share/locale/et/LC_MESSAGES/xmms.mo
+share/locale/eu/LC_MESSAGES/xmms.mo
+share/locale/fi/LC_MESSAGES/xmms.mo
+share/locale/fr/LC_MESSAGES/xmms.mo
+share/locale/ga/LC_MESSAGES/xmms.mo
+share/locale/gl/LC_MESSAGES/xmms.mo
+share/locale/hr/LC_MESSAGES/xmms.mo
+share/locale/hu/LC_MESSAGES/xmms.mo
+share/locale/id/LC_MESSAGES/xmms.mo
+share/locale/it/LC_MESSAGES/xmms.mo
+share/locale/ja/LC_MESSAGES/xmms.mo
+share/locale/ka/LC_MESSAGES/xmms.mo
+share/locale/ko/LC_MESSAGES/xmms.mo
+share/locale/lt/LC_MESSAGES/xmms.mo
+share/locale/lv/LC_MESSAGES/xmms.mo
+share/locale/mk/LC_MESSAGES/xmms.mo
+share/locale/ms/LC_MESSAGES/xmms.mo
+share/locale/nl/LC_MESSAGES/xmms.mo
+share/locale/nn/LC_MESSAGES/xmms.mo
+share/locale/no/LC_MESSAGES/xmms.mo
+share/locale/pl/LC_MESSAGES/xmms.mo
+share/locale/pt/LC_MESSAGES/xmms.mo
+share/locale/pt_BR/LC_MESSAGES/xmms.mo
+share/locale/ro/LC_MESSAGES/xmms.mo
+share/locale/ru/LC_MESSAGES/xmms.mo
+share/locale/sk/LC_MESSAGES/xmms.mo
+share/locale/sl/LC_MESSAGES/xmms.mo
+share/locale/sq/LC_MESSAGES/xmms.mo
+share/locale/sr/LC_MESSAGES/xmms.mo
+share/locale/sr@Latn/LC_MESSAGES/xmms.mo
+share/locale/sv/LC_MESSAGES/xmms.mo
+share/locale/tg/LC_MESSAGES/xmms.mo
+share/locale/th/LC_MESSAGES/xmms.mo
+share/locale/tr/LC_MESSAGES/xmms.mo
+share/locale/uk/LC_MESSAGES/xmms.mo
+share/locale/uz/LC_MESSAGES/xmms.mo
+share/locale/vi/LC_MESSAGES/xmms.mo
+share/locale/wa/LC_MESSAGES/xmms.mo
+share/locale/zh_CN/LC_MESSAGES/xmms.mo
+share/locale/zh_TW/LC_MESSAGES/xmms.mo
+%%DATADIR%%/wmxmms.xpm
+@dirrmtry %%DATADIR%%/Skins
+@dirrm %%DATADIR%%
 @dirrmtry lib/xmms/Visualization
 @dirrmtry lib/xmms/Output
 @dirrmtry lib/xmms/Input
@@ -94,4 +95,4 @@ share/aclocal/xmms.m4
 @dirrmtry lib/xmms
 @dirrm include/xmms
 @exec mkdir -p %D/share/xmms/Skins
-@unexec rmdir %D/share/xmms/Skins %D/share/xmms 2>/dev/null || echo "If you are permanently removing xmms, do not forget to remove skin files left under %D/share/xmms/Skins. Use \`\`rm -Rf %D/share/xmms/Skins; rmdir %D/share/xmms''" | fmt
+@unexec echo "If you are permanently removing xmms, do not forget to remove skin files left under %D/share/xmms/Skins. Use \`\`rm -Rf %D/share/xmms/Skins; rmdir %D/share/xmms''" | fmt