From od@lab15.iae.nsk.su  Sun Nov  9 04:09:59 2003
Return-Path: <od@lab15.iae.nsk.su>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 03DA616A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Nov 2003 04:09:59 -0800 (PST)
Received: from lab15.iae.nsk.su (L312-216-1.iae.nsk.su [193.124.169.107])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 20F6043FCB
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Nov 2003 04:09:58 -0800 (PST)
	(envelope-from od@lab15.iae.nsk.su)
Received: by lab15.iae.nsk.su (Postfix, from userid 1001)
	id 2231E43A; Sun,  9 Nov 2003 18:09:56 +0600 (NOVT)
Message-Id: <20031109120956.2231E43A@lab15.iae.nsk.su>
Date: Sun,  9 Nov 2003 18:09:56 +0600 (NOVT)
From: oleg dashevskii <be9-ml@be9.ru>
Reply-To: oleg dashevskii <be9-ml@be9.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: An update for multimedia/xmms port (new knob)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         59076
>Category:       ports
>Synopsis:       An update for multimedia/xmms port (new knob)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 09 04:20:16 PST 2003
>Closed-Date:    Thu Dec 04 02:43:06 PST 2003
>Last-Modified:  Thu Dec 04 02:43:06 PST 2003
>Originator:     oleg dashevskii
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
IAE SB RAS
>Environment:
System: FreeBSD lab15.iae.nsk.su 4.8-STABLE FreeBSD 4.8-STABLE #0: Thu Aug 14 18:38:32 NOVST 2003 od@lab15.iae.nsk.su:/usr/obj/usr/src/sys/LAB15 i386


	
>Description:

Introducing a new Makefile knob: WITH_ENCODING_PATCH
Allows for automatic Russian encoding detection in ID3 tags, filenames, etc
The knob will be used by russian/xmms port which comes in the next PR.

>How-To-Repeat:
	
>Fix:

--- xmms.patch begins here ---
diff -urN /usr/ports/multimedia/xmms/Makefile xmms/Makefile
--- /usr/ports/multimedia/xmms/Makefile	Fri Oct 31 15:58:40 2003
+++ xmms/Makefile	Sun Nov  9 17:52:35 2003
@@ -9,9 +9,10 @@
 PORTVERSION=	1.2.8
 PORTREVISION=	2
 CATEGORIES+=	multimedia audio ipv6
-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/
+MASTER_SITES=	ftp://ftp.xmms.org/pub/xmms/1.2.x/:dist \
+		http://www.xmms.org/files/1.2.x/:dist \
+		ftp://ftp.sunet.se/pub/multimedia/xmms/1.2.x/:dist
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX}:dist
 
 MAINTAINER?=	esk@ira.uka.de
 COMMENT?=	X Multimedia System --- An audio player with a Winamp GUI
@@ -39,6 +40,13 @@
 
 PLIST_SUB=	DATADIR="share"
 
+.if defined(WITH_ENCODING_PATCH)
+PATCHLEVEL=		22.2
+DISTFILES+=		${PORTNAME}-${PORTVERSION}-recode-csa${PATCHLEVEL}${EXTRACT_SUFX}:patch
+MASTER_SITE_SUBDIR=     /:dist rusxmms:patch
+MASTER_SITES+=			${MASTER_SITE_SOURCEFORGE:S/$/:patch/}
+.endif
+
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--enable-ipv6
@@ -111,6 +119,9 @@
 .endif
 
 post-patch:
+.if defined(WITH_ENCODING_PATCH)
+	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/xmms-ds-recode.patch
+.endif
 	@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' \
diff -urN /usr/ports/multimedia/xmms/distinfo xmms/distinfo
--- /usr/ports/multimedia/xmms/distinfo	Fri Oct 31 15:58:40 2003
+++ xmms/distinfo	Sun Nov  9 17:44:49 2003
@@ -1 +1,2 @@
 MD5 (xmms-1.2.8.tar.bz2) = d523735b59232f0eedd45dc2b7a4f5ad
+MD5 (xmms-1.2.8-recode-csa22.2.tar.bz2) = c312257adb8d05d4f597a0c8c8c8d40e
--- xmms.patch ends here ---


>Release-Note:
>Audit-Trail:

From: Espen Skoglund <esk@ira.uka.de>
To: freebsd-gnats-submit@FreeBSD.org, be9-ml@be9.ru
Cc:  
Subject: Re: ports/59076: An update for multimedia/xmms port (new knob)
Date: Mon, 17 Nov 2003 15:04:55 +0100

 I am not able to fetch the patchfile.  I would also strongly suggest
 using PATCHFILES and PATCH_SITES for this kind of stuff.  As for
 checking whether the patch itself is sane, I don't think I am the
 right person for checking this.
 
 	eSk

From: oleg dashevskii <be9@be9.ru>
To: Oliver Eikemeier <eikemeier@fillmore-labs.com>
Cc: Espen Skoglund <esk@ira.uka.de>, freebsd-ports-bugs@FreeBSD.org,
	freebsd-gnats-submit@freebsd.org
Subject: Re: ports/59076: An update for multimedia/xmms port (new knob)
Date: Mon, 17 Nov 2003 21:31:38 +0600

 --sdtB3X0nJg68CQEu
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 On Mon, Nov 17, 2003 at 03:19:29PM +0100, Oliver Eikemeier wrote:
 
 > > I am not able to fetch the patchfile.  I would also strongly suggest
 > > using PATCHFILES and PATCH_SITES for this kind of stuff.  As for
 
 No way. Here's a quote from porter's handbook:
 
 "If the patch is distributed with some other files, such as
 documentation, in a gzip'd tarball, you cannot just use PATCHFILES. If
 that is the case, add the name and the location of the patch tarball to
 DISTFILES and MASTER_SITES."
 
 That's exactly the reason for me using MASTER_SITES.
 
 > > checking whether the patch itself is sane, I don't think I am the
 > > right person for checking this.
 
 > Seems to be an reasonable alternative. Close?
 
 As for unfetchable distfile, the last update in bsd.port.mk seems to
 have broken the grouping feature. Attached is a new version of patch.
 
 --
 be9
 
 --sdtB3X0nJg68CQEu
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="xmms.patch"
 
 diff -ur /home/od-mx/xmms/Makefile xmms/Makefile
 --- /home/od-mx/xmms/Makefile	Mon Nov 17 20:25:56 2003
 +++ xmms/Makefile	Mon Nov 17 21:27:50 2003
 @@ -7,11 +7,12 @@
  
  PORTNAME=	xmms
  PORTVERSION=	1.2.8
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES+=	multimedia audio ipv6
 -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/
 +MASTER_SITES=	ftp://ftp.xmms.org/pub/xmms/1.2.x/:dist \
 +		http://www.xmms.org/files/1.2.x/:dist \
 +		ftp://ftp.sunet.se/pub/multimedia/xmms/1.2.x/:dist
 +DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:dist
  
  MAINTAINER?=	esk@ira.uka.de
  COMMENT?=	X Multimedia System --- An audio player with a Winamp GUI
 @@ -39,6 +40,13 @@
  
  PLIST_SUB=	DATADIR="share"
  
 +.if defined(WITH_ENCODING_PATCH)
 +PATCHLEVEL=	22.2
 +DISTFILES+=	${PORTNAME}-${PORTVERSION}-recode-csa${PATCHLEVEL}${EXTRACT_SUFX}
 +MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE}
 +MASTER_SITE_SUBDIR=	rusxmms
 +.endif
 +
  .include <bsd.port.pre.mk>
  
  CONFIGURE_ARGS+=	--enable-ipv6
 @@ -111,6 +119,9 @@
  .endif
  
  post-patch:
 +.if defined(WITH_ENCODING_PATCH)
 +	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/xmms-ds-recode.patch
 +.endif
  	@${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' \
 diff -ur /home/od-mx/xmms/distinfo xmms/distinfo
 --- /home/od-mx/xmms/distinfo	Mon Nov 17 20:25:56 2003
 +++ xmms/distinfo	Mon Nov 17 20:27:32 2003
 @@ -1 +1,2 @@
  MD5 (xmms-1.2.8.tar.bz2) = d523735b59232f0eedd45dc2b7a4f5ad
 +MD5 (xmms-1.2.8-recode-csa22.2.tar.bz2) = c312257adb8d05d4f597a0c8c8c8d40e
 
 --sdtB3X0nJg68CQEu--
State-Changed-From-To: open->feedback 
State-Changed-By: mat 
State-Changed-When: Wed Nov 26 06:30:43 PST 2003 
State-Changed-Why:  
Maintainer advised 

http://www.freebsd.org/cgi/query-pr.cgi?pr=59076 

From: Mathieu Arnold <mat@FreeBSD.org>
To: Espen Skoglund <esk@ira.uka.de>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/59076: An update for multimedia/xmms port (new knob)
Date: Wed, 26 Nov 2003 16:28:57 +0100

 Dear maintainer, could you approve or disaprove PR 59076
  <http://www.freebsd.org/cgi/query-pr.cgi?pr=59076>
 Thanks,
 
 -- 
 Mathieu Arnold

From: Espen Skoglund <esk@ira.uka.de>
To: freebsd-gnats-submit@FreeBSD.org, be9-ml@be9.ru
Cc:  
Subject: Re: ports/59076: An update for multimedia/xmms port (new knob)
Date: Wed, 26 Nov 2003 19:43:20 +0100

 --4KCQ6SpJK4
 Content-Type: text/plain; charset=us-ascii
 Content-Description: message body text
 Content-Transfer-Encoding: 7bit
 
 Here's a less intrusive version of the patch.  Note that doing
 "subdir:group" for MASTER_SITE_SUBDIR does for some reason not work.
 A little workaround (hack) is therefore required.
 
 
 --4KCQ6SpJK4
 Content-Type: application/octet-stream
 Content-Disposition: attachment;
 	filename="xmms.diff"
 Content-Transfer-Encoding: base64
 
 ZGlmZiAtcnVOIHhtbXMub3JpZy9NYWtlZmlsZSB4bW1zL01ha2VmaWxlCi0tLSB4bW1zLm9y
 aWcvTWFrZWZpbGUJV2VkIE5vdiAyNiAxNzo0MTowNSAyMDAzCisrKyB4bW1zL01ha2VmaWxl
 CVdlZCBOb3YgMjYgMTk6MzQ6MTIgMjAwMwpAQCAtMTIsNiArMTIsNyBAQAogTUFTVEVSX1NJ
 VEVTPQlmdHA6Ly9mdHAueG1tcy5vcmcvcHViL3htbXMvMS4yLngvIFwKIAkJaHR0cDovL3d3
 dy54bW1zLm9yZy9maWxlcy8xLjIueC8gXAogCQlmdHA6Ly9mdHAuc3VuZXQuc2UvcHViL211
 bHRpbWVkaWEveG1tcy8xLjIueC8KK0RJU1RGSUxFUz0JJHtESVNUTkFNRX0ke0VYVFJBQ1Rf
 U1VGWH0KIAogTUFJTlRBSU5FUj89CWVza0BpcmEudWthLmRlCiBDT01NRU5UPz0JWCBNdWx0
 aW1lZGlhIFN5c3RlbSAtLS0gQW4gYXVkaW8gcGxheWVyIHdpdGggYSBXaW5hbXAgR1VJCkBA
 IC00Myw2ICs0NCwxNCBAQAogCiBDT05GSUdVUkVfQVJHUys9CS0tZW5hYmxlLWlwdjYKIAor
 LmlmIGRlZmluZWQoV0lUSF9FTkNPRElOR19QQVRDSCkKK0VOQ19QQVRDSExFVkVMPQkyMi4y
 CitESVNURklMRVMrPQkke1BPUlROQU1FfS0ke1BPUlRWRVJTSU9OfS1yZWNvZGUtY3NhJHtF
 TkNfUEFUQ0hMRVZFTH0ke0VYVFJBQ1RfU1VGWH06ZW5jCitNQVNURVJfU0lURVMrPQkke01B
 U1RFUl9TSVRFX1NPVVJDRUZPUkdFOlMvJC86ZW5jL30KKyNNQVNURVJfU0lURV9TVUJESVIr
 PQlydXN4bW1zOmVuYwkJIyMgRG9lcyBub3Qgd29yaworX01BU1RFUl9TSVRFX1NVQkRJUl9l
 bmM9CXJ1c3htbXMKKy5lbmRpZgorCiAuaWYgIWRlZmluZWQoV0lUSE9VVF9NSUtNT0QpCiBM
 SUJfREVQRU5EUys9CW1pa21vZC4yOiR7UE9SVFNESVJ9L2F1ZGlvL2xpYm1pa21vZAogSU5Q
 VVRfUExVR0lOUys9CW1pa21vZApAQCAtMTExLDYgKzEyMCw5IEBACiAuZW5kaWYKIAogcG9z
 dC1wYXRjaDoKKy5pZiBkZWZpbmVkKFdJVEhfRU5DT0RJTkdfUEFUQ0gpCisJQCR7UEFUQ0h9
 IC1zIC1wMSAtZCAke1dSS1NSQ30gPCAke1dSS0RJUn0veG1tcy1kcy1yZWNvZGUucGF0Y2gK
 Ky5lbmRpZgogCUAke0ZJTkR9ICR7V1JLU1JDfSAtbmFtZSAiTWFrZWZpbGUuaW4qIiB8ICR7
 WEFSR1N9ICR7UkVJTlBMQUNFX0NNRH0gLWUgXAogCQkgJ3N8XChkYXRhZGlyXCkvYWNsb2Nh
 bHwocHJlZml4KS9zaGFyZS9hY2xvY2FsfGcnCiAJQCR7UkVJTlBMQUNFX0NNRH0gLWUgJ3N8
 e2RhdGFkaXJ9L2xvY2FsZXx7cHJlZml4fS9zaGFyZS9sb2NhbGV8ZycgXApkaWZmIC1ydU4g
 eG1tcy5vcmlnL2Rpc3RpbmZvIHhtbXMvZGlzdGluZm8KLS0tIHhtbXMub3JpZy9kaXN0aW5m
 bwlXZWQgTm92IDI2IDE3OjQxOjA1IDIwMDMKKysrIHhtbXMvZGlzdGluZm8JV2VkIE5vdiAy
 NiAxODoyOTozNSAyMDAzCkBAIC0xICsxLDIgQEAKIE1ENSAoeG1tcy0xLjIuOC50YXIuYnoy
 KSA9IGQ1MjM3MzViNTkyMzJmMGVlZGQ0NWRjMmI3YTRmNWFkCitNRDUgKHhtbXMtMS4yLjgt
 cmVjb2RlLWNzYTIyLjIudGFyLmJ6MikgPSBjMzEyMjU3YWRiOGQwNWQ0ZjU5N2EwYzhjOGM4
 ZDQwZQo=
 
 --4KCQ6SpJK4--

From: oleg dashevskii <be9-ml@be9.ru>
To: Espen Skoglund <esk@ira.uka.de>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/59076: An update for multimedia/xmms port (new knob)
Date: Thu, 27 Nov 2003 00:55:29 +0600

 On Wed, Nov 26, 2003 at 07:43:20PM +0100, Espen Skoglund wrote:
 Content-Description: message body text
 > Here's a less intrusive version of the patch.  Note that doing
 > "subdir:group" for MASTER_SITE_SUBDIR does for some reason not work.
 > A little workaround (hack) is therefore required.
 
 Ah, that's ok. I used :dist due to the same reason of something having
 been broken. More intrusive, less hack. You preferred less intrusive,
 more hack, that's it. :-)
 
 --
 be9
State-Changed-From-To: feedback->open 
State-Changed-By: pav 
State-Changed-When: Wed Nov 26 12:14:49 PST 2003 
State-Changed-Why:  
Feedback received. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=59076 
State-Changed-From-To: open->analyzed 
State-Changed-By: pav 
State-Changed-When: Wed Nov 26 17:14:13 PST 2003 
State-Changed-Why:  
I'll commit this after the freeze. 


Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Wed Nov 26 17:14:13 PST 2003 
Responsible-Changed-Why:  
I'll commit this after the freeze. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=59076 
State-Changed-From-To: analyzed->closed 
State-Changed-By: pav 
State-Changed-When: Thu Dec 4 02:42:57 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=59076 
>Unformatted:
