ports/59076: An update for multimedia/xmms port (new knob)

[oleg dashevskii]

The following reply was made to PR ports/59076; it has been noted by GNATS.

From: oleg dashevskii <be9 at be9.ru>
To: Oliver Eikemeier <eikemeier at fillmore-labs.com>
Cc: Espen Skoglund <esk at ira.uka.de>, freebsd-ports-bugs at FreeBSD.org,
	freebsd-gnats-submit at 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 at 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--