Update to version 0.9.5.1.

PR:		14045
Submitted by:	Espen Skoglund <esk@ira.uka.de>

8 files changed, 36 insertions, 36 deletions

diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 911d1cc0cd22..d324ea907652 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,22 +1,29 @@
 # New ports collection makefile for:	xmms
-# Version required:		0.9.1
+# Version required:		0.9.5.1
 # Date created:			3 July 1999
 # Whom:				Espen Skoglund <esk@ira.uka.de>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xmms-0.9.1
+DISTNAME=	xmms-0.9.5.1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.xmms.org/xmms/0.9/
 
 MAINTAINER=	esk@ira.uka.de
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		mikmod.2:${PORTSDIR}/audio/libmikmod
+		glib12.3:${PORTSDIR}/devel/glib12 \
+		mikmod.2:${PORTSDIR}/audio/libmikmod \
+		esd.2:${PORTSDIR}/audio/esound
 
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk12-config \
- 		GLIB_CONFIG=${LOCALBASE}/bin/glib12-config
+CONFIGURE_ARGS= --without-gnome
+
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
+
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
+ 		GLIB_CONFIG="${GLIB_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo
index 7ea4683dea8d..a8f6c954d0f0 100644
--- a/audio/xmms/distinfo
+++ b/audio/xmms/distinfo
@@ -1 +1 @@
-MD5 (xmms-0.9.1.tar.gz) = 57a3ff0102ece7583c4ed2af876404fb
+MD5 (xmms-0.9.5.1.tar.gz) = 96390c8e664d5e1a237ce066283f79d5
diff --git a/audio/xmms/files/patch-ab b/audio/xmms/files/patch-ab
deleted file mode 100644
index 50f43a52a8ab..000000000000
--- a/audio/xmms/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-*** configure.orig	Sat Jul  3 19:47:22 1999
---- configure	Sat Jul  3 19:46:47 1999
-***************
-*** 637,642 ****
---- 637,643 ----
-    fi
-  fi
-  echo "$ac_t""$INSTALL" 1>&6
-+ ac_cv_path_install="$INSTALL"
-  
-  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-  # It thinks the first close brace ends the variable substitution.
diff --git a/audio/xmms/pkg-plist b/audio/xmms/pkg-plist
index 55d06d2616c7..eab14e473849 100644
--- a/audio/xmms/pkg-plist
+++ b/audio/xmms/pkg-plist
@@ -3,6 +3,7 @@ bin/xmms
 include/xmms/configfile.h
 include/xmms/dirbrowser.h
 include/xmms/plugin.h
+include/xmms/util.h
 include/xmms/xmmsctrl.h
 lib/libxmms.a
 lib/libxmms.la
@@ -16,17 +17,21 @@ lib/xmms/Effect/libvoice.so
 lib/xmms/General/libir.so
 lib/xmms/General/libsong_change.so
 lib/xmms/Input/libcdaudio.so
+lib/xmms/Input/libidcin.so
 lib/xmms/Input/libmikmod.so
 lib/xmms/Input/libmpg123.so
 lib/xmms/Input/libwav.so
 lib/xmms/Output/libOSS.so
 lib/xmms/Output/libdisk_writer.so
 lib/xmms/Output/libesdout.so
+lib/xmms/Visualization/libbscope.so
+lib/xmms/Visualization/libsanalyzer.so
 share/xmms/wmxmms.xpm
 @dirrm include/xmms
 @dirrm lib/xmms/Effect
 @dirrm lib/xmms/General
 @dirrm lib/xmms/Input
 @dirrm lib/xmms/Output
+@dirrm lib/xmms/Visualization
 @dirrm lib/xmms
 @dirrm share/xmms
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 911d1cc0cd22..d324ea907652 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -1,22 +1,29 @@
 # New ports collection makefile for:	xmms
-# Version required:		0.9.1
+# Version required:		0.9.5.1
 # Date created:			3 July 1999
 # Whom:				Espen Skoglund <esk@ira.uka.de>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xmms-0.9.1
+DISTNAME=	xmms-0.9.5.1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.xmms.org/xmms/0.9/
 
 MAINTAINER=	esk@ira.uka.de
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		mikmod.2:${PORTSDIR}/audio/libmikmod
+		glib12.3:${PORTSDIR}/devel/glib12 \
+		mikmod.2:${PORTSDIR}/audio/libmikmod \
+		esd.2:${PORTSDIR}/audio/esound
 
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk12-config \
- 		GLIB_CONFIG=${LOCALBASE}/bin/glib12-config
+CONFIGURE_ARGS= --without-gnome
+
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
+
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
+ 		GLIB_CONFIG="${GLIB_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/multimedia/xmms/distinfo b/multimedia/xmms/distinfo
index 7ea4683dea8d..a8f6c954d0f0 100644
--- a/multimedia/xmms/distinfo
+++ b/multimedia/xmms/distinfo
@@ -1 +1 @@
-MD5 (xmms-0.9.1.tar.gz) = 57a3ff0102ece7583c4ed2af876404fb
+MD5 (xmms-0.9.5.1.tar.gz) = 96390c8e664d5e1a237ce066283f79d5
diff --git a/multimedia/xmms/files/patch-ab b/multimedia/xmms/files/patch-ab
deleted file mode 100644
index 50f43a52a8ab..000000000000
--- a/multimedia/xmms/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-*** configure.orig	Sat Jul  3 19:47:22 1999
---- configure	Sat Jul  3 19:46:47 1999
-***************
-*** 637,642 ****
---- 637,643 ----
-    fi
-  fi
-  echo "$ac_t""$INSTALL" 1>&6
-+ ac_cv_path_install="$INSTALL"
-  
-  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-  # It thinks the first close brace ends the variable substitution.
diff --git a/multimedia/xmms/pkg-plist b/multimedia/xmms/pkg-plist
index 55d06d2616c7..eab14e473849 100644
--- a/multimedia/xmms/pkg-plist
+++ b/multimedia/xmms/pkg-plist
@@ -3,6 +3,7 @@ bin/xmms
 include/xmms/configfile.h
 include/xmms/dirbrowser.h
 include/xmms/plugin.h
+include/xmms/util.h
 include/xmms/xmmsctrl.h
 lib/libxmms.a
 lib/libxmms.la
@@ -16,17 +17,21 @@ lib/xmms/Effect/libvoice.so
 lib/xmms/General/libir.so
 lib/xmms/General/libsong_change.so
 lib/xmms/Input/libcdaudio.so
+lib/xmms/Input/libidcin.so
 lib/xmms/Input/libmikmod.so
 lib/xmms/Input/libmpg123.so
 lib/xmms/Input/libwav.so
 lib/xmms/Output/libOSS.so
 lib/xmms/Output/libdisk_writer.so
 lib/xmms/Output/libesdout.so
+lib/xmms/Visualization/libbscope.so
+lib/xmms/Visualization/libsanalyzer.so
 share/xmms/wmxmms.xpm
 @dirrm include/xmms
 @dirrm lib/xmms/Effect
 @dirrm lib/xmms/General
 @dirrm lib/xmms/Input
 @dirrm lib/xmms/Output
+@dirrm lib/xmms/Visualization
 @dirrm lib/xmms
 @dirrm share/xmms