From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Sep 5 12:30:26 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E44A816A4BF for ; Fri, 5 Sep 2003 12:30:26 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B548843FB1 for ; Fri, 5 Sep 2003 12:30:23 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h85JUNUp029825 for ; Fri, 5 Sep 2003 12:30:23 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h85JUNfN029824; Fri, 5 Sep 2003 12:30:23 -0700 (PDT) Resent-Date: Fri, 5 Sep 2003 12:30:23 -0700 (PDT) Resent-Message-Id: <200309051930.h85JUNfN029824@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, esk@ira.uka.de Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9B66C16A4BF for ; Fri, 5 Sep 2003 12:29:10 -0700 (PDT) Received: from iramx2.ira.uni-karlsruhe.de (iramx2.ira.uni-karlsruhe.de [141.3.10.81]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00C2743FEA for ; Fri, 5 Sep 2003 12:29:09 -0700 (PDT) (envelope-from esk@ira.uka.de) Received: from irams1.ira.uni-karlsruhe.de ([141.3.10.5] helo=irams1.ira.uka.de) by iramx2.ira.uni-karlsruhe.de with esmtp (Exim 3.30 #10 (Debian)) id 19vMGY-000614-00 for ; Fri, 05 Sep 2003 21:29:07 +0200 Received: from i30pc5.ibds.uni-karlsruhe.de ([141.3.40.155] helo=i30pc5.ira.uka.de) by irams1.ira.uka.de with esmtp (Exim 3.30 #7 (Debian)) for id 19vMGZ-0000ef-00; Fri, 05 Sep 2003 21:29:07 +0200 Received: from i30nb20 ([141.3.40.70] helo=i30nb20.os.uka.de) by i30pc5.ira.uka.de with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.22) id 19vMGZ-0003Cz-2d for FreeBSD-gnats-submit@freebsd.org; Fri, 05 Sep 2003 21:29:07 +0200 Received: from i30nb20.os.uka.de (localhost [127.0.0.1]) by i30nb20.os.uka.de (8.12.6p2/8.12.6) with ESMTP id h85JSq7e082921 for ; Fri, 5 Sep 2003 21:28:53 +0200 (CEST) (envelope-from esk@i30nb20.os.uka.de) Received: (from esk@localhost) by i30nb20.os.uka.de (8.12.6p2/8.12.6/Submit) id h85JSqHL082920; Fri, 5 Sep 2003 21:28:52 +0200 (CEST) (envelope-from esk) Message-Id: <200309051928.h85JSqHL082920@i30nb20.os.uka.de> Date: Fri, 5 Sep 2003 21:28:52 +0200 (CEST) From: Espen Skoglund To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/56504: [Maintainer update] multimedia/xmms to 1.2.8 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: esk@ira.uka.de List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2003 19:30:27 -0000 >Number: 56504 >Category: ports >Synopsis: [Maintainer update] multimedia/xmms to 1.2.8 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Sep 05 12:30:23 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Espen Skoglund >Release: FreeBSD 5.0-RELEASE-p10 i386 >Organization: Karlsruhe University >Environment: >Description: Update to xmms 1.2.8. See http://www.xmms.org/next_version.php for a full description. Added files: files/patch-configure Deleted files: files/patch-ad patch-libxmms::util.c This PR obsoletes ports/46089 and ports/47197. IPv6 is now supported in XMMS (obsoletes ports/54685), but is disabled by default since I have not had the chance to test it. >How-To-Repeat: >Fix: diff -ruN xmms.orig/Makefile xmms/Makefile --- xmms.orig/Makefile Tue Aug 19 03:25:29 2003 +++ xmms/Makefile Fri Sep 5 21:03:07 2003 @@ -6,16 +6,17 @@ # PORTNAME= xmms -PORTVERSION= 1.2.7 -PORTREVISION= 3 +PORTVERSION= 1.2.8 CATEGORIES+= multimedia audio -MASTER_SITES= ftp://ftp.xmms.org/xmms/1.2.x/ \ +MASTER_SITES= ftp://ftp.xmms.org/pub/xmms/1.2.x/ \ http://www.xmms.org/files/1.2.x/ \ ftp://ftp.sunet.se/pub/multimedia/xmms/1.2.x/ MAINTAINER?= esk@ira.uka.de COMMENT?= X Multimedia System --- An audio player with a Winamp GUI +LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv + USE_BZIP2= yes USE_X_PREFIX= yes USE_GNOME= gtk12 gnomehack libxml @@ -31,7 +32,7 @@ VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}" MAN1= gnomexmms.1 wmxmms.1 xmms.1 -INPUT_PLUGINS= cdaudio,idcin,mpg123,tonegen,wav +INPUT_PLUGINS= cdaudio,mpg123,tonegen,wav OUTPUT_PLUGINS= OSS,disk_writer VISUALIZATION_PLUGINS= blur_scope,sanalyzer @@ -109,6 +110,8 @@ post-patch: @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ 's|\(datadir\)/aclocal|(prefix)/share/aclocal|g' + @${REINPLACE_CMD} -e 's|{datadir}/locale|{prefix}/share/locale|g' \ + ${WRKSRC}/configure post-install: @${MKDIR} ${PREFIX}/share/xmms/Skins diff -ruN xmms.orig/distinfo xmms/distinfo --- xmms.orig/distinfo Tue Mar 5 22:09:07 2002 +++ xmms/distinfo Fri Sep 5 18:09:26 2003 @@ -1 +1 @@ -MD5 (xmms-1.2.7.tar.bz2) = 9bec488842920df359516b7d062d15dc +MD5 (xmms-1.2.8.tar.bz2) = d523735b59232f0eedd45dc2b7a4f5ad diff -ruN xmms.orig/files/patch-ad xmms/files/patch-ad --- xmms.orig/files/patch-ad Tue May 14 08:21:23 2002 +++ xmms/files/patch-ad Thu Jan 1 01:00:00 1970 @@ -1,25 +0,0 @@ - -$FreeBSD: ports/multimedia/xmms/files/patch-ad,v 1.12 2002/05/14 06:21:23 sobomax Exp $ - ---- configure.orig Mon Mar 4 23:57:01 2002 -+++ configure Tue May 14 09:06:50 2002 -@@ -10576,7 +10576,7 @@ - GMSGFMT="OLD_PO_FILE_INPUT=yes $GMSGFMT" - MSGFMT="OLD_PO_FILE_INPUT=yes $MSGFMT" - --localedir=${datadir}/locale -+localedir=${prefix}/share/locale - - - -@@ -12673,10 +12673,6 @@ - *) # Relative path. - ac_sub_cache_file="$ac_dots$cache_file" ;; - esac -- case "$ac_given_INSTALL" in -- [/$]*) INSTALL="$ac_given_INSTALL" ;; -- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; -- esac - - echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" - # The eval makes quoting arguments work. diff -ruN xmms.orig/files/patch-configure xmms/files/patch-configure --- xmms.orig/files/patch-configure Thu Jan 1 01:00:00 1970 +++ xmms/files/patch-configure Fri Sep 5 20:29:53 2003 @@ -0,0 +1,13 @@ +--- configure.orig Fri Sep 5 20:28:38 2003 ++++ configure Fri Sep 5 20:28:51 2003 +@@ -13928,10 +13928,6 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff -ruN xmms.orig/files/patch-libxmms::util.c xmms/files/patch-libxmms::util.c --- xmms.orig/files/patch-libxmms::util.c Fri Oct 11 20:25:41 2002 +++ xmms/files/patch-libxmms::util.c Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ ---- libxmms/util.c.orig Fri Jun 1 15:07:49 2001 -+++ libxmms/util.c Sun Oct 6 18:40:25 2002 -@@ -11,6 +11,7 @@ - #endif - - #ifdef __FreeBSD__ -+#include - #include - #endif - diff -ruN xmms.orig/files/patch-ltmain.sh xmms/files/patch-ltmain.sh --- xmms.orig/files/patch-ltmain.sh Tue Mar 5 22:09:09 2002 +++ xmms/files/patch-ltmain.sh Fri Sep 5 18:09:26 2003 @@ -1,19 +1,9 @@ $FreeBSD: ports/multimedia/xmms/files/patch-ltmain.sh,v 1.2 2002/03/05 21:09:09 pat Exp $ ---- 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 -@@ -4210,10 +4213,12 @@ +--- ltmain.sh.orig Fri Sep 5 13:18:43 2003 ++++ ltmain.sh Fri Sep 5 13:18:09 2003 +@@ -4333,10 +4333,12 @@ fi # Install the pseudo-library for information purposes. diff -ruN xmms.orig/files/patch-po::Makefile.in.in xmms/files/patch-po::Makefile.in.in --- xmms.orig/files/patch-po::Makefile.in.in Mon Aug 25 08:10:52 2003 +++ xmms/files/patch-po::Makefile.in.in Fri Sep 5 20:27:26 2003 @@ -1,10 +1,10 @@ ---- po/Makefile.in.in.orig Mon Mar 4 22:56:47 2002 -+++ po/Makefile.in.in Fri Aug 22 16:50:02 2003 -@@ -88,6 +88,7 @@ - $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ - --add-comments --keyword=_ --keyword=N_ \ +--- po/Makefile.in.in.orig Fri Sep 5 20:26:50 2003 ++++ po/Makefile.in.in Fri Sep 5 20:27:10 2003 +@@ -85,6 +85,7 @@ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=I18N: $(XGETTEXT_OPTIONS) \ --files-from=$(srcdir)/POTFILES.in \ + --from-code=ISO-8859-1 \ - && test ! -f $(PACKAGE).po \ - || ( rm -f $(srcdir)/$(PACKAGE).pot \ - && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) + --copyright-holder='$(COPYRIGHT_HOLDER)' + test ! -f $(DOMAIN).po || { \ + if test -f $(srcdir)/$(DOMAIN).pot; then \ diff -ruN xmms.orig/pkg-plist xmms/pkg-plist --- xmms.orig/pkg-plist Wed Aug 13 03:29:48 2003 +++ xmms/pkg-plist Fri Sep 5 18:09:26 2003 @@ -10,15 +10,13 @@ include/xmms/util.h include/xmms/xmmsctrl.h lib/libxmms.a -lib/libxmms.so -lib/libxmms.so.3 +lib/libxmms.so.4 lib/xmms/Effect/libecho.so lib/xmms/Effect/libstereo.so 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/libmpg123.so lib/xmms/Input/libtonegen.so lib/xmms/Input/libwav.so @@ -33,15 +31,21 @@ %%DATADIR%%/xmms/wmxmms.xpm share/locale/af/LC_MESSAGES/xmms.mo share/locale/az/LC_MESSAGES/xmms.mo +share/locale/be/LC_MESSAGES/xmms.mo share/locale/bg/LC_MESSAGES/xmms.mo +share/locale/bs/LC_MESSAGES/xmms.mo share/locale/ca/LC_MESSAGES/xmms.mo share/locale/cs/LC_MESSAGES/xmms.mo +share/locale/cy/LC_MESSAGES/xmms.mo share/locale/da/LC_MESSAGES/xmms.mo share/locale/de/LC_MESSAGES/xmms.mo share/locale/el/LC_MESSAGES/xmms.mo +share/locale/en/LC_MESSAGES/xmms.mo share/locale/eo/LC_MESSAGES/xmms.mo share/locale/es/LC_MESSAGES/xmms.mo +share/locale/et/LC_MESSAGES/xmms.mo share/locale/eu/LC_MESSAGES/xmms.mo +share/locale/fi/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 @@ -50,9 +54,11 @@ share/locale/id/LC_MESSAGES/xmms.mo share/locale/it/LC_MESSAGES/xmms.mo share/locale/ja/LC_MESSAGES/xmms.mo +share/locale/ka/LC_MESSAGES/xmms.mo share/locale/ko/LC_MESSAGES/xmms.mo share/locale/lt/LC_MESSAGES/xmms.mo share/locale/lv/LC_MESSAGES/xmms.mo +share/locale/mk/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 @@ -62,15 +68,20 @@ share/locale/ro/LC_MESSAGES/xmms.mo share/locale/ru/LC_MESSAGES/xmms.mo share/locale/sk/LC_MESSAGES/xmms.mo +share/locale/sl/LC_MESSAGES/xmms.mo +share/locale/sq/LC_MESSAGES/xmms.mo share/locale/sr/LC_MESSAGES/xmms.mo +share/locale/sr@Latn/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/uz/LC_MESSAGES/xmms.mo +share/locale/uz@Cyrl/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_CN/LC_MESSAGES/xmms.mo share/locale/zh_TW/LC_MESSAGES/xmms.mo @dirrm %%DATADIR%%/xmms @dirrm lib/xmms/Visualization >Release-Note: >Audit-Trail: >Unformatted: