From 56e8a08f5c8f2da5873088c1c8de4576e0aca79d Mon Sep 17 00:00:00 2001
From: Patrick Li <pat@FreeBSD.org>
Date: Tue, 5 Mar 2002 21:09:09 +0000
Subject: - Update to 1.2.7 - Remove obsolete Vorbis comment in pkg-descr

PR:		35555
Submitted by:	maintainer
---
 multimedia/xmms/Makefile              |  3 +--
 multimedia/xmms/distinfo              |  2 +-
 multimedia/xmms/files/patch-ad        |  6 +++---
 multimedia/xmms/files/patch-ltmain.sh | 14 +++++++-------
 multimedia/xmms/pkg-descr             |  4 ----
 5 files changed, 12 insertions(+), 17 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 9b03fd1ba3c8..abc31b58bbf6 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xmms
-PORTVERSION=	1.2.6
-PORTREVISION=	1
+PORTVERSION=	1.2.7
 CATEGORIES+=	audio
 MASTER_SITES=	ftp://ftp.xmms.org/xmms/1.2.x/ \
 		http://www.xmms.org/files/1.2.x/ \
diff --git a/multimedia/xmms/distinfo b/multimedia/xmms/distinfo
index 190484488022..1c73d6140407 100644
--- a/multimedia/xmms/distinfo
+++ b/multimedia/xmms/distinfo
@@ -1 +1 @@
-MD5 (xmms-1.2.6.tar.bz2) = 705fe02278aaee095fb9f5ebaa318a6c
+MD5 (xmms-1.2.7.tar.bz2) = 9bec488842920df359516b7d062d15dc
diff --git a/multimedia/xmms/files/patch-ad b/multimedia/xmms/files/patch-ad
index 971857b2de47..8165afa05d2e 100644
--- a/multimedia/xmms/files/patch-ad
+++ b/multimedia/xmms/files/patch-ad
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure	2002/01/14 11:54:47	1.1
-+++ configure	2002/01/14 11:54:16
-@@ -12577,10 +12577,6 @@
+--- configure.orig	Mon Mar  4 22:57:01 2002
++++ configure	Tue Mar  5 11:16:25 2002
+@@ -12673,10 +12673,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
index 98cb05e4ddb3..3513c55b8eb9 100644
--- a/multimedia/xmms/files/patch-ltmain.sh
+++ b/multimedia/xmms/files/patch-ltmain.sh
@@ -1,19 +1,19 @@
 
 $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.
+--- ltmain.sh.orig	Mon Sep 24 14:12:50 2001
++++ ltmain.sh	Tue Mar  5 11:16:25 2002
+@@ -2444,6 +2444,9 @@
+ 	  *-*-openbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
  	    ;;
 +	  *-*-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 @@
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4210,10 +4213,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/multimedia/xmms/pkg-descr b/multimedia/xmms/pkg-descr
index c01e83a43c50..1e46d448f4a9 100644
--- a/multimedia/xmms/pkg-descr
+++ b/multimedia/xmms/pkg-descr
@@ -1,10 +1,6 @@
 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/
 
     eSk
-- 
cgit v1.2.3