Update xmms-flac to version 1.1.1 to match recent flac update.

This addresses PR#27198.

16 files changed, 20 insertions, 786 deletions

diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index 68c8a08c234..b4c7d945096 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/10/03 00:13:11 tv Exp $
+# $NetBSD: Makefile,v 1.10 2004/10/15 22:56:50 ben Exp $
 #
 
-DISTNAME=	flac-1.1.0
-PKGNAME=	xmms-flac-1.1.0
-PKGREVISION=	5
+DISTNAME=	flac-1.1.1
+PKGNAME=	xmms-flac-1.1.1
 CATEGORIES=	audio archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flac/}
 
diff --git a/audio/xmms-flac/distinfo b/audio/xmms-flac/distinfo
index f6f3b1ea7bd..15d53e75723 100644
--- a/audio/xmms-flac/distinfo
+++ b/audio/xmms-flac/distinfo
@@ -1,17 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/12/21 17:51:46 ben Exp $
+$NetBSD: distinfo,v 1.5 2004/10/15 22:56:50 ben Exp $
 
-SHA1 (flac-1.1.0.tar.gz) = 80334c1ebc693fb92e01f5a55ed332fbe9809592
-Size (flac-1.1.0.tar.gz) = 1201861 bytes
-SHA1 (patch-aa) = d042e72b8e12631004b2403b40c5b004fc71ea8b
-SHA1 (patch-ab) = d3dba90ffc3f560743e719a1e1274acd9e5cfc0c
-SHA1 (patch-ac) = f2a5b9998df3682bb2a2c734590608e2622afd04
-SHA1 (patch-ad) = 7d606f83c6d589c3a4b2649ceeea9fe77f291735
-SHA1 (patch-ae) = 38ae3834497d7ddaaabf238c556c0ca6ba740b79
-SHA1 (patch-af) = 596514addde67b16ac5ffc1fc24bf802947bf320
-SHA1 (patch-ag) = 173c631752cab3b65a46ae3d83a672e98f572e60
-SHA1 (patch-ah) = 5742c347c346895ccff41f766fc900c1d9bc4cd3
-SHA1 (patch-ai) = 52f9c97d671658377ae1504170db13224a86711e
-SHA1 (patch-aj) = d9912239495bd7e6f8dea12124cd3c9cd62b2673
-SHA1 (patch-ak) = e128338b8a757dba1e97c79f3262b3eeae4daca7
-SHA1 (patch-al) = b6e8d2e70e0553392e37640bed26e27aeaa19640
-SHA1 (patch-am) = 36c5f057b3ec43979dc8401885632a31fb3255b7
+SHA1 (flac-1.1.1.tar.gz) = 97832e5acad2f20867aafc30f219e47d26b853ac
+Size (flac-1.1.1.tar.gz) = 1467204 bytes
+SHA1 (patch-an) = c020d3ce6f69cc35f695480ea1e4cfa26d29e03b
diff --git a/audio/xmms-flac/patches/patch-aa b/audio/xmms-flac/patches/patch-aa
deleted file mode 100644
index 778511f2ee0..00000000000
--- a/audio/xmms-flac/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/19 08:59:12 wiz Exp $
-
---- src/libFLAC/ia32/Makefile.in.orig	Sat Feb 15 00:49:15 2003
-+++ src/libFLAC/ia32/Makefile.in
-@@ -352,7 +352,7 @@ uninstall-am: uninstall-info-am
- 
- 
- .nasm.lo:
--	$(LIBTOOL) --mode=compile $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@
-+	$(LIBTOOL) --tag=CC --mode=compile $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/audio/xmms-flac/patches/patch-ab b/audio/xmms-flac/patches/patch-ab
deleted file mode 100644
index 96ea930414c..00000000000
--- a/audio/xmms-flac/patches/patch-ab
+++ /dev/null
@@ -1,153 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/11/01 08:28:47 grant Exp $
-
---- src/plugin_common/Makefile.in.orig	2003-01-26 05:42:38.000000000 +1100
-+++ src/plugin_common/Makefile.in	2003-10-31 14:41:00.000000000 +1100
-@@ -90,6 +90,7 @@
- LN_S = @LN_S@
- LTLIB = @LTLIB@
- LTLIBICONV = @LTLIBICONV@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- NASM = @NASM@
- OBJDUMP = @OBJDUMP@
-@@ -121,7 +122,7 @@
- 
- INCLUDES = -I$(top_srcdir)/include @ID3LIB_CFLAGS@
- 
--noinst_LIBRARIES = libplugin_common.a
-+noinst_LTLIBRARIES = libplugin_common.la
- 
- noinst_HEADERS = \
- 	all.h \
-@@ -136,7 +137,7 @@
- 	vorbiscomment.h
- 
- 
--libplugin_common_a_SOURCES = \
-+libplugin_common_la_SOURCES = \
- 	canonical_tag.c \
- 	charset.c \
- 	dither.c \
-@@ -155,15 +156,14 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
--LIBRARIES = $(noinst_LIBRARIES)
-+LTLIBRARIES = $(noinst_LTLIBRARIES)
- 
--libplugin_common_a_AR = $(AR) cru
--libplugin_common_a_LIBADD =
--am_libplugin_common_a_OBJECTS = canonical_tag.$(OBJEXT) \
--	charset.$(OBJEXT) dither.$(OBJEXT) id3v1.$(OBJEXT) \
--	id3v2.$(OBJEXT) replaygain_synthesis.$(OBJEXT) \
--	vorbiscomment.$(OBJEXT)
--libplugin_common_a_OBJECTS = $(am_libplugin_common_a_OBJECTS)
-+libplugin_common_la_LIBADD =
-+am_libplugin_common_la_OBJECTS = canonical_tag.lo \
-+	charset.lo dither.lo id3v1.lo \
-+	id3v2.lo replaygain_synthesis.lo \
-+	vorbiscomment.lo
-+libplugin_common_la_OBJECTS = $(am_libplugin_common_la_OBJECTS)
- 
- DEFS = @DEFS@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -172,11 +172,11 @@
- LIBS = @LIBS@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/canonical_tag.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/charset.Po ./$(DEPDIR)/dither.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/id3v1.Po ./$(DEPDIR)/id3v2.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/replaygain_synthesis.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/vorbiscomment.Po
-+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/canonical_tag.Plo \
-+@AMDEP_TRUE@	./$(DEPDIR)/charset.Plo ./$(DEPDIR)/dither.Plo \
-+@AMDEP_TRUE@	./$(DEPDIR)/id3v1.Plo ./$(DEPDIR)/id3v2.Plo \
-+@AMDEP_TRUE@	./$(DEPDIR)/replaygain_synthesis.Plo \
-+@AMDEP_TRUE@	./$(DEPDIR)/vorbiscomment.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -185,7 +185,7 @@
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CFLAGS = @CFLAGS@
--DIST_SOURCES = $(libplugin_common_a_SOURCES)
-+DIST_SOURCES = $(libplugin_common_la_SOURCES)
- HEADERS = $(noinst_HEADERS)
- 
- 
-@@ -195,7 +195,7 @@
- 	uninstall-recursive check-recursive installcheck-recursive
- DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
- DIST_SUBDIRS = $(SUBDIRS)
--SOURCES = $(libplugin_common_a_SOURCES)
-+SOURCES = $(libplugin_common_la_SOURCES)
- 
- all: all-recursive
- 
-@@ -209,12 +209,10 @@
- 
- AR = ar
- 
--clean-noinstLIBRARIES:
--	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
--libplugin_common.a: $(libplugin_common_a_OBJECTS) $(libplugin_common_a_DEPENDENCIES) 
--	-rm -f libplugin_common.a
--	$(libplugin_common_a_AR) libplugin_common.a $(libplugin_common_a_OBJECTS) $(libplugin_common_a_LIBADD)
--	$(RANLIB) libplugin_common.a
-+clean-noinstLTLIBRARIES:
-+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-+libplugin_common.la: $(libplugin_common_la_OBJECTS) $(libplugin_common_la_DEPENDENCIES) 
-+	$(LINK) $(libplugin_common_la_LDFLAGS) $(libplugin_common_la_OBJECTS) $(libplugin_common_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT) core *.core
-@@ -222,13 +220,13 @@
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canonical_tag.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/charset.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id3v1.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id3v2.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/replaygain_synthesis.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vorbiscomment.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canonical_tag.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/charset.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id3v1.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id3v2.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/replaygain_synthesis.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vorbiscomment.Plo@am__quote@
- 
- distclean-depend:
- 	-rm -rf ./$(DEPDIR)
-@@ -398,7 +396,7 @@
- 	done
- check-am: all-am
- check: check-recursive
--all-am: Makefile $(LIBRARIES) $(HEADERS)
-+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- installdirs: installdirs-recursive
- installdirs-am:
- 
-@@ -428,7 +426,7 @@
- 	@echo "it deletes files that may require special tools to rebuild."
- clean: clean-recursive
- 
--clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
- 	mostlyclean-am
- 
- distclean: distclean-recursive
-@@ -468,7 +466,7 @@
- uninstall-info: uninstall-info-recursive
- 
- .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
--	clean-generic clean-libtool clean-noinstLIBRARIES \
-+	clean-generic clean-libtool clean-noinstLTLIBRARIES \
- 	clean-recursive distclean distclean-compile distclean-depend \
- 	distclean-generic distclean-libtool distclean-recursive \
- 	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
diff --git a/audio/xmms-flac/patches/patch-ac b/audio/xmms-flac/patches/patch-ac
deleted file mode 100644
index 771c2c1985a..00000000000
--- a/audio/xmms-flac/patches/patch-ac
+++ /dev/null
@@ -1,125 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/11/01 08:28:47 grant Exp $
-
---- src/share/grabbag/Makefile.in.orig	2003-10-31 13:55:26.000000000 +1100
-+++ src/share/grabbag/Makefile.in	2003-10-31 14:08:10.000000000 +1100
-@@ -90,6 +90,7 @@
- LN_S = @LN_S@
- LTLIB = @LTLIB@
- LTLIBICONV = @LTLIBICONV@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- NASM = @NASM@
- OBJDUMP = @OBJDUMP@
-@@ -119,9 +120,9 @@
- 
- INCLUDES = -I$(top_srcdir)/include
- 
--noinst_LIBRARIES = libgrabbag.a
-+noinst_LTLIBRARIES = libgrabbag.la
- 
--libgrabbag_a_SOURCES = \
-+libgrabbag_la_SOURCES = \
- 	cuesheet.c \
- 	file.c \
- 	replaygain.c \
-@@ -136,13 +137,12 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
--LIBRARIES = $(noinst_LIBRARIES)
-+LTLIBRARIES = $(noinst_LTLIBRARIES)
- 
--libgrabbag_a_AR = $(AR) cru
--libgrabbag_a_LIBADD =
--am_libgrabbag_a_OBJECTS = cuesheet.$(OBJEXT) file.$(OBJEXT) \
--	replaygain.$(OBJEXT) seektable.$(OBJEXT)
--libgrabbag_a_OBJECTS = $(am_libgrabbag_a_OBJECTS)
-+libgrabbag_la_LIBADD =
-+am_libgrabbag_la_OBJECTS = cuesheet.lo file.lo \
-+	replaygain.lo seektable.lo
-+libgrabbag_la_OBJECTS = $(am_libgrabbag_la_OBJECTS)
- 
- DEFS = @DEFS@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -151,8 +151,8 @@
- LIBS = @LIBS@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cuesheet.Po ./$(DEPDIR)/file.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/replaygain.Po ./$(DEPDIR)/seektable.Po
-+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cuesheet.Plo ./$(DEPDIR)/file.Plo \
-+@AMDEP_TRUE@	./$(DEPDIR)/replaygain.Plo ./$(DEPDIR)/seektable.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -161,9 +161,9 @@
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CFLAGS = @CFLAGS@
--DIST_SOURCES = $(libgrabbag_a_SOURCES)
-+DIST_SOURCES = $(libgrabbag_la_SOURCES)
- DIST_COMMON = Makefile.am Makefile.in
--SOURCES = $(libgrabbag_a_SOURCES)
-+SOURCES = $(libgrabbag_la_SOURCES)
- 
- all: all-am
- 
-@@ -177,23 +177,20 @@
- 
- AR = ar
- 
--clean-noinstLIBRARIES:
--	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
--libgrabbag.a: $(libgrabbag_a_OBJECTS) $(libgrabbag_a_DEPENDENCIES) 
--	-rm -f libgrabbag.a
--	$(libgrabbag_a_AR) libgrabbag.a $(libgrabbag_a_OBJECTS) $(libgrabbag_a_LIBADD)
--	$(RANLIB) libgrabbag.a
--
-+clean-noinstLTLIBRARIES:
-+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-+libgrabbag.la: $(libgrabbag_la_OBJECTS) $(libgrabbag_la_DEPENDENCIES) 
-+	$(LINK) $(libgrabbag_la_LDFLAGS) $(libgrabbag_la_OBJECTS) $(libgrabbag_la_LIBADD) $(LIBS)
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT) core *.core
- 
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cuesheet.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/replaygain.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seektable.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cuesheet.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/replaygain.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seektable.Plo@am__quote@
- 
- distclean-depend:
- 	-rm -rf ./$(DEPDIR)
-@@ -290,7 +287,7 @@
- 	done
- check-am: all-am
- check: check-am
--all-am: Makefile $(LIBRARIES)
-+all-am: Makefile $(LTLIBRARIES)
- 
- installdirs:
- 
-@@ -320,7 +317,7 @@
- 	@echo "it deletes files that may require special tools to rebuild."
- clean: clean-am
- 
--clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
- 	mostlyclean-am
- 
- distclean: distclean-am
-@@ -358,7 +355,7 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: GTAGS all all-am check check-am clean clean-generic \
--	clean-libtool clean-noinstLIBRARIES distclean distclean-compile \
-+	clean-libtool clean-noinstLTLIBRARIES distclean distclean-compile \
- 	distclean-depend distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am info info-am install \
- 	install-am install-data install-data-am install-exec \
diff --git a/audio/xmms-flac/patches/patch-ad b/audio/xmms-flac/patches/patch-ad
deleted file mode 100644
index 2b8d12bd2da..00000000000
--- a/audio/xmms-flac/patches/patch-ad
+++ /dev/null
@@ -1,115 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/11/01 08:28:47 grant Exp $
-
---- src/share/gain_analysis/Makefile.in.orig	2003-10-31 14:09:30.000000000 +1100
-+++ src/share/gain_analysis/Makefile.in	2003-10-31 14:14:51.000000000 +1100
-@@ -90,6 +90,7 @@
- LN_S = @LN_S@
- LTLIB = @LTLIB@
- LTLIBICONV = @LTLIBICONV@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- NASM = @NASM@
- OBJDUMP = @OBJDUMP@
-@@ -119,9 +120,9 @@
- 
- INCLUDES = -I$(top_srcdir)/include/share
- 
--noinst_LIBRARIES = libgain_analysis.a
-+noinst_LTLIBRARIES = libgain_analysis.la
- 
--libgain_analysis_a_SOURCES = gain_analysis.c
-+libgain_analysis_la_SOURCES = gain_analysis.c
- 
- EXTRA_DIST = \
- 	Makefile.lite \
-@@ -131,12 +132,11 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
--LIBRARIES = $(noinst_LIBRARIES)
-+LTLIBRARIES = $(noinst_LTLIBRARIES)
- 
--libgain_analysis_a_AR = $(AR) cru
--libgain_analysis_a_LIBADD =
--am_libgain_analysis_a_OBJECTS = gain_analysis.$(OBJEXT)
--libgain_analysis_a_OBJECTS = $(am_libgain_analysis_a_OBJECTS)
-+libgain_analysis_la_LIBADD =
-+am_libgain_analysis_la_OBJECTS = gain_analysis.lo
-+libgain_analysis_la_OBJECTS = $(am_libgain_analysis_la_OBJECTS)
- 
- DEFS = @DEFS@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -145,7 +145,7 @@
- LIBS = @LIBS@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gain_analysis.Po
-+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gain_analysis.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -154,9 +154,9 @@
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CFLAGS = @CFLAGS@
--DIST_SOURCES = $(libgain_analysis_a_SOURCES)
-+DIST_SOURCES = $(libgain_analysis_la_SOURCES)
- DIST_COMMON = Makefile.am Makefile.in
--SOURCES = $(libgain_analysis_a_SOURCES)
-+SOURCES = $(libgain_analysis_la_SOURCES)
- 
- all: all-am
- 
-@@ -170,20 +170,17 @@
- 
- AR = ar
- 
--clean-noinstLIBRARIES:
--	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
--libgain_analysis.a: $(libgain_analysis_a_OBJECTS) $(libgain_analysis_a_DEPENDENCIES) 
--	-rm -f libgain_analysis.a
--	$(libgain_analysis_a_AR) libgain_analysis.a $(libgain_analysis_a_OBJECTS) $(libgain_analysis_a_LIBADD)
--	$(RANLIB) libgain_analysis.a
--
-+clean-noinstLTLIBRARIES:
-+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-+libgain_analysis.la: $(libgain_analysis_la_OBJECTS) $(libgain_analysis_la_DEPENDENCIES) 
-+	$(LINK) $(libgain_analysis_la_LDFLAGS) $(libgain_analysis_la_OBJECTS) $(libgain_analysis_la_LIBADD) $(LIBS)
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT) core *.core
- 
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gain_analysis.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gain_analysis.Plo@am__quote@
- 
- distclean-depend:
- 	-rm -rf ./$(DEPDIR)
-@@ -280,7 +277,7 @@
- 	done
- check-am: all-am
- check: check-am
--all-am: Makefile $(LIBRARIES)
-+all-am: Makefile $(LTLIBRARIES)
- 
- installdirs:
- 
-@@ -310,7 +307,7 @@
- 	@echo "it deletes files that may require special tools to rebuild."
- clean: clean-am
- 
--clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
- 	mostlyclean-am
- 
- distclean: distclean-am
-@@ -348,7 +345,7 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: GTAGS all all-am check check-am clean clean-generic \
--	clean-libtool clean-noinstLIBRARIES distclean distclean-compile \
-+	clean-libtool clean-noinstLTLIBRARIES distclean distclean-compile \
- 	distclean-depend distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am info info-am install \
- 	install-am install-data install-data-am install-exec \
diff --git a/audio/xmms-flac/patches/patch-ae b/audio/xmms-flac/patches/patch-ae
deleted file mode 100644
index d397430296d..00000000000
--- a/audio/xmms-flac/patches/patch-ae
+++ /dev/null
@@ -1,123 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2003/11/01 08:28:47 grant Exp $
-
---- src/share/utf8/Makefile.in.orig	2003-10-31 14:16:13.000000000 +1100
-+++ src/share/utf8/Makefile.in	2003-10-31 14:21:14.000000000 +1100
-@@ -90,6 +90,7 @@
- LN_S = @LN_S@
- LTLIB = @LTLIB@
- LTLIBICONV = @LTLIBICONV@
-+LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- NASM = @NASM@
- OBJDUMP = @OBJDUMP@
-@@ -119,9 +120,9 @@
- 
- INCLUDES = -I$(top_srcdir)/include/share
- 
--noinst_LIBRARIES = libutf8.a
-+noinst_LTLIBRARIES = libutf8.la
- 
--libutf8_a_SOURCES = charset.c charset.h iconvert.c utf8.c
-+libutf8_la_SOURCES = charset.c charset.h iconvert.c utf8.c
- 
- EXTRA_DIST = \
- 	Makefile.lite \
-@@ -135,13 +136,12 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
--LIBRARIES = $(noinst_LIBRARIES)
-+LTLIBRARIES = $(noinst_LTLIBRARIES)
- 
--libutf8_a_AR = $(AR) cru
--libutf8_a_LIBADD =
--am_libutf8_a_OBJECTS = charset.$(OBJEXT) iconvert.$(OBJEXT) \
--	utf8.$(OBJEXT)
--libutf8_a_OBJECTS = $(am_libutf8_a_OBJECTS)
-+libutf8_la_LIBADD =
-+am_libutf8_la_OBJECTS = charset.lo iconvert.lo \
-+	utf8.lo
-+libutf8_la_OBJECTS = $(am_libutf8_la_OBJECTS)
- 
- DEFS = @DEFS@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -150,8 +150,8 @@
- LIBS = @LIBS@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/charset.Po ./$(DEPDIR)/iconvert.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/utf8.Po
-+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/charset.Plo ./$(DEPDIR)/iconvert.Plo \
-+@AMDEP_TRUE@	./$(DEPDIR)/utf8.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -160,9 +160,9 @@
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CFLAGS = @CFLAGS@
--DIST_SOURCES = $(libutf8_a_SOURCES)
-+DIST_SOURCES = $(libutf8_la_SOURCES)
- DIST_COMMON = Makefile.am Makefile.in
--SOURCES = $(libutf8_a_SOURCES)
-+SOURCES = $(libutf8_la_SOURCES)
- 
- all: all-am
- 
-@@ -176,22 +176,19 @@
- 
- AR = ar
- 
--clean-noinstLIBRARIES:
--	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
--libutf8.a: $(libutf8_a_OBJECTS) $(libutf8_a_DEPENDENCIES) 
--	-rm -f libutf8.a
--	$(libutf8_a_AR) libutf8.a $(libutf8_a_OBJECTS) $(libutf8_a_LIBADD)
--	$(RANLIB) libutf8.a
--
-+clean-noinstLTLIBRARIES:
-+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-+libutf8.la: $(libutf8_la_OBJECTS) $(libutf8_la_DEPENDENCIES) 
-+	$(LINK) $(libutf8_la_LDFLAGS) $(libutf8_la_OBJECTS) $(libutf8_la_LIBADD) $(LIBS)
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT) core *.core
- 
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/charset.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconvert.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/charset.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconvert.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8.Plo@am__quote@
- 
- distclean-depend:
- 	-rm -rf ./$(DEPDIR)
-@@ -288,7 +285,7 @@
- 	done
- check-am: all-am
- check: check-am
--all-am: Makefile $(LIBRARIES)
-+all-am: Makefile $(LTLIBRARIES)
- 
- installdirs:
- 
-@@ -318,7 +315,7 @@
- 	@echo "it deletes files that may require special tools to rebuild."
- clean: clean-am
- 
--clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
- 	mostlyclean-am
- 
- distclean: distclean-am
-@@ -356,7 +353,7 @@
- uninstall-am: uninstall-info-am
- 
- .PHONY: GTAGS all all-am check check-am clean clean-generic \
--	clean-libtool clean-noinstLIBRARIES distclean distclean-compile \
-+	clean-libtool clean-noinstLTLIBRARIES distclean distclean-compile \
- 	distclean-depend distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am info info-am install \
- 	install-am install-data install-data-am install-exec \
diff --git a/audio/xmms-flac/patches/patch-af b/audio/xmms-flac/patches/patch-af
deleted file mode 100644
index a95824ccd6e..00000000000
--- a/audio/xmms-flac/patches/patch-af
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-af,v 1.2 2003/11/01 08:28:47 grant Exp $
-
---- src/plugin_xmms/Makefile.in.orig	2003-10-31 14:23:56.000000000 +1100
-+++ src/plugin_xmms/Makefile.in	2003-10-31 14:24:25.000000000 +1100
-@@ -169,10 +169,10 @@
- #   http://lists.freshrpms.net/pipermail/rpm-list/2002-April/000746.html
- # the workaround is the extra '-L$(top_builddir)/src/libFLAC/.libs'
- libxmms_flac_la_LIBADD = \
--	$(top_builddir)/src/plugin_common/libplugin_common.a \
--	$(top_builddir)/src/share/grabbag/libgrabbag.a \
--	$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
--	$(top_builddir)/src/share/utf8/libutf8.a \
-+	$(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 \
- 	-L$(top_builddir)/src/libFLAC/.libs \
- 	@XMMS_LIBS@ \
-@@ -186,10 +186,10 @@
- LTLIBRARIES = $(xmmsinputplugin_LTLIBRARIES)
- 
- libxmms_flac_la_DEPENDENCIES = \
--	$(top_builddir)/src/plugin_common/libplugin_common.a \
--	$(top_builddir)/src/share/grabbag/libgrabbag.a \
--	$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
--	$(top_builddir)/src/share/utf8/libutf8.a \
-+	$(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
- am__objects_1 = charset.lo configure.lo plugin.lo wrap_id3.lo \
- 	fileinfo.lo
diff --git a/audio/xmms-flac/patches/patch-ag b/audio/xmms-flac/patches/patch-ag
deleted file mode 100644
index 2b280d65b7a..00000000000
--- a/audio/xmms-flac/patches/patch-ag
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2003/11/01 08:28:47 grant Exp $
-
---- src/flac/Makefile.in.orig	2003-01-26 05:42:28.000000000 +1100
-+++ src/flac/Makefile.in	2003-10-31 14:37:03.000000000 +1100
-@@ -158,10 +158,10 @@
- 
- flac_LDADD = \
- 	$(NEED_OGGFLAC_LIB) \
--	$(top_builddir)/src/share/grabbag/libgrabbag.a \
--	$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+	$(top_builddir)/src/share/grabbag/libgrabbag.la \
-+	$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- 	$(top_builddir)/src/share/getopt/libgetopt.a \
--	$(top_builddir)/src/share/utf8/libutf8.a \
-+	$(top_builddir)/src/share/utf8/libutf8.la \
- 	$(top_builddir)/src/libFLAC/libFLAC.la \
- 	@OGG_LIBS@ \
- 	@LIBICONV@ \
-@@ -179,16 +179,16 @@
- flac_OBJECTS = $(am_flac_OBJECTS)
- @FLaC__HAS_OGG_TRUE@flac_DEPENDENCIES = \
- @FLaC__HAS_OGG_TRUE@	$(top_builddir)/src/libOggFLAC/libOggFLAC.la \
--@FLaC__HAS_OGG_TRUE@	$(top_builddir)/src/share/grabbag/libgrabbag.a \
--@FLaC__HAS_OGG_TRUE@	$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+@FLaC__HAS_OGG_TRUE@	$(top_builddir)/src/share/grabbag/libgrabbag.la \
-+@FLaC__HAS_OGG_TRUE@	$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- @FLaC__HAS_OGG_TRUE@	$(top_builddir)/src/share/getopt/libgetopt.a \
--@FLaC__HAS_OGG_TRUE@	$(top_builddir)/src/share/utf8/libutf8.a \
-+@FLaC__HAS_OGG_TRUE@	$(top_builddir)/src/share/utf8/libutf8.la \
- @FLaC__HAS_OGG_TRUE@	$(top_builddir)/src/libFLAC/libFLAC.la
- @FLaC__HAS_OGG_FALSE@flac_DEPENDENCIES = \
--@FLaC__HAS_OGG_FALSE@	$(top_builddir)/src/share/grabbag/libgrabbag.a \
--@FLaC__HAS_OGG_FALSE@	$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+@FLaC__HAS_OGG_FALSE@	$(top_builddir)/src/share/grabbag/libgrabbag.la \
-+@FLaC__HAS_OGG_FALSE@	$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- @FLaC__HAS_OGG_FALSE@	$(top_builddir)/src/share/getopt/libgetopt.a \
--@FLaC__HAS_OGG_FALSE@	$(top_builddir)/src/share/utf8/libutf8.a \
-+@FLaC__HAS_OGG_FALSE@	$(top_builddir)/src/share/utf8/libutf8.la \
- @FLaC__HAS_OGG_FALSE@	$(top_builddir)/src/libFLAC/libFLAC.la
- flac_LDFLAGS =
- 
diff --git a/audio/xmms-flac/patches/patch-ah b/audio/xmms-flac/patches/patch-ah
deleted file mode 100644
index 6ae2856020e..00000000000
--- a/audio/xmms-flac/patches/patch-ah
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2003/11/01 08:28:47 grant Exp $
-
---- src/metaflac/Makefile.in.orig	2003-10-31 14:38:44.000000000 +1100
-+++ src/metaflac/Makefile.in	2003-10-31 14:39:19.000000000 +1100
-@@ -158,10 +158,10 @@
- metaflac_LDFLAGS = 
- 
- metaflac_LDADD = \
--	$(top_builddir)/src/share/grabbag/libgrabbag.a \
--	$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+	$(top_builddir)/src/share/grabbag/libgrabbag.la \
-+	$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- 	$(top_builddir)/src/share/getopt/libgetopt.a \
--	$(top_builddir)/src/share/utf8/libutf8.a \
-+	$(top_builddir)/src/share/utf8/libutf8.la \
- 	$(top_builddir)/src/libFLAC/libFLAC.la \
- 	@LIBICONV@ \
- 	-lm
-@@ -180,10 +180,10 @@
- 	operations_shorthand_vorbiscomment.$(OBJEXT) options.$(OBJEXT) \
- 	usage.$(OBJEXT) utils.$(OBJEXT)
- metaflac_OBJECTS = $(am_metaflac_OBJECTS)
--metaflac_DEPENDENCIES = $(top_builddir)/src/share/grabbag/libgrabbag.a \
--	$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+metaflac_DEPENDENCIES = $(top_builddir)/src/share/grabbag/libgrabbag.la \
-+	$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- 	$(top_builddir)/src/share/getopt/libgetopt.a \
--	$(top_builddir)/src/share/utf8/libutf8.a \
-+	$(top_builddir)/src/share/utf8/libutf8.la \
- 	$(top_builddir)/src/libFLAC/libFLAC.la
- 
- DEFS = @DEFS@
diff --git a/audio/xmms-flac/patches/patch-ai b/audio/xmms-flac/patches/patch-ai
deleted file mode 100644
index 86f9c370211..00000000000
--- a/audio/xmms-flac/patches/patch-ai
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2003/11/01 08:28:47 grant Exp $
-
---- src/test_grabbag/cuesheet/Makefile.in.orig	2003-10-31 14:49:11.000000000 +1100
-+++ src/test_grabbag/cuesheet/Makefile.in	2003-10-31 14:49:39.000000000 +1100
-@@ -144,8 +144,8 @@
- 	main.c
- 
- test_cuesheet_LDADD = \
--	$(top_builddir)/src/share/grabbag/libgrabbag.a \
--	$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+	$(top_builddir)/src/share/grabbag/libgrabbag.la \
-+	$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- 	$(top_builddir)/src/libFLAC/libFLAC.la \
- 	-lm
- 
-@@ -161,8 +161,8 @@
- am_test_cuesheet_OBJECTS = main.$(OBJEXT)
- test_cuesheet_OBJECTS = $(am_test_cuesheet_OBJECTS)
- test_cuesheet_DEPENDENCIES = \
--	$(top_builddir)/src/share/grabbag/libgrabbag.a \
--	$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+	$(top_builddir)/src/share/grabbag/libgrabbag.la \
-+	$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- 	$(top_builddir)/src/libFLAC/libFLAC.la
- test_cuesheet_LDFLAGS =
- 
diff --git a/audio/xmms-flac/patches/patch-aj b/audio/xmms-flac/patches/patch-aj
deleted file mode 100644
index 1c0cee5db45..00000000000
--- a/audio/xmms-flac/patches/patch-aj
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2003/11/01 08:28:47 grant Exp $
-
---- src/test_libFLAC/Makefile.in.orig	2003-10-31 14:54:37.000000000 +1100
-+++ src/test_libFLAC/Makefile.in	2003-10-31 14:55:08.000000000 +1100
-@@ -142,8 +142,8 @@
- 
- noinst_PROGRAMS = test_libFLAC
- test_libFLAC_LDADD = \
--	$(top_builddir)/src/share/grabbag/libgrabbag.a \
--	$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+	$(top_builddir)/src/share/grabbag/libgrabbag.la \
-+	$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- 	$(top_builddir)/src/libFLAC/libFLAC.la \
- 	-lm
- 
-@@ -177,8 +177,8 @@
- 	metadata_object.$(OBJEXT) metadata_utils.$(OBJEXT)
- test_libFLAC_OBJECTS = $(am_test_libFLAC_OBJECTS)
- test_libFLAC_DEPENDENCIES = \
--	$(top_builddir)/src/share/grabbag/libgrabbag.a \
--	$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+	$(top_builddir)/src/share/grabbag/libgrabbag.la \
-+	$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- 	$(top_builddir)/src/libFLAC/libFLAC.la
- test_libFLAC_LDFLAGS =
- 
diff --git a/audio/xmms-flac/patches/patch-ak b/audio/xmms-flac/patches/patch-ak
deleted file mode 100644
index 7e440ed3b02..00000000000
--- a/audio/xmms-flac/patches/patch-ak
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2003/11/01 08:28:47 grant Exp $
-
---- src/test_libFLAC++/Makefile.in.orig	2003-10-31 15:00:53.000000000 +1100
-+++ src/test_libFLAC++/Makefile.in	2003-10-31 15:01:19.000000000 +1100
-@@ -142,8 +142,8 @@
- 
- noinst_PROGRAMS = test_libFLAC++
- test_libFLAC___LDADD = \
--	$(top_builddir)/src/share/grabbag/libgrabbag.a \
--	$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+	$(top_builddir)/src/share/grabbag/libgrabbag.la \
-+	$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- 	$(top_builddir)/src/libFLAC++/libFLAC++.la \
- 	$(top_builddir)/src/libFLAC/libFLAC.la \
- 	-lm
-@@ -176,8 +176,8 @@
- 	metadata_utils.$(OBJEXT)
- test_libFLAC___OBJECTS = $(am_test_libFLAC___OBJECTS)
- test_libFLAC___DEPENDENCIES = \
--	$(top_builddir)/src/share/grabbag/libgrabbag.a \
--	$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+	$(top_builddir)/src/share/grabbag/libgrabbag.la \
-+	$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- 	$(top_builddir)/src/libFLAC++/libFLAC++.la \
- 	$(top_builddir)/src/libFLAC/libFLAC.la
- test_libFLAC___LDFLAGS =
diff --git a/audio/xmms-flac/patches/patch-al b/audio/xmms-flac/patches/patch-al
deleted file mode 100644
index a6466a7d760..00000000000
--- a/audio/xmms-flac/patches/patch-al
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-al,v 1.1 2003/12/21 17:50:55 ben Exp $
-
---- src/test_libOggFLAC/Makefile.in.orig	2003-01-25 10:42:54.000000000 -0800
-+++ src/test_libOggFLAC/Makefile.in
-@@ -142,8 +142,8 @@ INCLUDES = 
- 
- noinst_PROGRAMS = test_libOggFLAC
- test_libOggFLAC_LDADD = \
--	$(top_builddir)/src/share/grabbag/libgrabbag.a \
--	$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+	$(top_builddir)/src/share/grabbag/libgrabbag.la \
-+	$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- 	$(top_builddir)/src/libOggFLAC/libOggFLAC.la \
- 	$(top_builddir)/src/libFLAC/libFLAC.la \
- 	@OGG_LIBS@ \
-@@ -171,8 +171,8 @@ am_test_libOggFLAC_OBJECTS = decoders.$(
- 	file_utils.$(OBJEXT) main.$(OBJEXT) metadata_utils.$(OBJEXT)
- test_libOggFLAC_OBJECTS = $(am_test_libOggFLAC_OBJECTS)
- test_libOggFLAC_DEPENDENCIES = \
--	$(top_builddir)/src/share/grabbag/libgrabbag.a \
--	$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+	$(top_builddir)/src/share/grabbag/libgrabbag.la \
-+	$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- 	$(top_builddir)/src/libOggFLAC/libOggFLAC.la \
- 	$(top_builddir)/src/libFLAC/libFLAC.la
- test_libOggFLAC_LDFLAGS =
diff --git a/audio/xmms-flac/patches/patch-am b/audio/xmms-flac/patches/patch-am
deleted file mode 100644
index f5cb9d67ca6..00000000000
--- a/audio/xmms-flac/patches/patch-am
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-am,v 1.1 2003/12/21 17:50:55 ben Exp $
-
---- src/test_libOggFLAC++/Makefile.in.orig	2003-01-25 10:42:53.000000000 -0800
-+++ src/test_libOggFLAC++/Makefile.in
-@@ -142,8 +142,8 @@ CFLAGS = @CFLAGS@ @OGG_CFLAGS@
- 
- noinst_PROGRAMS = test_libOggFLAC++
- test_libOggFLAC___LDADD = \
--	$(top_builddir)/src/share/grabbag/libgrabbag.a \
--	$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+	$(top_builddir)/src/share/grabbag/libgrabbag.la \
-+	$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- 	$(top_builddir)/src/libOggFLAC++/libOggFLAC++.la \
- 	$(top_builddir)/src/libOggFLAC/libOggFLAC.la \
- 	$(top_builddir)/src/libFLAC/libFLAC.la \
-@@ -172,8 +172,8 @@ am_test_libOggFLAC___OBJECTS = decoders.
- 	file_utils.$(OBJEXT) main.$(OBJEXT) metadata_utils.$(OBJEXT)
- test_libOggFLAC___OBJECTS = $(am_test_libOggFLAC___OBJECTS)
- test_libOggFLAC___DEPENDENCIES = \
--	$(top_builddir)/src/share/grabbag/libgrabbag.a \
--	$(top_builddir)/src/share/gain_analysis/libgain_analysis.a \
-+	$(top_builddir)/src/share/grabbag/libgrabbag.la \
-+	$(top_builddir)/src/share/gain_analysis/libgain_analysis.la \
- 	$(top_builddir)/src/libOggFLAC++/libOggFLAC++.la \
- 	$(top_builddir)/src/libOggFLAC/libOggFLAC.la \
- 	$(top_builddir)/src/libFLAC/libFLAC.la
diff --git a/audio/xmms-flac/patches/patch-an b/audio/xmms-flac/patches/patch-an
new file mode 100644
index 00000000000..81fc84fffed
--- /dev/null
+++ b/audio/xmms-flac/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2004/10/15 22:56:50 ben Exp $
+
+--- src/plugin_common/canonical_tag.c.orig	Mon Sep 27 18:00:55 2004
++++ src/plugin_common/canonical_tag.c
+@@ -66,7 +66,7 @@ wchar_t *

+ wcsdup (s)

+      const wchar_t *s;

+ {

+-  size_t len = (__wcslen (s) + 1) * sizeof (wchar_t);

++  size_t len = (wcslen (s) + 1) * sizeof (wchar_t);

+   void *new = malloc (len);

+ 

+   if (new == NULL)