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.

5 files changed, 26 insertions, 72 deletions

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)