Update to version 0.8.99.2

PR:		ports/173752
Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com> (maintainer)
Feature safe:	yes

6 files changed, 39 insertions, 33 deletions

diff --git a/audio/xmms-sid/Makefile b/audio/xmms-sid/Makefile
index 9a831381d76f..90c611cfa3ca 100644
--- a/audio/xmms-sid/Makefile
+++ b/audio/xmms-sid/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmms-sid
-PORTVERSION=	0.7.4
-PORTREVISION=	5
+PORTVERSION=	0.8.99.2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.tnsp.org/xs-files/
 
@@ -14,17 +13,12 @@ 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_GETTEXT=	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=${LOCALBASE}
 
 .include <bsd.port.mk>
diff --git a/audio/xmms-sid/distinfo b/audio/xmms-sid/distinfo
index f6d69375adf8..1b5f804ccb87 100644
--- a/audio/xmms-sid/distinfo
+++ b/audio/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.99.2.tar.bz2) = f85defb03b88d50ccf85fb991cc04644223cc97a6956e2240e74f8e20effdc1e
+SIZE (xmms-sid-0.8.99.2.tar.bz2) = 640223
diff --git a/audio/xmms-sid/files/patch-ltmain.sh b/audio/xmms-sid/files/patch-ltmain.sh
index 3f6b404b5bfb..eb1649aa4888 100644
--- a/audio/xmms-sid/files/patch-ltmain.sh
+++ b/audio/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"
+ 	;;
diff --git a/audio/xmms-sid/files/patch-src-xs_config.c b/audio/xmms-sid/files/patch-src-xs_config.c
new file mode 100644
index 000000000000..0619e5bec036
--- /dev/null
+++ b/audio/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;
diff --git a/audio/xmms-sid/files/patch-src::xmms-sid.cc b/audio/xmms-sid/files/patch-src::xmms-sid.cc
deleted file mode 100644
index cb54cc95ef68..000000000000
--- a/audio/xmms-sid/files/patch-src::xmms-sid.cc
+++ /dev/null
@@ -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);
diff --git a/audio/xmms-sid/pkg-plist b/audio/xmms-sid/pkg-plist
new file mode 100644
index 000000000000..229269d77e7b
--- /dev/null
+++ b/audio/xmms-sid/pkg-plist
@@ -0,0 +1,11 @@
+lib/xmms/Input/libxmmssid.so
+share/locale/de/LC_MESSAGES/xmms-sid.mo
+share/locale/en@boldquot/LC_MESSAGES/xmms-sid.mo
+share/locale/en@quot/LC_MESSAGES/xmms-sid.mo
+share/locale/fi/LC_MESSAGES/xmms-sid.mo
+share/xmms-sid/Kummatti_City.sid
+@dirrmtry share/locale/en@quot
+@dirrmtry share/locale/en@quot/LC_MESSAGES
+@dirrmtry share/locale/en@boldquot
+@dirrmtry share/locale/en@boldquot/LC_MESSAGES
+@dirrm share/xmms-sid