* Update to 2.2.6.

* Home page and master site have moved.
* Use standard way of not installing .la library wrapper.

Approved by:	fenner

5 files changed, 18 insertions, 33 deletions

diff --git a/audio/xmms-shn/Makefile b/audio/xmms-shn/Makefile
index c9e36a4ea908..4d67591f26f5 100644
--- a/audio/xmms-shn/Makefile
+++ b/audio/xmms-shn/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	xmms-shn
-PORTVERSION=	2.2.5
+PORTVERSION=	2.2.6
 CATEGORIES=	audio
-MASTER_SITES=	http://shnutils.etree.org/xmms-shn/source/
+MASTER_SITES=	http://shnutils.freeshell.org/xmms-shn/source/
 
 MAINTAINER=	fenner@FreeBSD.Org
 
@@ -18,7 +18,7 @@ RUN_DEPENDS=	xmms:${PORTSDIR}/audio/xmms
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
 post-install:
diff --git a/audio/xmms-shn/distinfo b/audio/xmms-shn/distinfo
index ffc35a103dfc..2f9be2354d8c 100644
--- a/audio/xmms-shn/distinfo
+++ b/audio/xmms-shn/distinfo
@@ -1 +1 @@
-MD5 (xmms-shn-2.2.5.tar.gz) = 17ab1f3d30a46683aab3ef97496d90da
+MD5 (xmms-shn-2.2.6.tar.gz) = cccea0a69425ea43accf2617828721f4
diff --git a/audio/xmms-shn/files/patch-configure b/audio/xmms-shn/files/patch-configure
new file mode 100644
index 000000000000..cebd65e8b014
--- /dev/null
+++ b/audio/xmms-shn/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure.orig	Sat Oct  5 18:12:38 2002
++++ configure	Sat Oct  5 18:13:03 2002
+@@ -7357,6 +7357,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/audio/xmms-shn/files/patch-ltmain.sh b/audio/xmms-shn/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/audio/xmms-shn/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$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-shn/pkg-descr b/audio/xmms-shn/pkg-descr
index b9fe48456827..5fb7329087b3 100644
--- a/audio/xmms-shn/pkg-descr
+++ b/audio/xmms-shn/pkg-descr
@@ -15,5 +15,5 @@ The current implementation creates a seek table entry once every
 this provides a granularity of 1 seek table entry per 25600/44100
 = 0.58 seconds, more than what is needed by either XMMS or WinAmp.
 
-WWW: http://shnutils.etree.org/xmms-shn/
+WWW: http://shnutils.freeshell.org/xmms-shn/
 Author: Jason Jordan <shnutils@freeshell.org>