ports/173752: [PATCH] audio/xmms-sid update to 0.8.98.2

Wed Nov 21 04:50:01 UTC 2012

>Number:         173752
>Category:       ports
>Synopsis:       [PATCH] audio/xmms-sid update to 0.8.98.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 21 04:50:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Chris Petrik
>Release:        
>Organization:
na
>Environment:
>Description:
Update to 0.8.98.2
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: xmms-sid/Makefile
==================================================================

--- xmms-sid/Makefile
+++ xmms-sid/Makefile
@@ -1,11 +1,10 @@
 # Created by: David Yeske <dyeske at gmail.com>
 # $FreeBSD: head/audio/xmms-sid/Makefile 305074 2012-09-30 06:25:19Z rm $
 
 PORTNAME=	xmms-sid
-PORTVERSION=	0.7.4
-PORTREVISION=	5
+PORTVERSION=	0.8.98.2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.tnsp.org/xs-files/
 
 MAINTAINER=	c.petrik.sosa at gmail.com
 COMMENT=	XMMS input plugin to play SID files
@@ -12,19 +11,13 @@
 
 LIB_DEPENDS=	sidplay.1:${PORTSDIR}/audio/libsidplay
 BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
-PLIST_FILES=	lib/xmms/Input/libsid.so
 USE_BZIP2=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|^CFLAGS = -O2 -W -Wall|CFLAGS = @CFLAGS@ |; \
-		s|-lstdc++||; \
-		s|^LIBS = -lsidplay|LIBS = -lsidplay -lstdc++|' \
-		${BUILD_WRKSRC}/src/Makefile.in
-	@${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/configure
+CONFIGURE_ARGS+=	--prefix=${PREFIX} \
+			--with-sidplay1=${PREFIX}
 
 .include <bsd.port.mk>

Index: xmms-sid/distinfo
==================================================================
--- xmms-sid/distinfo
+++ xmms-sid/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xmms-sid-0.7.4.tar.bz2) = 12605bc7d9b0cf0aa182019f70e63f87dc5d7a29487e31c1444fe02e088da003
-SIZE (xmms-sid-0.7.4.tar.bz2) = 165624
+SHA256 (xmms-sid-0.8.98.2.tar.bz2) = 67ab7a2a1b0fb36d165fbbc79e3da2e53c9b9b253a84b53bcfb25f27f33b8492
+SIZE (xmms-sid-0.8.98.2.tar.bz2) = 638847

Index: xmms-sid/files/patch-ltmain.sh
==================================================================
--- xmms-sid/files/patch-ltmain.sh
+++ xmms-sid/files/patch-ltmain.sh
@@ -1,16 +1,18 @@
---- ltmain.sh.orig	Wed Mar 27 14:10:10 2002
-+++ ltmain.sh	Mon Sep  9 02:23:20 2002
-@@ -4209,11 +4209,13 @@
- 	  IFS="$save_ifs"
+--- ltmain.sh.bak	2012-11-20 07:44:50.000000000 -0600
++++ ltmain.sh	2012-11-20 07:45:18.000000000 -0600
+@@ -3020,13 +3020,13 @@
+ 	  lib="$destdir/$realname"
+ 	  func_execute_cmds "$postinstall_cmds" 'exit $?'
  	fi
- 
+-
 +	if /usr/bin/false; then
  	# Install the pseudo-library for information purposes.
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	func_basename "$file"
+ 	name="$func_basename_result"
  	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
+ 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+-
 +	fi
- 
  	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+ 	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+ 	;;

ADDED   xmms-sid/files/patch-src-xs_config.c
Index: xmms-sid/files/patch-src-xs_config.c
==================================================================
--- xmms-sid/files/patch-src-xs_config.c
+++ xmms-sid/files/patch-src-xs_config.c
@@ -0,0 +1,10 @@
+--- src/xs_config.c.bak 2012-11-20 08:49:34.000000000 -0600
++++ src/xs_config.c     2012-11-20 08:50:23.000000000 -0600
+@@ -284,6 +284,7 @@
+            xs_cfg.sid2Builder = XS_BLD_RESID; break;
+ #endif
+ #endif
++break;
+     }
+
+     return TRUE;

DELETED xmms-sid/files/patch-src::xmms-sid.cc
Index: xmms-sid/files/patch-src::xmms-sid.cc
==================================================================
--- xmms-sid/files/patch-src::xmms-sid.cc
+++ xmms-sid/files/patch-src::xmms-sid.cc
@@ -1,11 +0,0 @@
---- src/xmms-sid.cc.orig	Thu Aug 26 15:18:41 2004
-+++ src/xmms-sid.cc	Thu Aug 26 15:22:22 2004
-@@ -196,7 +196,7 @@
- 	int fxlen, tn;
- 	struct sidTuneInfo sidInf;
- 	char *name;
--	enum AFormat fmt = (xs_emuConf.bitsPerSample == 16) ? FMT_S16_NE : FMT_U8;
-+	AFormat fmt = (xs_emuConf.bitsPerSample == 16) ? FMT_S16_NE : FMT_U8;
- 	gint chn = xs_emuConf.channels;
- 
- 	tune->getInfo(sidInf);

ADDED   xmms-sid/pkg-plist
Index: xmms-sid/pkg-plist
==================================================================
--- xmms-sid/pkg-plist
+++ xmms-sid/pkg-plist
@@ -0,0 +1,12 @@
+lib/xmms/Input/libxmmssid.so
+share/locale/de/LC_MESSAGES/xmms-sid.mo
+share/locale/en at boldquot/LC_MESSAGES/xmms-sid.mo
+share/locale/en at quot/LC_MESSAGES/xmms-sid.mo
+share/locale/fi/LC_MESSAGES/xmms-sid.mo
+share/xmms-sid/Kummatti_City.sid
+ at dirrm share/locale/en at quot
+ at dirrm share/locale/en at quot/LC_MESSAGES
+ at dirrm share/locale/en at boldquot
+ at dirrm share/locale/en at boldquot/LC_MESSAGES
+ at dirrm share/xmms-sid
+



>Release-Note:
>Audit-Trail:
>Unformatted:
