ports/76609: Update flac to version 1.1.1

"Michael Nottebrock" <Michael Nottebrock michaelnottebrock at gmx.net
Sun Jan 23 21:50:21 UTC 2005


>Number:         76609
>Category:       ports
>Synopsis:       Update flac to version 1.1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 23 21:50:20 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Michael Nottebrock
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
>Environment:


System: FreeBSD 4.11-STABLE #3: Sun Jan  9 15:26:53 CET 2005
    root at kiste:/usr/obj/usr/src/sys/KISTE-UP



>Description:


Updates flac, xmms-flac to version 1.1.1, including chasing the shared library bump in upstream dependencies.


>How-To-Repeat:





>Fix:


--- flac.diff begins here ---
Index: audio/alsaplayer/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/alsaplayer/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- audio/alsaplayer/Makefile	9 Jul 2004 17:41:50 -0000	1.9
+++ audio/alsaplayer/Makefile	23 Jan 2005 21:28:06 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	alsaplayer
 PORTVERSION=	0.99.75
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/people/andy/ \
 		http://www.alsaplayer.org/
@@ -95,7 +95,7 @@
 CONFIGURE_ARGS+=	--disable-flac
 PLIST_SUB+=		FLAC="@comment "
 .else
-LIB_DEPENDS+=		FLAC.5:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=		FLAC.6:${PORTSDIR}/audio/flac
 CONFIGURE_ARGS+=	--enable-flac
 PLIST_SUB+=		FLAC=""
 .endif
Index: audio/flac123/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/flac123/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- audio/flac123/Makefile	15 May 2004 15:19:53 -0000	1.1
+++ audio/flac123/Makefile	23 Jan 2005 21:28:06 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	flac123
 PORTVERSION=	0.0.7
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	flac-tools
@@ -16,7 +17,7 @@
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		ao.3:${PORTSDIR}/audio/libao \
-		FLAC.5:${PORTSDIR}/audio/flac
+		FLAC.6:${PORTSDIR}/audio/flac
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
Index: audio/muine/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/muine/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- audio/muine/Makefile	30 Dec 2004 00:59:14 -0000	1.6
+++ audio/muine/Makefile	23 Jan 2005 21:28:06 -0000
@@ -7,14 +7,14 @@
 
 PORTNAME=	muine
 PORTVERSION=	0.6.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://muine.gooeylinux.org/
 
 MAINTAINER=	tmclaugh at sdf.lonestar.org
 COMMENT=	Mono based Gnome audio player
 
-LIB_DEPENDS=	FLAC.5:${PORTSDIR}/audio/flac \
+LIB_DEPENDS=	FLAC.6:${PORTSDIR}/audio/flac \
 		id3tag.2:${PORTSDIR}/audio/libid3tag \
 		gdbm:${PORTSDIR}/databases/gdbm
 BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp
Index: audio/easytag/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/easytag/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- audio/easytag/Makefile	16 Jan 2005 01:36:48 -0000	1.33
+++ audio/easytag/Makefile	23 Jan 2005 21:28:06 -0000
@@ -8,6 +8,7 @@
 
 PORTNAME=	easytag
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +18,7 @@
 
 LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
-		FLAC.5:${PORTSDIR}/audio/flac
+		FLAC.6:${PORTSDIR}/audio/flac
 
 MAN1=		easytag.1
 
Index: audio/rhythmbox/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/rhythmbox/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- audio/rhythmbox/Makefile	31 Dec 2004 17:47:42 -0000	1.52
+++ audio/rhythmbox/Makefile	23 Jan 2005 21:28:06 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	rhythmbox
 PORTVERSION=	0.8.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
@@ -17,7 +17,7 @@
 COMMENT=	Audio player for the Gnome 2 desktop environment
 
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
-		FLAC.5:${PORTSDIR}/audio/flac \
+		FLAC.6:${PORTSDIR}/audio/flac \
 		mad.2:${PORTSDIR}/audio/libmad \
 		id3tag.2:${PORTSDIR}/audio/libid3tag
 
Index: audio/sdl_sound/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/sdl_sound/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- audio/sdl_sound/Makefile	23 Jul 2004 09:17:53 -0000	1.12
+++ audio/sdl_sound/Makefile	23 Jan 2005 21:28:06 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdl_sound
 PORTVERSION=	1.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.icculus.org/SDL_sound/downloads/
 DISTNAME=	SDL_sound-${PORTVERSION}
@@ -26,7 +26,7 @@
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_FLAC)
-LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	FLAC.6:${PORTSDIR}/audio/flac
 .else
 CONFIGURE_ARGS+=	--disable-flac
 .endif
Index: audio/squash/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/squash/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- audio/squash/Makefile	26 Feb 2004 18:51:42 -0000	1.7
+++ audio/squash/Makefile	23 Jan 2005 21:28:06 -0000
@@ -6,6 +6,7 @@
 
 PORTNAME=		squash
 PORTVERSION=		1.0
+PORTREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -13,7 +14,7 @@
 MAINTAINER=	matthias.andree at gmx.de
 COMMENT=	Learning console-based MP3/OGG player
 
-LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac \
+LIB_DEPENDS+=	FLAC.6:${PORTSDIR}/audio/flac \
 		fftw.2:${PORTSDIR}/math/fftw \
 		id3-3.8.3:${PORTSDIR}/audio/id3lib \
 		mad.2:${PORTSDIR}/audio/mad \
Index: audio/vorbis-tools/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/vorbis-tools/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- audio/vorbis-tools/Makefile	25 Jul 2004 06:41:45 -0000	1.34
+++ audio/vorbis-tools/Makefile	23 Jan 2005 21:28:06 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	vorbis-tools
 PORTVERSION=	1.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.vorbis.com/files/1.0.1/unix/
@@ -17,7 +17,7 @@
 
 LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao \
 		curl.3:${PORTSDIR}/ftp/curl \
-		FLAC.5:${PORTSDIR}/audio/flac \
+		FLAC.6:${PORTSDIR}/audio/flac \
 		speex.3:${PORTSDIR}/audio/speex \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
 
Index: audio/musicpd/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/musicpd/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- audio/musicpd/Makefile	14 Jan 2005 15:45:01 -0000	1.17
+++ audio/musicpd/Makefile	23 Jan 2005 21:28:06 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	musicpd
 PORTVERSION=	0.11.5
+PORTREVISION=	1
 CATEGORIES=	audio ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -41,7 +42,7 @@
 .ifdef(WITHOUT_FLAC)
 CONFIGURE_ARGS+=--disable-flac
 .else
-LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	FLAC.6:${PORTSDIR}/audio/flac
 .endif
 
 .ifdef(WITHOUT_VORBIS)
Index: multimedia/libxine/Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/libxine/Makefile,v
retrieving revision 1.72
diff -u -r1.72 Makefile
--- multimedia/libxine/Makefile	13 Jan 2005 22:25:34 -0000	1.72
+++ multimedia/libxine/Makefile	23 Jan 2005 21:28:06 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,7 @@
 COMMENT=	Libraries for xine multimedia player
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
-LIB_DEPENDS=	FLAC.5:${PORTSDIR}/audio/flac \
+LIB_DEPENDS=	FLAC.6:${PORTSDIR}/audio/flac \
 		a52.0:${PORTSDIR}/audio/liba52 \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		mad.2:${PORTSDIR}/audio/libmad \
Index: multimedia/vlc/Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/vlc/Makefile,v
retrieving revision 1.79
diff -u -r1.79 Makefile
--- multimedia/vlc/Makefile	22 Jan 2005 01:35:02 -0000	1.79
+++ multimedia/vlc/Makefile	23 Jan 2005 21:28:07 -0000
@@ -176,7 +176,7 @@
 
 PORTNAME=	vlc
 PORTVERSION=	0.8.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
 		http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \
@@ -436,7 +436,7 @@
 .endif
 
 .if !defined(WITHOUT_FLAC)
-LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	FLAC.6:${PORTSDIR}/audio/flac
 CONFIGURE_ARGS+=--enable-flac
 .else
 CONFLGIRE_ARGS+=--disable-flac
Index: multimedia/mkvtoolnix/Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/mkvtoolnix/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- multimedia/mkvtoolnix/Makefile	8 Jan 2005 16:52:49 -0000	1.17
+++ multimedia/mkvtoolnix/Makefile	23 Jan 2005 21:28:07 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	mkvtoolnix
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		http://www.bunkus.org/videotools/mkvtoolnix/sources/old/
@@ -16,7 +17,7 @@
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmatroska.a:${PORTSDIR}/multimedia/libmatroska \
 		${LOCALBASE}/lib/libebml.a:${PORTSDIR}/textproc/libebml
-LIB_DEPENDS=	FLAC.5:${PORTSDIR}/audio/flac \
+LIB_DEPENDS=	FLAC.6:${PORTSDIR}/audio/flac \
 		expat.5:${PORTSDIR}/textproc/expat2 \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
 
Index: multimedia/gstreamer-plugins/Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/gstreamer-plugins/Makefile,v
retrieving revision 1.74
diff -u -r1.74 Makefile
--- multimedia/gstreamer-plugins/Makefile	13 Jan 2005 19:04:06 -0000	1.74
+++ multimedia/gstreamer-plugins/Makefile	23 Jan 2005 21:28:08 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.8.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-plugins/ \
 		${MASTER_SITE_GNOME}
@@ -536,7 +536,7 @@
 CONFIGURE_ARGS+=	--disable-flac
 PLIST_SUB+=	FLAC="@comment "
 .else
-LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	FLAC.6:${PORTSDIR}/audio/flac
 
 PLIST_SUB+=	FLAC=""
 .endif
Index: www/mod_musicindex/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/mod_musicindex/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- www/mod_musicindex/Makefile	22 Jan 2005 20:56:55 -0000	1.9
+++ www/mod_musicindex/Makefile	23 Jan 2005 21:28:13 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_musicindex
 PORTVERSION=	0.99.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www audio
 # Master site doesn't have a current version'd tarball...
 #MASTER_SITES=	http://www.parisc-linux.org/~varenet/musicindex/
@@ -20,7 +20,7 @@
 LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 		id3tag.2:${PORTSDIR}/audio/libid3tag \
 		mad.2:${PORTSDIR}/audio/libmad \
-		FLAC.5:${PORTSDIR}/audio/flac
+		FLAC.6:${PORTSDIR}/audio/flac
 
 CPPFLAGS=	-DHAS_MP3 -DHAS_OGG -DHAS_FLAC
 CFLAGS+=	-I${LOCALBASE}/include
Index: audio/flac/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/flac/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- audio/flac/Makefile	15 Jan 2005 16:38:09 -0000	1.32
+++ audio/flac/Makefile	23 Jan 2005 21:28:13 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	flac
-PORTVERSION=	1.1.0
-PORTREVISION=	4
+PORTVERSION=	1.1.1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,7 +22,7 @@
 
 USE_ICONV=	yes
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-sse --enable-3dnow \
 		--with-libiconv-prefix="${LOCALBASE}" \
Index: audio/flac/distinfo
===================================================================
RCS file: /home/pcvs/ports/audio/flac/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- audio/flac/distinfo	18 Mar 2004 20:59:09 -0000	1.10
+++ audio/flac/distinfo	23 Jan 2005 21:28:13 -0000
@@ -1,2 +1,2 @@
-MD5 (flac-1.1.0.tar.gz) = 19b456a27b5fcf502c76cc33f33e1490
-SIZE (flac-1.1.0.tar.gz) = 1201861
+MD5 (flac-1.1.1.tar.gz) = c6ccddccf8ad344065698047c2fc7280
+SIZE (flac-1.1.1.tar.gz) = 1467204
Index: audio/flac/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/audio/flac/pkg-plist,v
retrieving revision 1.11
diff -u -r1.11 pkg-plist
--- audio/flac/pkg-plist	21 Oct 2003 11:23:57 -0000	1.11
+++ audio/flac/pkg-plist	23 Jan 2005 21:28:18 -0000
@@ -1,4 +1,3 @@
- at comment $FreeBSD: ports/audio/flac/pkg-plist,v 1.11 2003/10/21 11:23:57 osa Exp $
 bin/flac
 bin/metaflac
 include/FLAC++/all.h
@@ -8,6 +7,7 @@
 include/FLAC++/metadata.h
 include/FLAC/all.h
 include/FLAC/assert.h
+include/FLAC/callback.h
 include/FLAC/export.h
 include/FLAC/file_decoder.h
 include/FLAC/file_encoder.h
@@ -24,20 +24,24 @@
 include/OggFLAC++/export.h
 include/OggFLAC/all.h
 include/OggFLAC/export.h
+include/OggFLAC/file_decoder.h
+include/OggFLAC/file_encoder.h
+include/OggFLAC/seekable_stream_decoder.h
+include/OggFLAC/seekable_stream_encoder.h
 include/OggFLAC/stream_decoder.h
 include/OggFLAC/stream_encoder.h
 lib/libFLAC++.a
 lib/libFLAC++.so
-lib/libFLAC++.so.3
+lib/libFLAC++.so.4
 lib/libFLAC.a
 lib/libFLAC.so
-lib/libFLAC.so.5
+lib/libFLAC.so.6
 lib/libOggFLAC++.a
 lib/libOggFLAC++.so
-lib/libOggFLAC++.so.0
+lib/libOggFLAC++.so.1
 lib/libOggFLAC.a
 lib/libOggFLAC.so
-lib/libOggFLAC.so.1
+lib/libOggFLAC.so.2
 share/aclocal/libFLAC++.m4
 share/aclocal/libFLAC.m4
 share/aclocal/libOggFLAC++.m4
@@ -53,6 +57,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2export_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2all_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2export_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2file__encoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2file__encoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2seekable__stream__encoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2seekable__stream__encoder_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2stream__decoder_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2stream__decoder_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2stream__encoder_8h-source.html
@@ -65,12 +73,18 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2export_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2all_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2export_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2file__encoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2file__encoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2seekable__stream__encoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2seekable__stream__encoder_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2stream__decoder_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2stream__decoder_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2stream__encoder_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2stream__encoder_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/assert_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/callback_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/callback_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1SeekableStream-members.html
@@ -117,8 +131,16 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1File-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1File.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1SeekableStream-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1SeekableStream.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1Stream-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1Stream.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1File-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1File.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1SeekableStream-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1SeekableStream.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1Stream-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1Stream.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classes.html
@@ -126,14 +148,13 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/api/file__decoder_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/file__decoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/file__encoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/file__encoder_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/files.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/format_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/format_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/globals.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__callbacks.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__decoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__encoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__file__decoder.html
@@ -165,11 +186,17 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__decoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__file__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__seekable__stream__encoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__stream__decoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__stream__encoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__decoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__file__decoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__file__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__seekable__stream__decoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__seekable__stream__encoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__stream__decoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__stream__encoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/hierarchy.html
@@ -180,8 +207,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/api/ordinals_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/seekable__stream__decoder_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/seekable__stream__decoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/seekable__stream__encoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/seekable__stream__encoder_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html
@@ -198,6 +223,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameFooter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameHeader-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameHeader.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____IOCallbacks-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____IOCallbacks.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____SeekableStreamDecoder-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____SeekableStreamDecoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____SeekableStreamEncoder-members.html
@@ -240,23 +267,33 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__LPC.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Verbatim-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Verbatim.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____FileEncoder-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____FileEncoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____SeekableStreamEncoder-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____SeekableStreamEncoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____StreamDecoder-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____StreamDecoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____StreamEncoder-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____StreamEncoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/html/comparison.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developers.html
 %%PORTDOCS%%%%DOCSDIR%%/html/documentation.html
 %%PORTDOCS%%%%DOCSDIR%%/html/download.html
+%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/html/features.html
 %%PORTDOCS%%%%DOCSDIR%%/html/format.html
 %%PORTDOCS%%%%DOCSDIR%%/html/goals.html
 %%PORTDOCS%%%%DOCSDIR%%/html/id.html
 %%PORTDOCS%%%%DOCSDIR%%/html/images/1x1.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/images/cafebug.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/images/logo.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/logo100.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/images/logo130.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/license.html
+%%PORTDOCS%%%%DOCSDIR%%/html/links.html
 %%PORTDOCS%%%%DOCSDIR%%/html/news.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ogg_mapping.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ru/authors.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ru/comparison.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ru/developers.html
Index: audio/flac/files/patch-Makefile.in
===================================================================
RCS file: /home/pcvs/ports/audio/flac/files/patch-Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile.in
--- audio/flac/files/patch-Makefile.in	5 Oct 2002 16:37:28 -0000	1.2
+++ audio/flac/files/patch-Makefile.in	23 Jan 2005 21:28:18 -0000
@@ -1,14 +1,11 @@
-
-$FreeBSD: ports/audio/flac/files/patch-Makefile.in,v 1.2 2002/10/05 16:37:28 naddy Exp $
-
---- Makefile.in.orig	Wed Sep 25 06:53:31 2002
-+++ Makefile.in	Sat Oct  5 01:29:53 2002
-@@ -144,7 +144,7 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
- 
+--- Makefile.in.orig	Sun Jan 23 20:25:27 2005
++++ Makefile.in	Sun Jan 23 20:25:41 2005
+@@ -244,7 +244,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -SUBDIRS = doc include man src test build flac.pbproj obj
 +SUBDIRS = $(DOC) include man src test build flac.pbproj
- 
  DISTCLEANFILES = libtool-disable-static
- 
+ EXTRA_DIST = \
+ 	COPYING.FDL \
Index: audio/flac/files/patch-configure
===================================================================
RCS file: /home/pcvs/ports/audio/flac/files/patch-configure,v
retrieving revision 1.6
diff -u -r1.6 patch-configure
--- audio/flac/files/patch-configure	23 Feb 2003 02:14:52 -0000	1.6
+++ audio/flac/files/patch-configure	23 Jan 2005 21:28:18 -0000
@@ -1,40 +1,22 @@
-
-$FreeBSD: ports/audio/flac/files/patch-configure,v 1.6 2003/02/23 02:14:52 naddy Exp $
-
---- configure.orig	Sun Feb 23 01:11:25 2003
-+++ configure	Sun Feb 23 01:11:27 2003
-@@ -7817,6 +7817,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9818,6 +9819,8 @@
-   fi
- 
+--- configure.orig	Wed Sep 29 06:17:41 2004
++++ configure	Sun Jan 23 20:30:16 2005
+@@ -9986,6 +9987,10 @@
+     fi
+   done
  
 +# 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 @@
- if test x$debug = xtrue; then
- 	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
+   echo "$as_me:$LINENO: checking for iconv" >&5
+ echo $ECHO_N "checking for iconv... $ECHO_C" >&6
+@@ -10442,7 +10447,7 @@
  else
--	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -DNDEBUG"
-+	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
+ 	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O2 -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 -O -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
  	fi
+ fi
+ CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"
Index: audio/flac/files/patch-doc_Makefile.in
===================================================================
RCS file: /home/pcvs/ports/audio/flac/files/patch-doc_Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 patch-doc_Makefile.in
--- audio/flac/files/patch-doc_Makefile.in	5 Oct 2002 16:37:28 -0000	1.2
+++ audio/flac/files/patch-doc_Makefile.in	23 Jan 2005 21:28:18 -0000
@@ -1,14 +1,11 @@
-
-$FreeBSD: ports/audio/flac/files/patch-doc_Makefile.in,v 1.2 2002/10/05 16:37:28 naddy Exp $
-
---- doc/Makefile.in.orig	Sat Oct  5 01:22:15 2002
-+++ doc/Makefile.in	Sat Oct  5 01:23:02 2002
-@@ -135,7 +135,7 @@
- 
+--- doc/Makefile.in.orig	Wed Sep 29 06:18:28 2004
++++ doc/Makefile.in	Sun Jan 23 20:31:21 2005
+@@ -222,7 +222,7 @@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = foreign
  SUBDIRS = . html
- 
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(datadir)/doc/$(PACKAGE)
- 
  doc_DATA = \
  	FLAC.tag
+ 
Index: audio/flac/files/patch-doc_html_Makefile.in
===================================================================
RCS file: /home/pcvs/ports/audio/flac/files/patch-doc_html_Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-doc_html_Makefile.in
--- audio/flac/files/patch-doc_html_Makefile.in	5 Oct 2002 16:37:28 -0000	1.1
+++ audio/flac/files/patch-doc_html_Makefile.in	23 Jan 2005 21:28:18 -0000
@@ -1,14 +1,11 @@
-
-$FreeBSD: ports/audio/flac/files/patch-doc_html_Makefile.in,v 1.1 2002/10/05 16:37:28 naddy Exp $
-
---- doc/html/Makefile.in.orig	Sat Oct  5 01:22:20 2002
-+++ doc/html/Makefile.in	Sat Oct  5 01:23:09 2002
-@@ -135,7 +135,7 @@
- 
+--- doc/html/Makefile.in.orig	Wed Sep 29 06:18:29 2004
++++ doc/html/Makefile.in	Sun Jan 23 20:32:49 2005
+@@ -222,7 +222,7 @@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = foreign
  SUBDIRS = ru images
- 
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html
 +docdir = $(datadir)/doc/$(PACKAGE)/html
- 
  doc_DATA = \
+ 	changelog.html \
  	comparison.html \
Index: audio/flac/files/patch-doc_html_images_Makefile.in
===================================================================
RCS file: /home/pcvs/ports/audio/flac/files/patch-doc_html_images_Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-doc_html_images_Makefile.in
--- audio/flac/files/patch-doc_html_images_Makefile.in	5 Oct 2002 16:37:28 -0000	1.1
+++ audio/flac/files/patch-doc_html_images_Makefile.in	23 Jan 2005 21:28:18 -0000
@@ -1,14 +1,11 @@
-
-$FreeBSD: ports/audio/flac/files/patch-doc_html_images_Makefile.in,v 1.1 2002/10/05 16:37:28 naddy Exp $
-
---- doc/html/images/Makefile.in.orig	Sat Oct  5 01:22:31 2002
-+++ doc/html/images/Makefile.in	Sat Oct  5 01:23:21 2002
-@@ -133,7 +133,7 @@
- 
+--- doc/html/images/Makefile.in.orig	Wed Sep 29 06:18:29 2004
++++ doc/html/images/Makefile.in	Sun Jan 23 20:33:54 2005
+@@ -212,7 +212,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  AUTOMAKE_OPTIONS = foreign
- 
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/images
 +docdir = $(datadir)/doc/$(PACKAGE)/html/images
- 
  doc_DATA = \
  	1x1.gif \
+ 	cafebug.gif \
Index: audio/flac/files/patch-doc_html_ru_Makefile.in
===================================================================
RCS file: /home/pcvs/ports/audio/flac/files/patch-doc_html_ru_Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-doc_html_ru_Makefile.in
--- audio/flac/files/patch-doc_html_ru_Makefile.in	5 Oct 2002 16:37:28 -0000	1.1
+++ audio/flac/files/patch-doc_html_ru_Makefile.in	23 Jan 2005 21:28:18 -0000
@@ -1,14 +1,11 @@
-
-$FreeBSD: ports/audio/flac/files/patch-doc_html_ru_Makefile.in,v 1.1 2002/10/05 16:37:28 naddy Exp $
-
---- doc/html/ru/Makefile.in.orig	Sat Oct  5 01:22:27 2002
-+++ doc/html/ru/Makefile.in	Sat Oct  5 01:23:15 2002
-@@ -133,7 +133,7 @@
- 
+--- doc/html/ru/Makefile.in.orig	Wed Sep 29 06:18:30 2004
++++ doc/html/ru/Makefile.in	Sun Jan 23 20:35:09 2005
+@@ -212,7 +212,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  AUTOMAKE_OPTIONS = foreign
- 
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/ru
 +docdir = $(datadir)/doc/$(PACKAGE)/html/ru
- 
  doc_DATA = \
  	authors.html \
+ 	comparison.html \
Index: audio/xmms-flac/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/xmms-flac/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- audio/xmms-flac/Makefile	17 Nov 2004 19:02:00 -0000	1.7
+++ audio/xmms-flac/Makefile	23 Jan 2005 21:28:18 -0000
@@ -6,26 +6,25 @@
 #
 
 PORTNAME=	xmms-flac
-PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTVERSION=	1.1.1
 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
+#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 at FreeBSD.org
 COMMENT=	XMMS input plugin for playing FLAC files
 
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
-		FLAC.5:${PORTSDIR}/audio/flac
+		FLAC.6:${PORTSDIR}/audio/flac
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--with-libiconv-prefix="${LOCALBASE}" \
 		--with-ogg="${LOCALBASE}" \
 		--with-xmms-prefix="${X11BASE}"
Index: audio/xmms-flac/distinfo
===================================================================
RCS file: /home/pcvs/ports/audio/xmms-flac/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- audio/xmms-flac/distinfo	17 Nov 2004 19:02:00 -0000	1.5
+++ audio/xmms-flac/distinfo	23 Jan 2005 21:28:18 -0000
@@ -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.1.tar.gz) = c6ccddccf8ad344065698047c2fc7280
+SIZE (flac-1.1.1.tar.gz) = 1467204
Index: audio/xmms-flac/files/patch-configure
===================================================================
RCS file: /home/pcvs/ports/audio/xmms-flac/files/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- audio/xmms-flac/files/patch-configure	10 Jun 2003 15:43:13 -0000	1.1
+++ audio/xmms-flac/files/patch-configure	23 Jan 2005 21:28:18 -0000
@@ -1,40 +1,22 @@
-
-$FreeBSD: ports/audio/xmms-flac/files/patch-configure,v 1.1 2003/06/10 15:43:13 naddy Exp $
-
---- configure.orig	Sun Feb 23 01:11:25 2003
-+++ configure	Sun Feb 23 01:11:27 2003
-@@ -7817,6 +7817,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9818,6 +9819,8 @@
-   fi
- 
+--- configure.orig	Wed Sep 29 06:17:41 2004
++++ configure	Sun Jan 23 20:30:16 2005
+@@ -9986,6 +9987,10 @@
+     fi
+   done
  
 +# 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 @@
- if test x$debug = xtrue; then
- 	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
+   echo "$as_me:$LINENO: checking for iconv" >&5
+ echo $ECHO_N "checking for iconv... $ECHO_C" >&6
+@@ -10442,7 +10447,7 @@
  else
--	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -DNDEBUG"
-+	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
+ 	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O2 -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 -O -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
  	fi
+ fi
+ CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"
Index: audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in
===================================================================
RCS file: /home/pcvs/ports/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-src_plugin__xmms_Makefile.in
--- audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in	10 Jun 2003 15:43:13 -0000	1.1
+++ audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in	23 Jan 2005 21:28:18 -0000
@@ -1,25 +1,31 @@
-
-$FreeBSD: ports/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in,v 1.1 2003/06/10 15:43:13 naddy Exp $
-
---- 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	Sun Jan 23 21:55:02 2005
++++ src/plugin_xmms/Makefile.in	Sun Jan 23 22:05:03 2005
+@@ -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 plugin.lo tag.lo fileinfo.lo
+ am_libxmms_flac_la_OBJECTS = $(am__objects_1)
+ libxmms_flac_la_OBJECTS = $(am_libxmms_flac_la_OBJECTS)
+@@ -173,7 +172,7 @@
+ LIBS = @LIBS@
+ 
+ # Don't build a static library
+-LIBTOOL = $(top_builddir)/libtool-disable-static
++LIBTOOL = /bin/sh /usr/local/bin/libtool15
+ LN_S = @LN_S@
+ LTLIBICONV = @LTLIBICONV@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -277,8 +276,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@
+ 	@XMMS_LIBS@
  
-@@ -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 at am_libxmms_flac_la_OBJECTS = $(am__objects_1)
+ libxmms_flac_la_LDFLAGS = -module -avoid-version
--- flac.diff ends here ---



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



More information about the freebsd-ports-bugs mailing list