7 files changed, 57 insertions, 35 deletions

diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 6663c0359fa5..f32f0e13a5bd 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xmms
-PORTVERSION=	1.2.3
-PORTREVISION=	1
+PORTVERSION=	1.2.4
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.xmms.org/xmms/1.2.x/ \
 		ftp://ftp.uk.xmms.org/xmms/1.2.x/ \
@@ -17,9 +16,6 @@ MASTER_SITES=	ftp://ftp.xmms.org/xmms/1.2.x/ \
 		ftp://ftp.nl.xmms.org/xmms/1.2.x/ \
 		ftp://ftp.de.xmms.org/xmms/1.2.x/
 
-PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	sobomax
-
 MAINTAINER=	esk@ira.uka.de
 
 LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml
@@ -33,7 +29,8 @@ LIBTOOLFILES=	configure libxmms/configure
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib" \
-		HAVE_MIKMOD=${HAVE_MIKMOD}
+		HAVE_MIKMOD="${HAVE_MIKMOD}" \
+		HAVE_VORBIS="${HAVE_VORBIS}"
 
 .include <bsd.port.pre.mk>
 
@@ -45,6 +42,14 @@ PLIST_SUB+=	MIKMODPLUGIN:=""
 PLIST_SUB+=	MIKMODPLUGIN:="@comment "
 .endif
 
+.if !defined(WITHOUT_VORBIS)
+LIB_DEPENDS+=	vorbis.0:${PORTSDIR}/audio/libvorbis
+HAVE_VORBIS=	yes
+PLIST_SUB+=	VORBISPLUGIN:=""
+.else
+PLIST_SUB+=	VORBISPLUGIN:="@comment "
+.endif
+
 .if defined(HAVE_GNOME)
 USE_GNOME=	yes
 .else
@@ -59,7 +64,6 @@ PLIST_SUB+=	ESDPLUGIN:="@comment "
 .endif
 
 .if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021
-PATCHFILES=	xmms-${PORTVERSION}-3dnow.patch.gz
 CONFIGURE_ARGS+=	--enable-3dnow
 .endif
 
@@ -73,13 +77,16 @@ post-extract:
 .endif
 
 pre-extract:
-.if !defined(WITHOUT_MIKMOD) || ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 )
+.if !defined(WITHOUT_MIKMOD) || !defined(WITHOUT_VORBIS) || ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 )
 	@${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."
+	@${ECHO_MSG} "You can disable 3DNow! optimized decoding routines by defining WITHOUT_3DNOW."
 .endif
 	@${ECHO_MSG}
 .endif
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo
index 99b6e3f3a16f..4c09375234a2 100644
--- a/audio/xmms/distinfo
+++ b/audio/xmms/distinfo
@@ -1,2 +1 @@
-MD5 (xmms-1.2.3.tar.gz) = 5880503c9f51cd4cc14566eb1d8f54ff
-MD5 (xmms-1.2.3-3dnow.patch.gz) = 6dfabc4c460adb5062af86ca44303cd4
+MD5 (xmms-1.2.4.tar.gz) = df1081cc01628cd8b97cb5f3ca80e063
diff --git a/audio/xmms/files/patch-ad b/audio/xmms/files/patch-ad
index 0b26a5e0f80b..638bfcf41154 100644
--- a/audio/xmms/files/patch-ad
+++ b/audio/xmms/files/patch-ad
@@ -1,28 +1,38 @@
---- configure.orig	Wed Sep 20 00:30:29 2000
-+++ configure	Wed Sep 27 12:22:43 2000
-@@ -4022,7 +4022,9 @@
-   echo "$ac_t""no" 1>&6
+--- configure.orig	Tue Nov 28 16:12:16 2000
++++ configure	Tue Nov 28 16:12:52 2000
+@@ -4033,6 +4033,9 @@
  fi
  
--
+ 
 +if [ x"${HAVE_ESOUND}" != x"yes" ]; then
 +  have_esd=no
 +fi
  
  if test "x$have_esd" = xyes; then
    HAVE_ESD_TRUE=
-@@ -4303,7 +4305,9 @@
-   
+@@ -4314,6 +4317,9 @@
    rm -f conf.mikmodtest
  
--
+ 
 +if [ x"${HAVE_MIKMOD}" != x"yes" ]; then
 +  have_mikmod=no
 +fi
  
  if test "x$have_mikmod" = xyes; then
    HAVE_MIKMOD_TRUE=
-@@ -7171,14 +7175,14 @@
+@@ -4574,6 +4580,11 @@
+   
+   rm -f conf.vorbistest
+ 
++if [ x"${HAVE_VORBIS}" != x"yes" ]; then
++  have_ogg=no
++  have_vorbis=no
++fi
++
+ have_oggvorbis=no
+ if test "x$have_ogg" = xyes
+ then
+@@ -7551,14 +7562,14 @@
  
  if test -n "$GCC"
  then
@@ -39,7 +49,7 @@
  		ARCH_DEFINES="-DI386_ASSEM"
  		arch_type=ix86
  	;;
-@@ -7885,10 +7889,6 @@
+@@ -8315,10 +8326,6 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/audio/xmms/files/patch-ae b/audio/xmms/files/patch-ae
index 8eea92cf33e2..e013d1c99109 100644
--- a/audio/xmms/files/patch-ae
+++ b/audio/xmms/files/patch-ae
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Mon Jul 31 10:27:32 2000
-+++ Makefile.in	Mon Jul 31 10:27:49 2000
-@@ -147,7 +147,10 @@
+--- Makefile.in.orig	Tue Nov 28 14:55:51 2000
++++ Makefile.in	Tue Nov 28 14:57:22 2000
+@@ -152,7 +152,10 @@
  sidplay_library = @sidplay_library@
  xmmsdir = @xmmsdir@
  
@@ -8,11 +8,11 @@
 +SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms po
 +.ifdef HAVE_GNOME
 +SUBDIRS += gnomexmms
-+.endif 
++.endif
  
  bin_SCRIPTS = xmms-config
  
-@@ -205,9 +205,9 @@
+@@ -211,9 +214,9 @@
  		rm -f $(srcdir)/stamp-h.in; \
  		$(MAKE) $(srcdir)/stamp-h.in; \
  	else :; fi
diff --git a/audio/xmms/files/patch-af b/audio/xmms/files/patch-af
index 014ca1b56704..eccc666a3f35 100644
--- a/audio/xmms/files/patch-af
+++ b/audio/xmms/files/patch-af
@@ -1,6 +1,6 @@
---- Output/Makefile.in.orig	Mon Jan 31 10:44:32 2000
-+++ Output/Makefile.in	Sun Feb 27 01:37:39 2000
-@@ -125,7 +125,10 @@
+--- Output/Makefile.in.orig	Tue Nov 28 14:58:15 2000
++++ Output/Makefile.in	Tue Nov 28 14:58:46 2000
+@@ -152,7 +152,10 @@
  sidplay_library = @sidplay_library@
  xmmsdir = @xmmsdir@
  
@@ -8,7 +8,7 @@
 +SUBDIRS = OSS disk_writer
 +.if defined(HAVE_ESOUND) || defined(HAVE_GNOME)
 +SUBDIRS += esd
-+.endif 
++.endif
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
  CONFIG_CLEAN_FILES = 
diff --git a/audio/xmms/pkg-descr b/audio/xmms/pkg-descr
index d3ab702dbc68..c01e83a43c50 100644
--- a/audio/xmms/pkg-descr
+++ b/audio/xmms/pkg-descr
@@ -1,7 +1,9 @@
-XMMS --- X Multimedia System.  XMMS is a multimedia player based on
-the look of Winamp.  Currently it plays mpeg layer 1/2/3, wav, au, and
-CD audio.  Other formats are supported by different xmms plugins (e.g.
-xmms-mikmod).
+XMMS --- X Multimedia System. XMMS is a multimedia player based on the look of
+Winamp. Currently it plays mpeg layer 1/2/3, wav, au, CD audio, etc.
+
+The Vorbis plugin included here (if you don't specify WITHOUT_VORBIS) is the
+one that is included in the XMMS distribution.  If you have the vorbis-xmms
+port installed, the plugin from that port will be overwritten by this one.
 
 WWW: http://www.xmms.org/
 
diff --git a/audio/xmms/pkg-plist b/audio/xmms/pkg-plist
index 2e0b6b88c99e..36574fd07d79 100644
--- a/audio/xmms/pkg-plist
+++ b/audio/xmms/pkg-plist
@@ -23,9 +23,10 @@ lib/xmms/General/libsong_change.so
 lib/xmms/Input/libcdaudio.so
 lib/xmms/Input/libidcin.so
 lib/xmms/Input/libmpg123.so
+lib/xmms/Input/libtonegen.so
 lib/xmms/Input/libwav.so
 %%MIKMODPLUGIN:%%lib/xmms/Input/libmikmod.so
-lib/xmms/Input/libtonegen.so
+%%VORBISPLUGIN:%%lib/xmms/Input/libvorbis.so
 lib/xmms/Output/libOSS.so
 lib/xmms/Output/libdisk_writer.so
 %%ESDPLUGIN:%%lib/xmms/Output/libesdout.so
@@ -34,6 +35,7 @@ lib/xmms/Visualization/libsanalyzer.so
 share/aclocal/xmms.m4
 %%DATADIR%%/xmms/wmxmms.xpm
 share/locale/af/LC_MESSAGES/xmms.mo
+share/locale/az/LC_MESSAGES/xmms.mo
 share/locale/bg/LC_MESSAGES/xmms.mo
 share/locale/ca/LC_MESSAGES/xmms.mo
 share/locale/cs/LC_MESSAGES/xmms.mo
@@ -46,6 +48,7 @@ share/locale/fr/LC_MESSAGES/xmms.mo
 share/locale/ga/LC_MESSAGES/xmms.mo
 share/locale/hr/LC_MESSAGES/xmms.mo
 share/locale/hu/LC_MESSAGES/xmms.mo
+share/locale/it/LC_MESSAGES/xmms.mo
 share/locale/ja/LC_MESSAGES/xmms.mo
 share/locale/ko/LC_MESSAGES/xmms.mo
 share/locale/lt/LC_MESSAGES/xmms.mo
@@ -58,6 +61,7 @@ share/locale/ro/LC_MESSAGES/xmms.mo
 share/locale/ru/LC_MESSAGES/xmms.mo
 share/locale/sk/LC_MESSAGES/xmms.mo
 share/locale/sv/LC_MESSAGES/xmms.mo
+share/locale/tr/LC_MESSAGES/xmms.mo
 share/locale/uk/LC_MESSAGES/xmms.mo
 share/locale/wa/LC_MESSAGES/xmms.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/xmms.mo