Fix linkage with -lintl. In one plugin, disable the -Wl,-z,defs usage

as it breaks on DragonFly.

14 files changed, 268 insertions, 1 deletions

diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index d137b0ccb34..5ab0b8bb79c 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2007/06/15 18:20:05 drochner Exp $
+$NetBSD: distinfo,v 1.47 2007/06/18 21:16:10 joerg Exp $
 
 SHA1 (xine-lib-1.1.7.tar.gz) = 219d0ac7f43e37faf2d597d2c424f7fd51d2237b
 RMD160 (xine-lib-1.1.7.tar.gz) = 519426526ecc7e8c5f4871e2fdf7770fc57e31b7
@@ -7,16 +7,29 @@ SHA1 (patch-aa) = e09d34a121080b03bc67b2d8a3ca27463b771acc
 SHA1 (patch-ab) = ef13b60c2bea54f354acf1b2d70c04594dac36c9
 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
 SHA1 (patch-ae) = 78060d0d1a721642776a909ab3dfef6bd4441a33
+SHA1 (patch-af) = 68ed767a7c320c37157368b07d843e9f5048267c
 SHA1 (patch-ag) = 56ea1513f33f4d26581707303a001f62a6eb4abe
 SHA1 (patch-ah) = ba408237d4a717cc91b5d06ede425048914a9a1f
 SHA1 (patch-ai) = f0b33c1a36082445a86bcf71e07a6210aa21b7dc
 SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b
 SHA1 (patch-ak) = 744f59d1b9e40983f25bb532db1a5d4e92be6fbe
 SHA1 (patch-al) = 9e3ad86a7d7f32e58de157fa37141138af10838e
+SHA1 (patch-am) = 67392b0db6de3ec97bc5fc5e46e08ee2e67ec97c
 SHA1 (patch-ao) = 3ccc00285e425ec3753838ce6f1450d598d89425
 SHA1 (patch-ap) = 075b0691fc2b760dd1069957b7f8f00361f9ae39
+SHA1 (patch-aq) = f6efa28ab1b9a24b79c18c181a5d309db53172e4
+SHA1 (patch-ar) = f06014618890efec9274a4c21d2fff2998723a39
 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
+SHA1 (patch-at) = c9be143d87ec1f9d37fc4a1d0670df00c0e79e27
+SHA1 (patch-au) = 59a9eac67a8aaabd9b105180a5c6e23fe8427fd8
+SHA1 (patch-av) = 58a0489cd0099f84fdaeb89bf35f7dcfc3bd040a
 SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc
+SHA1 (patch-ax) = 09328458d39266f1f9d87f366626c973a05ffc5d
+SHA1 (patch-ay) = d4919b3816ddd74413f3e5f5b7a99dc5209562d7
+SHA1 (patch-az) = c314f6a6b95a69c749bf9962ebfdd0a3d35aaeb8
+SHA1 (patch-ba) = a57a963fa918a2f7b44c226af36b9a08bce9dcc6
+SHA1 (patch-bb) = ded7a74e46dc86c3b38b7fe912ff9142742c4ac7
+SHA1 (patch-bc) = 12fa12764dee855e8c4f7f5c64f5a389f7584ee3
 SHA1 (patch-bd) = 2f0f39512d185377cca1ebaf4e891d518a1c14d0
 SHA1 (patch-be) = 04eb23f58cb96dab4b7c7120092364915ebaf330
 SHA1 (patch-bg) = 83f97ad77c8295fcaf78a7ea7fe9c4f87efd80d0
diff --git a/multimedia/xine-lib/patches/patch-af b/multimedia/xine-lib/patches/patch-af
new file mode 100644
index 00000000000..57813af28fa
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-af
@@ -0,0 +1,26 @@
+$NetBSD: patch-af,v 1.5 2007/06/18 21:16:10 joerg Exp $
+
+--- src/video_out/Makefile.in.orig	2007-06-17 19:17:10.000000000 +0000
++++ src/video_out/Makefile.in
+@@ -870,10 +870,10 @@ xineplug_vo_out_xcbxv_la_CFLAGS = $(VISI
+ xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
+ 	video_out_xshm.c $(X11OSD)
+ 
+-xineplug_vo_out_xshm_la_LIBADD = $(MLIB_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
++xineplug_vo_out_xshm_la_LIBADD = $(MLIB_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(LIBINTL)
+ xineplug_vo_out_xshm_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) $(MLIB_CFLAGS) -fno-strict-aliasing
+ xineplug_vo_out_xv_la_SOURCES = $(X11OSD) deinterlace.c video_out_xv.c
+-xineplug_vo_out_xv_la_LIBADD = $(XV_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
++xineplug_vo_out_xv_la_LIBADD = $(XV_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(LIBINTL)
+ xineplug_vo_out_xv_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) $(XV_CFLAGS) -fno-strict-aliasing
+ xineplug_vo_out_xvmc_la_SOURCES = deinterlace.c video_out_xvmc.c
+ xineplug_vo_out_xvmc_la_LIBADD = $(XVMC_LIBS) $(XV_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
+@@ -934,7 +934,7 @@ xineplug_vo_out_directx_la_CPPFLAGS = $(
+ xineplug_vo_out_directx_la_LIBADD = $(DIRECTX_VIDEO_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
+ xineplug_vo_out_directx_la_CFLAGS = $(VISIBILITY_FLAG)
+ xineplug_vo_out_none_la_SOURCES = video_out_none.c
+-xineplug_vo_out_none_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
++xineplug_vo_out_none_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LIBINTL)
+ xineplug_vo_out_none_la_CFLAGS = $(VISIBILITY_FLAG)
+ xineplug_vo_out_macosx_la_SOURCES = video_out_macosx.m
+ xineplug_vo_out_macosx_la_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(MLIB_CFLAGS)
diff --git a/multimedia/xine-lib/patches/patch-am b/multimedia/xine-lib/patches/patch-am
new file mode 100644
index 00000000000..117ab7e02bd
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-am
@@ -0,0 +1,65 @@
+$NetBSD: patch-am,v 1.5 2007/06/18 21:16:11 joerg Exp $
+
+--- src/demuxers/Makefile.in.orig	2007-06-17 19:36:35.000000000 +0000
++++ src/demuxers/Makefile.in
+@@ -728,25 +728,25 @@ xineplug_LTLIBRARIES = $(ogg_module) $(a
+ 	xineplug_dmx_flv.la 
+ 
+ xineplug_dmx_ogg_la_SOURCES = demux_ogg.c
+-xineplug_dmx_ogg_la_LIBADD = $(VORBIS_LIBS) $(SPEEX_LIBS) $(THEORA_LIBS) $(OGG_LIBS) $(XINE_LIB)
++xineplug_dmx_ogg_la_LIBADD = $(VORBIS_LIBS) $(SPEEX_LIBS) $(THEORA_LIBS) $(OGG_LIBS) $(XINE_LIB) $(LIBINTL)
+ xineplug_dmx_ogg_la_CFLAGS = $(AM_CFLAGS) $(VORBIS_CFLAGS) $(SPEEX_CFLAGS) $(THEORA_CFLAGS) $(OGG_CFLAGS)
+ xineplug_dmx_avi_la_SOURCES = demux_avi.c
+-xineplug_dmx_avi_la_LIBADD = $(XINE_LIB)
++xineplug_dmx_avi_la_LIBADD = $(XINE_LIB) $(LIBINTL)
+ xineplug_dmx_mpeg_block_la_SOURCES = demux_mpeg_block.c
+-xineplug_dmx_mpeg_block_la_LIBADD = $(XINE_LIB)
++xineplug_dmx_mpeg_block_la_LIBADD = $(XINE_LIB) $(LIBINTL)
+ xineplug_dmx_mpeg_la_SOURCES = demux_mpeg.c
+ xineplug_dmx_mpeg_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_mpeg_elem_la_SOURCES = demux_elem.c
+ xineplug_dmx_mpeg_elem_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_mpeg_pes_la_SOURCES = demux_mpeg_pes.c
+-xineplug_dmx_mpeg_pes_la_LIBADD = $(XINE_LIB)
++xineplug_dmx_mpeg_pes_la_LIBADD = $(XINE_LIB) $(LIBINTL)
+ xineplug_dmx_mpeg_ts_la_SOURCES = demux_ts.c
+ xineplug_dmx_mpeg_ts_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_qt_la_SOURCES = demux_qt.c
+ xineplug_dmx_qt_la_LIBADD = $(XINE_LIB) $(ZLIB_LIBS)
+ xineplug_dmx_qt_la_CPPFLAGS = $(ZLIB_CPPFLAGS)
+ xineplug_dmx_asf_la_SOURCES = demux_asf.c asfheader.c
+-xineplug_dmx_asf_la_LIBADD = $(XINE_LIB)
++xineplug_dmx_asf_la_LIBADD = $(XINE_LIB) $(LIBINTL)
+ xineplug_dmx_asf_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
+ xineplug_dmx_fli_la_SOURCES = demux_fli.c
+ xineplug_dmx_fli_la_LIBADD = $(XINE_LIB)
+@@ -767,7 +767,7 @@ xineplug_dmx_games_la_SOURCES = group_ga
+ 				demux_film.c demux_smjpeg.c demux_4xm.c \
+ 				demux_vmd.c
+ 
+-xineplug_dmx_games_la_LIBADD = $(XINE_LIB)
++xineplug_dmx_games_la_LIBADD = $(XINE_LIB) $(LIBINTL)
+ xineplug_dmx_games_la_LDFLAGS = -avoid-version -module
+ xineplug_dmx_audio_la_SOURCES = group_audio.c demux_aud.c demux_aiff.c \
+ 				demux_cdda.c demux_mpgaudio.c demux_nsf.c \
+@@ -777,7 +777,7 @@ xineplug_dmx_audio_la_SOURCES = group_au
+ 				demux_mpc.c demux_dts.c demux_shn.c \
+ 				demux_tta.c
+ 
+-xineplug_dmx_audio_la_LIBADD = $(XINE_LIB) $(LIBMODPLUG_LIBS)
++xineplug_dmx_audio_la_LIBADD = $(XINE_LIB) $(LIBMODPLUG_LIBS) $(LIBINTL)
+ xineplug_dmx_audio_la_CFLAGS = $(AM_CFLAGS) $(LIBMODPLUG_CFLAGS)
+ xineplug_dmx_yuv_frames_la_SOURCES = demux_yuv_frames.c
+ xineplug_dmx_yuv_frames_la_LIBADD = $(XINE_LIB)
+@@ -792,9 +792,9 @@ xineplug_dmx_matroska_la_LIBADD = $(XINE
+ xineplug_dmx_matroska_la_CPPFLAGS = $(ZLIB_CPPFLAGS)
+ xineplug_dmx_matroska_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
+ xineplug_dmx_iff_la_SOURCES = demux_iff.c
+-xineplug_dmx_iff_la_LIBADD = $(XINE_LIB)
++xineplug_dmx_iff_la_LIBADD = $(XINE_LIB) $(LIBINTL)
+ xineplug_dmx_flv_la_SOURCES = demux_flv.c
+-xineplug_dmx_flv_la_LIBADD = $(XINE_LIB)
++xineplug_dmx_flv_la_LIBADD = $(XINE_LIB) $(LIBINTL)
+ xineinclude_HEADERS = demux.h
+ noinst_HEADERS = asfheader.h qtpalette.h group_games.h group_audio.h id3.h ebml.h matroska.h iff.h flacutils.h
+ all: all-am
diff --git a/multimedia/xine-lib/patches/patch-aq b/multimedia/xine-lib/patches/patch-aq
new file mode 100644
index 00000000000..0ad498597cb
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-aq
@@ -0,0 +1,12 @@
+$NetBSD: patch-aq,v 1.8 2007/06/18 21:16:11 joerg Exp $
+
+--- src/libffmpeg/libavcodec/utils.c.orig	2007-06-17 20:11:32.000000000 +0000
++++ src/libffmpeg/libavcodec/utils.c
+@@ -34,6 +34,7 @@
+ #include <stdarg.h>
+ #include <limits.h>
+ #include <float.h>
++#include <unistd.h>
+ #ifdef __MINGW32__
+ #include <fcntl.h>
+ #endif
diff --git a/multimedia/xine-lib/patches/patch-ar b/multimedia/xine-lib/patches/patch-ar
new file mode 100644
index 00000000000..f068df90135
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-ar
@@ -0,0 +1,19 @@
+$NetBSD: patch-ar,v 1.4 2007/06/18 21:16:11 joerg Exp $
+
+--- src/libffmpeg/Makefile.in.orig	2007-06-17 20:17:46.000000000 +0000
++++ src/libffmpeg/Makefile.in
+@@ -604,12 +604,12 @@ xineplug_LTLIBRARIES = xineplug_decode_f
+ xineplug_decode_ff_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
+ xineplug_decode_ff_la_LDFLAGS = $(xineplug_ldflags) $(IMPURE_TEXT_LDFLAGS)
+ xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \
+-	$(link_ffmpeg) $(PTHREAD_LIBS)
++	$(link_ffmpeg) $(PTHREAD_LIBS) $(LIBINTL)
+ 
+ xineplug_decode_dvaudio_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
+ xineplug_decode_dvaudio_la_LDFLAGS = $(xineplug_ldflags)
+ xineplug_decode_dvaudio_la_SOURCES = ff_dvaudio_decoder.c
+-xineplug_decode_dvaudio_la_LIBADD = $(XINE_LIB)
++xineplug_decode_dvaudio_la_LIBADD = $(XINE_LIB) $(LIBINTL)
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/multimedia/xine-lib/patches/patch-at b/multimedia/xine-lib/patches/patch-at
new file mode 100644
index 00000000000..4ab0aedd895
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.5 2007/06/18 21:16:11 joerg Exp $
+
+--- src/liba52/Makefile.in.orig	2007-06-17 20:23:04.000000000 +0000
++++ src/liba52/Makefile.in
+@@ -570,7 +570,7 @@ xineplug_decode_a52_la_SOURCES = \
+ @EXTERNAL_A52DEC_FALSE@xineplug_decode_a52_la_LIBADD = $(XINE_LIB) -lm
+ @EXTERNAL_A52DEC_TRUE@xineplug_decode_a52_la_LIBADD = $(XINE_LIB) -la52 -lm
+ xineplug_decode_a52_la_CFLAGS = $(VISIBILITY_FLAG)
+-xineplug_decode_a52_la_LDFLAGS = $(xineplug_ldflags)
++xineplug_decode_a52_la_LDFLAGS = $(xineplug_ldflags) $(LIBINTL)
+ noinst_HEADERS = \
+ 	a52.h \
+ 	a52_internal.h \
diff --git a/multimedia/xine-lib/patches/patch-au b/multimedia/xine-lib/patches/patch-au
new file mode 100644
index 00000000000..de1224bbc31
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-au
@@ -0,0 +1,13 @@
+$NetBSD: patch-au,v 1.6 2007/06/18 21:16:11 joerg Exp $
+
+--- src/libspucmml/Makefile.in.orig	2007-06-17 20:25:09.000000000 +0000
++++ src/libspucmml/Makefile.in
+@@ -542,7 +542,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post
+ vidixdir = $(XINE_PLUGINDIR)/vidix
+ xineplug_LTLIBRARIES = xineplug_decode_spucmml.la
+ xineplug_decode_spucmml_la_SOURCES = xine_cmml_decoder.c
+-xineplug_decode_spucmml_la_LIBADD = $(XINE_LIB)
++xineplug_decode_spucmml_la_LIBADD = $(XINE_LIB) $(LIBINTL)
+ xineplug_decode_spucmml_la_CFLAGS = $(VISIBILITY_FLAG)
+ xineplug_decode_spucmml_la_LDFLAGS = $(xineplug_ldflags)
+ all: all-am
diff --git a/multimedia/xine-lib/patches/patch-av b/multimedia/xine-lib/patches/patch-av
new file mode 100644
index 00000000000..33bc293e8db
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-av
@@ -0,0 +1,22 @@
+$NetBSD: patch-av,v 1.5 2007/06/18 21:16:12 joerg Exp $
+
+--- src/libspudvb/Makefile.in.orig	2007-06-06 13:40:49.000000000 +0000
++++ src/libspudvb/Makefile.in
+@@ -389,7 +389,7 @@ MSGMERGE = @MSGMERGE@
+ MUSEPACK_FALSE = @MUSEPACK_FALSE@
+ MUSEPACK_TRUE = @MUSEPACK_TRUE@
+ NET_LIBS = @NET_LIBS@
+-NOUNDEF = @NOUNDEF@
++#NOUNDEF = @NOUNDEF@
+ OBJC = @OBJC@
+ OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+@@ -544,7 +544,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post
+ vidixdir = $(XINE_PLUGINDIR)/vidix
+ xineplug_LTLIBRARIES = xineplug_decode_spudvb.la
+ xineplug_decode_spudvb_la_SOURCES = xine_spudvb_decoder.c
+-xineplug_decode_spudvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
++xineplug_decode_spudvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LIBINTL)
+ xineplug_decode_spudvb_la_CFLAGS = $(VISIBILITY_FLAG)
+ xineplug_decode_spudvb_la_LDFLAGS = $(xineplug_ldflags)
+ all: all-am
diff --git a/multimedia/xine-lib/patches/patch-ax b/multimedia/xine-lib/patches/patch-ax
new file mode 100644
index 00000000000..d093e354334
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-ax
@@ -0,0 +1,17 @@
+$NetBSD: patch-ax,v 1.5 2007/06/18 21:16:12 joerg Exp $
+
+--- src/libsputext/Makefile.in.orig	2007-06-18 19:18:40.000000000 +0000
++++ src/libsputext/Makefile.in
+@@ -550,10 +550,10 @@ vidixdir = $(XINE_PLUGINDIR)/vidix
+ AM_LDFLAGS = $(xineplug_ldflags)
+ xineplug_LTLIBRARIES = xineplug_decode_sputext.la xineplug_dmx_sputext.la
+ xineplug_dmx_sputext_la_SOURCES = demux_sputext.c
+-xineplug_dmx_sputext_la_LIBADD = $(XINE_LIB)
++xineplug_dmx_sputext_la_LIBADD = $(XINE_LIB) $(LIBINTL)
+ xineplug_dmx_sputext_la_CFLAGS = $(VISIBILITY_FLAG)
+ xineplug_decode_sputext_la_SOURCES = xine_sputext_decoder.c 
+-xineplug_decode_sputext_la_LIBADD = $(XINE_LIB)
++xineplug_decode_sputext_la_LIBADD = $(XINE_LIB) $(LIBINTL)
+ xineplug_decode_sputext_la_CFLAGS = $(VISIBILITY_FLAG)
+ all: all-am
+ 
diff --git a/multimedia/xine-lib/patches/patch-ay b/multimedia/xine-lib/patches/patch-ay
new file mode 100644
index 00000000000..06c3df9088e
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-ay
@@ -0,0 +1,13 @@
+$NetBSD: patch-ay,v 1.3 2007/06/18 21:16:12 joerg Exp $
+
+--- src/libdts/Makefile.in.orig	2007-06-18 19:26:19.000000000 +0000
++++ src/libdts/Makefile.in
+@@ -562,7 +562,7 @@ xineplug_LTLIBRARIES = $(dts_module)
+ xineplug_decode_dts_la_SOURCES = xine_dts_decoder.c $(internal_sources)
+ xineplug_decode_dts_la_CFLAGS = $(LIBDTS_CFLAGS) $(VISIBILITY_FLAG) $(fnsa)
+ xineplug_decode_dts_la_LDFLAGS = $(xineplug_ldflags)
+-@EXTERNAL_LIBDTS_FALSE@xineplug_decode_dts_la_LIBADD = $(XINE_LIB) -lm
++@EXTERNAL_LIBDTS_FALSE@xineplug_decode_dts_la_LIBADD = $(XINE_LIB) -lm $(LIBINTL)
+ @EXTERNAL_LIBDTS_TRUE@xineplug_decode_dts_la_LIBADD = $(XINE_LIB) $(LIBDTS_LIBS) -lm
+ noinst_HEADERS = bitstream.h internal-dts.h dts_internal.h tables.h tables_adpcm.h \
+ 	tables_fir.h tables_huffman.h tables_quantization.h tables_vq.h
diff --git a/multimedia/xine-lib/patches/patch-az b/multimedia/xine-lib/patches/patch-az
new file mode 100644
index 00000000000..2fbd9284992
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-az
@@ -0,0 +1,13 @@
+$NetBSD: patch-az,v 1.4 2007/06/18 21:16:12 joerg Exp $
+
+--- src/libxinevdec/Makefile.in.orig	2007-06-18 19:36:37.000000000 +0000
++++ src/libxinevdec/Makefile.in
+@@ -594,7 +594,7 @@ xineplug_LTLIBRARIES = $(image_module) \
+ 	xineplug_decode_yuv.la
+ 
+ xineplug_decode_bitplane_la_SOURCES = bitplane.c
+-xineplug_decode_bitplane_la_LIBADD = $(XINE_LIB)
++xineplug_decode_bitplane_la_LIBADD = $(XINE_LIB) $(LIBINTL)
+ xineplug_decode_rgb_la_SOURCES = rgb.c
+ xineplug_decode_rgb_la_LIBADD = $(XINE_LIB)
+ xineplug_decode_yuv_la_SOURCES = yuv.c
diff --git a/multimedia/xine-lib/patches/patch-ba b/multimedia/xine-lib/patches/patch-ba
new file mode 100644
index 00000000000..6769cb26d81
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.5 2007/06/18 21:16:12 joerg Exp $
+
+--- src/libreal/Makefile.in.orig	2007-06-18 19:43:07.000000000 +0000
++++ src/libreal/Makefile.in
+@@ -550,7 +550,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post
+ vidixdir = $(XINE_PLUGINDIR)/vidix
+ @ENABLE_REAL_TRUE@xineplug_LTLIBRARIES = xineplug_decode_real.la
+ xineplug_decode_real_la_SOURCES = xine_real_video_decoder.c real_common.c xine_real_audio_decoder.c
+-xineplug_decode_real_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS)
++xineplug_decode_real_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) $(LIBINTL)
+ xineplug_decode_real_la_CFLAGS = $(VISIBILITY_FLAG)
+ xineplug_decode_real_la_LDFLAGS = $(xineplug_ldflags)
+ noinst_HEADERS = real_common.h
diff --git a/multimedia/xine-lib/patches/patch-bb b/multimedia/xine-lib/patches/patch-bb
new file mode 100644
index 00000000000..89971b9ef06
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.5 2007/06/18 21:16:12 joerg Exp $
+
+--- src/libfaad/Makefile.in.orig	2007-06-18 19:48:11.000000000 +0000
++++ src/libfaad/Makefile.in
+@@ -633,7 +633,7 @@ xineplug_decode_faad_la_SOURCES = \
+ 	xine_faad_decoder.c
+ 
+ xineplug_decode_faad_la_LDFLAGS = $(xineplug_ldflags)
+-xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB)
++xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB) $(LIBINTL)
+ noinst_HEADERS = \
+ 	analysis.h \
+ 	bits.h \
diff --git a/multimedia/xine-lib/patches/patch-bc b/multimedia/xine-lib/patches/patch-bc
new file mode 100644
index 00000000000..7e73c4f8d31
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-bc
@@ -0,0 +1,15 @@
+$NetBSD: patch-bc,v 1.5 2007/06/18 21:16:12 joerg Exp $
+
+--- src/libmusepack/Makefile.in.orig	2007-06-18 19:50:33.000000000 +0000
++++ src/libmusepack/Makefile.in
+@@ -569,8 +569,8 @@ EXTRA_DIST = diff_against_svn.patch
+ @EXTERNAL_MPCDEC_FALSE@	mpc_reader.c requant.c streaminfo.c synth_filter.c
+ 
+ @EXTERNAL_MPCDEC_TRUE@internal_sources = 
+-@EXTERNAL_MPCDEC_FALSE@xineplug_decode_mpc_la_LIBADD = $(XINE_LIB)
+-@EXTERNAL_MPCDEC_TRUE@xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) -lmpcdec
++@EXTERNAL_MPCDEC_FALSE@xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) $(LIBINTL)
++@EXTERNAL_MPCDEC_TRUE@xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) $(LIBINTL) -lmpcdec
+ xineplug_decode_mpc_la_SOURCES = $(internal_sources) xine_musepack_decoder.c
+ xineplug_decode_mpc_la_CFLAGS = $(VISIBILITY_FLAG)
+ xineplug_decode_mpc_la_LDFLAGS = $(xineplug_ldflags)