Update to 1.0.4. Notable improvements:

- vorbis comment and id3v1/v2 support in the plugins
- bug fixes for 24-bit handling
- x86 encoder and decoder speedups
- reduced memory requirements

11 files changed, 127 insertions, 30 deletions

diff --git a/audio/flac/files/patch-Makefile.in b/audio/flac/files/patch-Makefile.in
index f8684ba0a4c7..14d5d917a9c3 100644
--- a/audio/flac/files/patch-Makefile.in
+++ b/audio/flac/files/patch-Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Sat Jul  6 15:54:56 2002
-+++ Makefile.in	Sat Jul  6 15:55:31 2002
-@@ -137,7 +137,7 @@
+--- 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@
  
--SUBDIRS = doc include man src test
-+SUBDIRS = $(DOC) include man src test
+-SUBDIRS = doc include man src test build flac.pbproj obj
++SUBDIRS = $(DOC) include man src test build flac.pbproj
  
  DISTCLEANFILES = libtool-disable-static
  
diff --git a/audio/flac/files/patch-configure b/audio/flac/files/patch-configure
index b4f13f6d5d9e..5d034e4ec7ba 100644
--- a/audio/flac/files/patch-configure
+++ b/audio/flac/files/patch-configure
@@ -1,9 +1,17 @@
 
 $FreeBSD$
 
---- configure.orig	Sat Jul  6 15:49:41 2002
-+++ configure	Sat Jul  6 15:49:54 2002
-@@ -9995,7 +9995,7 @@
+--- configure.orig	Wed Sep 25 06:53:08 2002
++++ configure	Sat Oct  5 14:48:41 2002
+@@ -7333,6 +7333,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'
+@@ -11113,7 +11114,7 @@
  if test x$debug = xtrue; then
  	OUR_CFLAGS_TAIL="-g -O0 -DDEBUG"
  else
diff --git a/audio/flac/files/patch-doc_Makefile.in b/audio/flac/files/patch-doc_Makefile.in
index ba0631a82ac7..496e05d20bc5 100644
--- a/audio/flac/files/patch-doc_Makefile.in
+++ b/audio/flac/files/patch-doc_Makefile.in
@@ -1,17 +1,14 @@
 
 $FreeBSD$
 
---- doc/Makefile.in.orig	Wed Jul  3 23:01:49 2002
-+++ doc/Makefile.in	Sat Jul  6 17:10:19 2002
-@@ -126,9 +126,9 @@
+--- 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 @@
  
- AUTOMAKE_OPTIONS = foreign
- 
--SUBDIRS = . images ru
-+SUBDIRS = . images
+ SUBDIRS = . html
  
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(datadir)/doc/$(PACKAGE)
  
  doc_DATA = \
- 	comparison.html \
+ 	FLAC.tag
diff --git a/audio/flac/files/patch-doc_html_Makefile.in b/audio/flac/files/patch-doc_html_Makefile.in
new file mode 100644
index 000000000000..84ecda3a4988
--- /dev/null
+++ b/audio/flac/files/patch-doc_html_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- 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 @@
+ 
+ SUBDIRS = ru images
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html
++docdir = $(datadir)/doc/$(PACKAGE)/html
+ 
+ doc_DATA = \
+ 	comparison.html \
diff --git a/audio/flac/files/patch-doc_html_images_Makefile.in b/audio/flac/files/patch-doc_html_images_Makefile.in
new file mode 100644
index 000000000000..57589f31dc80
--- /dev/null
+++ b/audio/flac/files/patch-doc_html_images_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- 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 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/images
++docdir = $(datadir)/doc/$(PACKAGE)/html/images
+ 
+ doc_DATA = \
+ 	1x1.gif \
diff --git a/audio/flac/files/patch-doc_html_ru_Makefile.in b/audio/flac/files/patch-doc_html_ru_Makefile.in
new file mode 100644
index 000000000000..c0ddee3a669d
--- /dev/null
+++ b/audio/flac/files/patch-doc_html_ru_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- 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 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/ru
++docdir = $(datadir)/doc/$(PACKAGE)/html/ru
+ 
+ doc_DATA = \
+ 	authors.html \
diff --git a/audio/flac/files/patch-doc_images_Makefile.in b/audio/flac/files/patch-doc_images_Makefile.in
deleted file mode 100644
index 8da79c0e9a9e..000000000000
--- a/audio/flac/files/patch-doc_images_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/images/Makefile.in.orig	Sat Jul  6 16:42:17 2002
-+++ doc/images/Makefile.in	Sat Jul  6 16:43:26 2002
-@@ -126,7 +126,7 @@
- 
- AUTOMAKE_OPTIONS = foreign
- 
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/images
-+docdir = $(datadir)/doc/$(PACKAGE)/images
- 
- doc_DATA = \
- 	1x1.gif \
diff --git a/audio/flac/files/patch-src_Makefile.in b/audio/flac/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..01a5b49b588e
--- /dev/null
+++ b/audio/flac/files/patch-src_Makefile.in
@@ -0,0 +1,22 @@
+
+$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
new file mode 100644
index 000000000000..acb6c7a96942
--- /dev/null
+++ b/audio/flac/files/patch-src_flac_Makefile.in
@@ -0,0 +1,14 @@
+
+$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
new file mode 100644
index 000000000000..9f36860d4074
--- /dev/null
+++ b/audio/flac/files/patch-src_metaflac_Makefile.in
@@ -0,0 +1,14 @@
+
+$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
new file mode 100644
index 000000000000..b514d14bde3a
--- /dev/null
+++ b/audio/flac/files/patch-src_plugin__common_Makefile.in
@@ -0,0 +1,14 @@
+
+$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)