Please approve attached patch which updates xmms to the latest version
1.2.6.
Thanks!
-Maxim
--------------155A324DC050D1EFD3A5B2E8
Content-Type: text/plain; charset=koi8-r;
name="xmms.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="xmms.diff"
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/xmms/Makefile,v
retrieving revision 1.36
diff -d -u -r1.36 Makefile
--- Makefile 20 Jul 2001 20:52:49 -0000 1.36
+++ Makefile 14 Jan 2002 12:19:43 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= xmms
-PORTVERSION= 1.2.5
-PORTREVISION= 1
+PORTVERSION= 1.2.6
CATEGORIES+= audio
MASTER_SITES= ftp://ftp.xmms.org/xmms/1.2.x/ \
http://www.xmms.org/files/1.2.x/ \
@@ -23,9 +22,8 @@
WANT_ESOUND= yes
WANT_GNOME= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
-LIBTOOLFILES= configure libxmms/configure
INSTALLS_SHLIB= yes
+GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib" \
INPUT_PLUGINS="${INPUT_PLUGINS}" \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/audio/xmms/distinfo,v
retrieving revision 1.10
diff -d -u -r1.10 distinfo
--- distinfo 21 Jun 2001 15:34:30 -0000 1.10
+++ distinfo 14 Jan 2002 12:19:43 -0000
@@ -1 +1 @@
-MD5 (xmms-1.2.5.tar.bz2) = bb856ff278a4ccee3d2578e3ddea8686
+MD5 (xmms-1.2.6.tar.bz2) = 705fe02278aaee095fb9f5ebaa318a6c
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/audio/xmms/pkg-plist,v
retrieving revision 1.17
diff -d -u -r1.17 pkg-plist
--- pkg-plist 21 Jun 2001 15:34:30 -0000 1.17
+++ pkg-plist 14 Jan 2002 12:19:43 -0000
@@ -14,7 +14,7 @@
include/xmms/xmmsctrl.h
lib/libxmms.a
lib/libxmms.so
-lib/libxmms.so.2
+lib/libxmms.so.3
lib/xmms/Effect/libecho.so
lib/xmms/Effect/libstereo.so
lib/xmms/Effect/libvoice.so
@@ -44,6 +44,7 @@
share/locale/el/LC_MESSAGES/xmms.mo
share/locale/eo/LC_MESSAGES/xmms.mo
share/locale/es/LC_MESSAGES/xmms.mo
+share/locale/eu/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
@@ -56,6 +57,7 @@
share/locale/lt/LC_MESSAGES/xmms.mo
share/locale/lv/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
@@ -65,8 +67,11 @@
share/locale/sk/LC_MESSAGES/xmms.mo
share/locale/sr/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/vi/LC_MESSAGES/xmms.mo
share/locale/wa/LC_MESSAGES/xmms.mo
share/locale/zh_CN.GB2312/LC_MESSAGES/xmms.mo
share/locale/zh_TW/LC_MESSAGES/xmms.mo
Index: files/patch-ad
===================================================================
RCS file: /home/ncvs/ports/audio/xmms/files/patch-ad,v
retrieving revision 1.9
diff -d -u -r1.9 patch-ad
--- files/patch-ad 21 Jun 2001 15:34:31 -0000 1.9
+++ files/patch-ad 14 Jan 2002 12:19:43 -0000
@@ -1,17 +1,9 @@
-$FreeBSD: ports/audio/xmms/files/patch-ad,v 1.9 2001/06/21 15:34:31 sobomax Exp $
+$FreeBSD$
---- configure.orig Mon Jun 18 22:53:50 2001
-+++ configure Thu Jun 21 18:24:01 2001
-@@ -8062,7 +8062,6 @@
- ARCH_DEFINES=""
- case "$host" in
- i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
-- CFLAGS="$CFLAGS -m486"
- ARCH_DEFINES="-DI386_ASSEM"
- arch_type=ix86
- ;;
-@@ -8858,10 +8857,6 @@
+--- configure 2002/01/14 11:54:47 1.1
++++ configure 2002/01/14 11:54:16
+@@ -12577,10 +12577,6 @@
*) # Relative path.
ac_sub_cache_file="$ac_dots$cache_file" ;;
esac
Index: files/patch-ltmain.sh
===================================================================
RCS file: files/patch-ltmain.sh
diff -N files/patch-ltmain.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-ltmain.sh 14 Jan 2002 12:19:43 -0000
@@ -0,0 +1,28 @@
+
+$FreeBSD$
+
+--- ltmain.sh 2001/08/27 09:51:26 1.1
++++ ltmain.sh 2001/08/27 09:51:42
+@@ -2408,6 +2408,9 @@
+ *-*-netbsd*)
+ # Don't link with libc until the a.out ld.so is fixed.
+ ;;
++ *-*-freebsd*)
++ # FreeBSD doesn't need this...
++ ;;
+ *)
+ # Add libc to deplibs on all other systems if necessary.
+ if test "$build_libtool_need_lc" = "yes"; then
+@@ -4175,10 +4178,12 @@
+ fi
+
+ # Install the pseudo-library for information purposes.
++ if /usr/bin/false; then
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
++ fi
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
Index: audio/gkrellmms/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/gkrellmms/Makefile,v
retrieving revision 1.5
diff -d -u -r1.5 Makefile
--- audio/gkrellmms/Makefile 21 Jun 2001 15:35:19 -0000 1.5
+++ audio/gkrellmms/Makefile 14 Jan 2002 12:20:40 -0000
@@ -12,7 +12,7 @@
MAINTAINER= u...@FreeBSD.org
-LIB_DEPENDS= xmms.2:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
Index: audio/xmms-crossfade/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/xmms-crossfade/Makefile,v
retrieving revision 1.10
diff -d -u -r1.10 Makefile
--- audio/xmms-crossfade/Makefile 15 Nov 2001 03:57:53 -0000 1.10
+++ audio/xmms-crossfade/Makefile 14 Jan 2002 12:20:40 -0000
@@ -13,7 +13,7 @@
MAINTAINER= p...@FreeBSD.org
-LIB_DEPENDS= xmms.2:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
USE_X_PREFIX= yes
USE_LIBTOOL= yes
Index: audio/xmms-crystality/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/xmms-crystality/Makefile,v
retrieving revision 1.2
diff -d -u -r1.2 Makefile
--- audio/xmms-crystality/Makefile 15 Nov 2001 03:57:55 -0000 1.2
+++ audio/xmms-crystality/Makefile 14 Jan 2002 12:20:40 -0000
@@ -14,7 +14,7 @@
MAINTAINER= p...@FreeBSD.org
-LIB_DEPENDS= xmms.2:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
USE_X_PREFIX= yes
USE_GTK= yes
Index: audio/xmms-kde/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/xmms-kde/Makefile,v
retrieving revision 1.2
diff -d -u -r1.2 Makefile
--- audio/xmms-kde/Makefile 21 Jun 2001 15:35:20 -0000 1.2
+++ audio/xmms-kde/Makefile 14 Jan 2002 12:20:40 -0000
@@ -14,7 +14,7 @@
MAINTAINER= j...@jungnickel.com
-LIB_DEPENDS= xmms.2:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
USE_KDELIBS_VER=2
Index: audio/xmms-liveice/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/xmms-liveice/Makefile,v
retrieving revision 1.7
diff -d -u -r1.7 Makefile
--- audio/xmms-liveice/Makefile 21 Jun 2001 15:35:21 -0000 1.7
+++ audio/xmms-liveice/Makefile 14 Jan 2002 12:20:40 -0000
@@ -13,7 +13,7 @@
MAINTAINER= e...@ira.uka.de
-LIB_DEPENDS= xmms.2:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
RUN_DEPENDS= lame:${PORTSDIR}/audio/lame
WRKSRC= ${WRKDIR}/LiveIce-1.0.0
Index: audio/xmms-sndfile/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/xmms-sndfile/Makefile,v
retrieving revision 1.1
diff -d -u -r1.1 Makefile
--- audio/xmms-sndfile/Makefile 31 Dec 2001 10:41:15 -0000 1.1
+++ audio/xmms-sndfile/Makefile 14 Jan 2002 12:20:40 -0000
@@ -14,7 +14,7 @@
MAINTAINER= dye...@yahoo.com
LIB_DEPENDS= sndfile.0:${PORTSDIR}/audio/libsndfile \
- xmms.2:${PORTSDIR}/audio/xmms
+ xmms.3:${PORTSDIR}/audio/xmms
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
Index: audio/xmms-sndstretch/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/xmms-sndstretch/Makefile,v
retrieving revision 1.1
diff -d -u -r1.1 Makefile
--- audio/xmms-sndstretch/Makefile 3 Dec 2001 06:08:37 -0000 1.1
+++ audio/xmms-sndstretch/Makefile 14 Jan 2002 12:20:40 -0000
@@ -14,7 +14,7 @@
MAINTAINER= po...@edwinm.ik.nu
-LIB_DEPENDS= xmms.2:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
WRKSRC= ${WRKDIR}/sndstretch_xmms
Index: audio/xmms-tfmx/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/xmms-tfmx/Makefile,v
retrieving revision 1.6
diff -d -u -r1.6 Makefile
--- audio/xmms-tfmx/Makefile 7 Oct 2001 02:03:41 -0000 1.6
+++ audio/xmms-tfmx/Makefile 14 Jan 2002 12:20:40 -0000
@@ -13,7 +13,7 @@
MAINTAINER= po...@FreeBSD.org
-LIB_DEPENDS= xmms.2:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
USE_X_PREFIX= yes
USE_GMAKE= yes
Index: audio/xmms-volnorm/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/xmms-volnorm/Makefile,v
retrieving revision 1.2
diff -d -u -r1.2 Makefile
--- audio/xmms-volnorm/Makefile 15 Nov 2001 03:57:57 -0000 1.2
+++ audio/xmms-volnorm/Makefile 14 Jan 2002 12:20:40 -0000
@@ -15,7 +15,7 @@
MAINTAINER= p...@FreeBSD.org
-LIB_DEPENDS= xmms.2:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
USE_X_PREFIX= yes
USE_GTK= yes
Index: graphics/smpeg-xmms/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/smpeg-xmms/Makefile,v
retrieving revision 1.6
diff -d -u -r1.6 Makefile
--- graphics/smpeg-xmms/Makefile 21 Jun 2001 15:35:22 -0000 1.6
+++ graphics/smpeg-xmms/Makefile 14 Jan 2002 12:20:40 -0000
@@ -13,7 +13,7 @@
MAINTAINER= sob...@FreeBSD.org
LIB_DEPENDS= smpeg.1:${PORTSDIR}/graphics/smpeg \
- xmms.2:${PORTSDIR}/audio/xmms
+ xmms.3:${PORTSDIR}/audio/xmms
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
--------------155A324DC050D1EFD3A5B2E8--
To Unsubscribe: send mail to majo...@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message