Update to 1.1.0. This release adds ReplayGain and cue sheet support,

and improves 24-bit compression, tag editing in the plugins, and
decoding to AIFF.

8 files changed, 68 insertions, 90 deletions

diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 784c6d6f4bc7..0a06bf95d8fb 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -6,25 +6,27 @@
 #
 
 PORTNAME=	flac
-PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTVERSION=	1.1.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
+PATCH_SITES=	${MASTER_SITE_DEBIAN}
+PATCH_SITE_SUBDIR=	pool/main/f/${PORTNAME}
+PATCHFILES=	${PORTNAME}_${PORTVERSION}-3.diff.gz
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Free lossless audio codec
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/converters/libiconv:extract
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
 		ogg.4:${PORTSDIR}/audio/libogg
 
 .if defined(WITH_XMMS)
-# id3lib is only used by the XMMS plugin
+# We don't build with id3lib support, because of C++ related build
+# problems.  Detection is disabled by patch-configure.
 BUILD_DEPENDS+=	xmms-config:${PORTSDIR}/multimedia/xmms
-LIB_DEPENDS+=	id3-3.8.2:${PORTSDIR}/audio/id3lib \
-		xmms.3:${PORTSDIR}/multimedia/xmms
-CONFIGURE_ARGS+=--with-id3lib="${LOCALBASE}"
+LIB_DEPENDS+=	xmms.3:${PORTSDIR}/multimedia/xmms
 PLIST_SUB=	XMMS=""
 .else
 CONFIGURE_ENV+=	XMMS_CONFIG=/usr/bin/false	# must be absolute path
@@ -40,8 +42,6 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 CONFIGURE_ARGS+=--enable-sse --enable-3dnow \
 		--with-libiconv-prefix="${LOCALBASE}" \
 		--with-ogg="${LOCALBASE}"
-CONFIGURE_ENV=	CONFIG_SHELL="${SH}" \
-		CPPFLAGS="-I${WRKSRC}/include"
 
 .if defined(NOPORTDOCS)
 MAKE_ENV=	DOC=""
@@ -50,14 +50,13 @@ MAKE_ENV=	DOC=doc
 .endif
 
 INSTALLS_SHLIB=	yes
-MAN1=		flac.1
-
-# missing auxiliary script
-post-extract:
-	@${CP} `cd ${PORTSDIR}/converters/libiconv && make -V WRKSRC`/autoconf/config.rpath ${WRKSRC}
+MAN1=		flac.1 metaflac.1
 
 # "obj" is magic to our make(1)
 post-configure:
 	@${RM} -rf ${WRKSRC}/obj
 
+test: build
+	@cd ${WRKSRC}; make check
+
 .include <bsd.port.mk>
diff --git a/audio/flac/distinfo b/audio/flac/distinfo
index 6ea9868a5585..9cba2f63ef9b 100644
--- a/audio/flac/distinfo
+++ b/audio/flac/distinfo
@@ -1 +1,2 @@
-MD5 (flac-1.0.4.tar.gz) = b1523e6ad8ef85d1df5b18f20a8cfad6
+MD5 (flac-1.1.0.tar.gz) = 19b456a27b5fcf502c76cc33f33e1490
+MD5 (flac_1.1.0-3.diff.gz) = 28443cf10cbc7fc29ddfa5df48474b06
diff --git a/audio/flac/files/patch-configure b/audio/flac/files/patch-configure
index 5d034e4ec7ba..b16793a26fae 100644
--- a/audio/flac/files/patch-configure
+++ b/audio/flac/files/patch-configure
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Wed Sep 25 06:53:08 2002
-+++ configure	Sat Oct  5 14:48:41 2002
-@@ -7333,6 +7333,7 @@
+--- 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"
@@ -11,12 +11,30 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -11113,7 +11114,7 @@
+@@ -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 @@
  if test x$debug = xtrue; then
- 	OUR_CFLAGS_TAIL="-g -O0 -DDEBUG"
+ 	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
  else
--	OUR_CFLAGS_TAIL="-O3 -DNDEBUG"
-+	OUR_CFLAGS_TAIL="-DNDEBUG"
+-	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -DNDEBUG"
++	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
  	if test x$GCC = xyes; then
- 		OUR_CFLAGS_TAIL="$OUR_CFLAGS_TAIL -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
+ 		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
  	fi
diff --git a/audio/flac/files/patch-src_Makefile.in b/audio/flac/files/patch-src_Makefile.in
deleted file mode 100644
index 01a5b49b588e..000000000000
--- a/audio/flac/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD$
-
---- src/Makefile.in.orig	Sat Oct  5 02:34:48 2002
-+++ src/Makefile.in	Sat Oct  5 02:35:21 2002
-@@ -131,7 +131,7 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
- 
--@FLaC__HAS_XMMS_TRUE@XMMS_DIRS = plugin_xmms
-+@FLaC__HAS_XMMS_TRUE@XMMS_DIRS = plugin_common plugin_xmms
- 
- @FLaC__HAS_OGG_TRUE@OGGFLAC_DIRS = libOggFLAC libOggFLAC++
- @FLaC__HAS_OGG_TRUE@OGGFLAC_TEST_DIRS = test_libOggFLAC test_libOggFLAC++
-@@ -144,7 +144,6 @@
- 	flac \
- 	metaflac \
- 	monkeys_audio_utilities \
--	plugin_common \
- 	$(XMMS_DIRS) \
- 	plugin_winamp2 \
- 	plugin_winamp3 \
diff --git a/audio/flac/files/patch-src_flac_Makefile.in b/audio/flac/files/patch-src_flac_Makefile.in
deleted file mode 100644
index acb6c7a96942..000000000000
--- a/audio/flac/files/patch-src_flac_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/flac/Makefile.in.orig	Sat Oct  5 01:37:42 2002
-+++ src/flac/Makefile.in	Sat Oct  5 01:38:19 2002
-@@ -155,7 +155,7 @@
- 	vorbiscomment.h
- 
- 
--flac_LDADD = $(NEED_OGGFLAC_LIB) $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ @SHARE_LIBS@ -lm
-+flac_LDADD = $(NEED_OGGFLAC_LIB) $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ @SHARE_LIBS@ @LIBICONV@ -lm
- subdir = src/flac
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES =
diff --git a/audio/flac/files/patch-src_metaflac_Makefile.in b/audio/flac/files/patch-src_metaflac_Makefile.in
deleted file mode 100644
index 9f36860d4074..000000000000
--- a/audio/flac/files/patch-src_metaflac_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/metaflac/Makefile.in.orig	Sat Oct  5 01:37:47 2002
-+++ src/metaflac/Makefile.in	Sat Oct  5 01:38:37 2002
-@@ -144,7 +144,7 @@
- 
- metaflac_LDFLAGS = 
- 
--metaflac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la @SHARE_LIBS@ -lm
-+metaflac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la @SHARE_LIBS@ @LIBICONV@ -lm
- subdir = src/metaflac
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES =
diff --git a/audio/flac/files/patch-src_plugin__common_Makefile.in b/audio/flac/files/patch-src_plugin__common_Makefile.in
deleted file mode 100644
index b514d14bde3a..000000000000
--- a/audio/flac/files/patch-src_plugin__common_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/plugin_common/Makefile.in.orig	Sat Oct  5 02:24:40 2002
-+++ src/plugin_common/Makefile.in	Sat Oct  5 02:27:47 2002
-@@ -169,7 +169,7 @@
- @AMDEP_TRUE@	./$(DEPDIR)/id3v1.Po ./$(DEPDIR)/id3v2.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/vorbiscomment.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIC
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
diff --git a/audio/flac/pkg-plist b/audio/flac/pkg-plist
index d446cb0999b1..e16529114629 100644
--- a/audio/flac/pkg-plist
+++ b/audio/flac/pkg-plist
@@ -4,9 +4,11 @@ bin/metaflac
 include/FLAC++/all.h
 include/FLAC++/decoder.h
 include/FLAC++/encoder.h
+include/FLAC++/export.h
 include/FLAC++/metadata.h
 include/FLAC/all.h
 include/FLAC/assert.h
+include/FLAC/export.h
 include/FLAC/file_decoder.h
 include/FLAC/file_encoder.h
 include/FLAC/format.h
@@ -19,21 +21,23 @@ include/FLAC/stream_encoder.h
 include/OggFLAC++/all.h
 include/OggFLAC++/decoder.h
 include/OggFLAC++/encoder.h
+include/OggFLAC++/export.h
 include/OggFLAC/all.h
+include/OggFLAC/export.h
 include/OggFLAC/stream_decoder.h
 include/OggFLAC/stream_encoder.h
 lib/libFLAC++.a
 lib/libFLAC++.so
-lib/libFLAC++.so.2
+lib/libFLAC++.so.3
 lib/libFLAC.a
 lib/libFLAC.so
-lib/libFLAC.so.4
+lib/libFLAC.so.5
 lib/libOggFLAC++.a
 lib/libOggFLAC++.so
 lib/libOggFLAC++.so.0
 lib/libOggFLAC.a
 lib/libOggFLAC.so
-lib/libOggFLAC.so.0
+lib/libOggFLAC.so.1
 share/aclocal/libFLAC++.m4
 share/aclocal/libFLAC.m4
 share/aclocal/libOggFLAC++.m4
@@ -46,7 +50,9 @@ share/aclocal/libOggFLAC.m4
 %%PORTDOCS%%share/doc/flac/html/api/FLAC++_2decoder_8h.html
 %%PORTDOCS%%share/doc/flac/html/api/FLAC++_2encoder_8h-source.html
 %%PORTDOCS%%share/doc/flac/html/api/FLAC++_2encoder_8h.html
+%%PORTDOCS%%share/doc/flac/html/api/FLAC++_2export_8h-source.html
 %%PORTDOCS%%share/doc/flac/html/api/FLAC_2all_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/FLAC_2export_8h-source.html
 %%PORTDOCS%%share/doc/flac/html/api/FLAC_2stream__decoder_8h-source.html
 %%PORTDOCS%%share/doc/flac/html/api/FLAC_2stream__decoder_8h.html
 %%PORTDOCS%%share/doc/flac/html/api/FLAC_2stream__encoder_8h-source.html
@@ -56,7 +62,9 @@ share/aclocal/libOggFLAC.m4
 %%PORTDOCS%%share/doc/flac/html/api/OggFLAC++_2decoder_8h.html
 %%PORTDOCS%%share/doc/flac/html/api/OggFLAC++_2encoder_8h-source.html
 %%PORTDOCS%%share/doc/flac/html/api/OggFLAC++_2encoder_8h.html
+%%PORTDOCS%%share/doc/flac/html/api/OggFLAC++_2export_8h-source.html
 %%PORTDOCS%%share/doc/flac/html/api/OggFLAC_2all_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/OggFLAC_2export_8h-source.html
 %%PORTDOCS%%share/doc/flac/html/api/OggFLAC_2stream__decoder_8h-source.html
 %%PORTDOCS%%share/doc/flac/html/api/OggFLAC_2stream__decoder_8h.html
 %%PORTDOCS%%share/doc/flac/html/api/OggFLAC_2stream__encoder_8h-source.html
@@ -80,6 +88,11 @@ share/aclocal/libOggFLAC.m4
 %%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Application.html
 %%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Chain-members.html
 %%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Chain.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1CueSheet.gif
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1CueSheet.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html
 %%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html
 %%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Iterator.html
 %%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Padding-members.html
@@ -96,6 +109,9 @@ share/aclocal/libOggFLAC.m4
 %%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html
 %%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1StreamInfo.gif
 %%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Unknown.gif
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Unknown.html
 %%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html
 %%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment.gif
 %%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html
@@ -194,6 +210,12 @@ share/aclocal/libOggFLAC.m4
 %%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata.html
 %%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__Application-members.html
 %%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__Application.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet__Index-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet__Index.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet__Track-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet__Track.html
 %%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__Padding-members.html
 %%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__Padding.html
 %%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__SeekPoint-members.html
@@ -202,6 +224,8 @@ share/aclocal/libOggFLAC.m4
 %%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__SeekTable.html
 %%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__StreamInfo-members.html
 %%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__StreamInfo.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__Unknown-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__Unknown.html
 %%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__VorbisComment-members.html
 %%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__VorbisComment.html
 %%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html