aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2002-01-14 21:38:33 +0800
committersobomax <sobomax@FreeBSD.org>2002-01-14 21:38:33 +0800
commit38dcf55e2bd7c74af6baa69447e284438295a8f3 (patch)
tree9cd5eb18d1ec84d10bc0aec9b2e03da2bd2a3ae0
parent8e91d5b0bdf6563d7c9427ddeebf24fc3cda2ad2 (diff)
downloadfreebsd-ports-gnome-38dcf55e2bd7c74af6baa69447e284438295a8f3.tar.gz
freebsd-ports-gnome-38dcf55e2bd7c74af6baa69447e284438295a8f3.tar.zst
freebsd-ports-gnome-38dcf55e2bd7c74af6baa69447e284438295a8f3.zip
Update to 1.2.6.
Approved by: maintainer
-rw-r--r--audio/xmms/Makefile6
-rw-r--r--audio/xmms/distinfo2
-rw-r--r--audio/xmms/files/patch-ad14
-rw-r--r--audio/xmms/files/patch-ltmain.sh28
-rw-r--r--audio/xmms/pkg-plist7
-rw-r--r--multimedia/xmms/Makefile6
-rw-r--r--multimedia/xmms/distinfo2
-rw-r--r--multimedia/xmms/files/patch-ad14
-rw-r--r--multimedia/xmms/files/patch-ltmain.sh28
-rw-r--r--multimedia/xmms/pkg-plist7
10 files changed, 80 insertions, 34 deletions
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index f9d984e72266..46492d14bd4f 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -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 @@ USE_GTK= yes
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}" \
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo
index cbcdd02f8263..190484488022 100644
--- a/audio/xmms/distinfo
+++ b/audio/xmms/distinfo
@@ -1 +1 @@
-MD5 (xmms-1.2.5.tar.bz2) = bb856ff278a4ccee3d2578e3ddea8686
+MD5 (xmms-1.2.6.tar.bz2) = 705fe02278aaee095fb9f5ebaa318a6c
diff --git a/audio/xmms/files/patch-ad b/audio/xmms/files/patch-ad
index 6de233e90423..971857b2de47 100644
--- a/audio/xmms/files/patch-ad
+++ b/audio/xmms/files/patch-ad
@@ -1,17 +1,9 @@
$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
diff --git a/audio/xmms/files/patch-ltmain.sh b/audio/xmms/files/patch-ltmain.sh
new file mode 100644
index 000000000000..98cb05e4ddb3
--- /dev/null
+++ b/audio/xmms/files/patch-ltmain.sh
@@ -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"
diff --git a/audio/xmms/pkg-plist b/audio/xmms/pkg-plist
index 1667d8dfbf68..483abe5600ba 100644
--- a/audio/xmms/pkg-plist
+++ b/audio/xmms/pkg-plist
@@ -14,7 +14,7 @@ include/xmms/util.h
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/de/LC_MESSAGES/xmms.mo
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/ko/LC_MESSAGES/xmms.mo
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/ru/LC_MESSAGES/xmms.mo
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
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index f9d984e72266..46492d14bd4f 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -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 @@ USE_GTK= yes
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}" \
diff --git a/multimedia/xmms/distinfo b/multimedia/xmms/distinfo
index cbcdd02f8263..190484488022 100644
--- a/multimedia/xmms/distinfo
+++ b/multimedia/xmms/distinfo
@@ -1 +1 @@
-MD5 (xmms-1.2.5.tar.bz2) = bb856ff278a4ccee3d2578e3ddea8686
+MD5 (xmms-1.2.6.tar.bz2) = 705fe02278aaee095fb9f5ebaa318a6c
diff --git a/multimedia/xmms/files/patch-ad b/multimedia/xmms/files/patch-ad
index 6de233e90423..971857b2de47 100644
--- a/multimedia/xmms/files/patch-ad
+++ b/multimedia/xmms/files/patch-ad
@@ -1,17 +1,9 @@
$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
diff --git a/multimedia/xmms/files/patch-ltmain.sh b/multimedia/xmms/files/patch-ltmain.sh
new file mode 100644
index 000000000000..98cb05e4ddb3
--- /dev/null
+++ b/multimedia/xmms/files/patch-ltmain.sh
@@ -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"
diff --git a/multimedia/xmms/pkg-plist b/multimedia/xmms/pkg-plist
index 1667d8dfbf68..483abe5600ba 100644
--- a/multimedia/xmms/pkg-plist
+++ b/multimedia/xmms/pkg-plist
@@ -14,7 +14,7 @@ include/xmms/util.h
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/de/LC_MESSAGES/xmms.mo
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/ko/LC_MESSAGES/xmms.mo
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/ru/LC_MESSAGES/xmms.mo
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