5 files changed, 51 insertions, 52 deletions

diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index 3d579e910578..a94acd76e41a 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -6,26 +6,20 @@
 #
 
 PORTNAME=	xmms-flac
-PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTVERSION=	1.1.2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	flac
 DISTNAME=	flac-${PORTVERSION}
 
-PATCH_SITES=	${MASTER_SITE_DEBIAN}
-PATCH_SITE_SUBDIR=	pool/main/f/flac
-PATCHFILES=	flac_1.1.0-11.diff.gz
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	XMMS input plugin for playing FLAC files
 
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
-		FLAC.5:${PORTSDIR}/audio/flac
+		FLAC.7:${PORTSDIR}/audio/flac
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--with-libiconv-prefix="${LOCALBASE}" \
 		--with-ogg="${LOCALBASE}" \
 		--with-xmms-prefix="${X11BASE}"
@@ -36,4 +30,8 @@ MAKEFILE=	${FILESDIR}/Makefile
 post-configure:
 	@${RM} -rf ${WRKSRC}/obj
 
+# XXX
+post-install:
+	@${RM} ${PREFIX}/lib/xmms/Input/libxmms-flac.la
+
 .include <bsd.port.mk>
diff --git a/audio/xmms-flac/distinfo b/audio/xmms-flac/distinfo
index f29bc49bf982..a6d2b4b2f674 100644
--- a/audio/xmms-flac/distinfo
+++ b/audio/xmms-flac/distinfo
@@ -1,4 +1,2 @@
-MD5 (flac-1.1.0.tar.gz) = 19b456a27b5fcf502c76cc33f33e1490
-SIZE (flac-1.1.0.tar.gz) = 1201861
-MD5 (flac_1.1.0-11.diff.gz) = 56285480c9a3c029bdad6d3226e6eaa2
-SIZE (flac_1.1.0-11.diff.gz) = 51614
+MD5 (flac-1.1.2.tar.gz) = 2bfc127cdda02834d0491ab531a20960
+SIZE (flac-1.1.2.tar.gz) = 1516235
diff --git a/audio/xmms-flac/files/patch-configure b/audio/xmms-flac/files/patch-configure
index b16793a26fae..21b1a45cd09e 100644
--- a/audio/xmms-flac/files/patch-configure
+++ b/audio/xmms-flac/files/patch-configure
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Sun Feb 23 01:11:25 2003
-+++ configure	Sun Feb 23 01:11:27 2003
-@@ -7817,6 +7817,7 @@
+--- configure.orig
++++ configure
+@@ -7976,6 +7976,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,30 +11,15 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9818,6 +9819,8 @@
-   fi
- 
- 
-+# Disable id3lib detection
-+if false; then
- 
- # Check whether --with-id3lib or --without-id3lib was given.
- if test "${with_id3lib+set}" = set; then
-@@ -10006,6 +10009,8 @@
- 
- 	rm -f conf.id3libtest
- 
-+fi
-+have_id3lib=no
- 
- 
- if test x$have_id3lib = xyes; then
-@@ -11713,7 +11718,7 @@
+@@ -10541,9 +10542,9 @@
  if test x$debug = xtrue; then
  	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
  else
--	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -DNDEBUG"
+-	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O2 -DNDEBUG"
 +	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
  	if test x$GCC = xyes; then
- 		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
+-		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
++		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -Wall -W -DFLaC__INLINE=__inline__"
  	fi
+ fi
+ CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"
diff --git a/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in b/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in
index 7c784eaa96b1..5470ca6c20bd 100644
--- a/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in
+++ b/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in
@@ -1,25 +1,25 @@
 
 $FreeBSD$
 
---- src/plugin_xmms/Makefile.in.orig	Tue Jun 10 00:24:23 2003
-+++ src/plugin_xmms/Makefile.in	Tue Jun 10 00:25:16 2003
-@@ -173,8 +173,7 @@
+--- src/plugin_xmms/Makefile.in.orig
++++ src/plugin_xmms/Makefile.in
+@@ -77,8 +77,7 @@
  	$(top_builddir)/src/share/grabbag/libgrabbag.la \
- 	$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
+ 	$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
+ 	$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
+-	$(top_builddir)/src/share/utf8/libutf8.la \
+-	$(top_builddir)/src/libFLAC/libFLAC.la
++	$(top_builddir)/src/share/utf8/libutf8.la
+ am__objects_1 = charset.lo configure.lo fileinfo.lo http.lo plugin.lo \
+ 	tag.lo
+ am_libxmms_flac_la_OBJECTS = $(am__objects_1)
+@@ -296,8 +295,7 @@
+ 	$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
+ 	$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
  	$(top_builddir)/src/share/utf8/libutf8.la \
 -	$(top_builddir)/src/libFLAC/libFLAC.la \
 -	-L$(top_builddir)/src/libFLAC/.libs \
 +	-lFLAC \
  	@XMMS_LIBS@ \
- 	@ID3LIB_LIBS@
+ 	@LIBICONV@
  
-@@ -189,8 +188,7 @@
- 	$(top_builddir)/src/plugin_common/libplugin_common.la \
- 	$(top_builddir)/src/share/grabbag/libgrabbag.la \
- 	$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
--	$(top_builddir)/src/share/utf8/libutf8.la \
--	$(top_builddir)/src/libFLAC/libFLAC.la
-+	$(top_builddir)/src/share/utf8/libutf8.la
- am__objects_1 = charset.lo configure.lo plugin.lo wrap_id3.lo \
- 	fileinfo.lo
- @FLaC__HAS_ID3LIB_TRUE@am_libxmms_flac_la_OBJECTS = $(am__objects_1)
diff --git a/audio/xmms-flac/files/patch-src_plugin__xmms_plugin.c b/audio/xmms-flac/files/patch-src_plugin__xmms_plugin.c
new file mode 100644
index 000000000000..9cc9f8ed6995
--- /dev/null
+++ b/audio/xmms-flac/files/patch-src_plugin__xmms_plugin.c
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- src/plugin_xmms/plugin.c.orig
++++ src/plugin_xmms/plugin.c
+@@ -259,6 +259,12 @@
+ 
+ 	/* stream */
+ 
++	/* XXX allow indiscriminate use of g_free() */
++	flac_cfg.stream.proxy_host = g_strdup("");
++	flac_cfg.stream.proxy_user = g_strdup("");
++	flac_cfg.stream.proxy_pass = g_strdup("");
++	flac_cfg.stream.save_http_path = g_strdup("");
++
+ 	xmms_cfg_read_int(cfg, "flac", "stream.http_buffer_size", &flac_cfg.stream.http_buffer_size);
+ 	xmms_cfg_read_int(cfg, "flac", "stream.http_prebuffer", &flac_cfg.stream.http_prebuffer);
+ 	xmms_cfg_read_boolean(cfg, "flac", "stream.use_proxy", &flac_cfg.stream.use_proxy);