Update to 1.1.7.

Use OPTIONS.

10 files changed, 199 insertions, 347 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index c7fc43cc0a4c..29284fe00d21 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	1.1.4
-PORTREVISION=	6
+PORTVERSION=	1.1.7
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -53,30 +52,44 @@ CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32 --enable-ipv6 \
 		--mandir=${PREFIX}/man --with-external-libmad \
 		--with-external-libdts --with-libflac --disable-v4l
 
+OPTIONS=	ARTS "Enable aRts support" off \
+		CACA "Enable libcaca support" off \
+		ESOUND "Enable EsounD support" off \
+		JACK "Enable JACK support" off \
+		GNOMEVFS2 "Enable GnomeVFS2 support" off \
+		PULSEAUDIO "Enable PulseAudio support" off \
+		XVMC "Enable XvMC support" off \
+		SMB "Enable SMB protocol support" off \
+		AALIB "Enable aalib support" off \
+		IMAGEMAGICK "Enable ImageMagick support" off \
+		GTK2 "Enable gdkpixbuf support" off \
+
 MAN1=	xine-config.1
 MAN5=	xine.5
 
 DOCSDIR=	${TARGETDIR}/share/doc/xine-lib
+PLIST_SUB=	PLUGINSDIR="lib/xine/plugins/${PORTVERSION}"
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_ARTS) && (exists(${LOCALBASE}/bin/artsc-config) || defined(WITH_ARTS))
+.if defined(WITH_ARTS)
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
 PLIST_SUB+=	WITH_ARTS=""
+CONFIGURE_ARGS+=	--with-arts --enable-artstest
 .else
 PLIST_SUB+=	WITH_ARTS="@comment "
 CONFIGURE_ARGS+=	--disable-arts --disable-artstest
 .endif
 
-.if !defined(WITHOUT_CACA) && (exists(${LOCALBASE}/lib/libcaca.a) || defined(WITH_CACA))
+.if defined(WITH_CACA)
 BUILD_DEPENDS+=	caca-config:${PORTSDIR}/graphics/libcaca
 PLIST_SUB+=	WITH_CACA=""
 .else
 PLIST_SUB+=	WITH_CACA="@comment "
-CONFIGURE_ARGS+=	--disable-caca --disable-cacatest
+CONFIGURE_ARGS+=	--without-caca --disable-cacatest
 .endif
 
-.if !defined(WITHOUT_ESOUND) && (${HAVE_GNOME:Mesound} != "" || defined(WITH_ESOUND))
+.if defined(WITH_ESOUND)
 USE_GNOME+=	esound
 PLIST_SUB+=	WITH_ESOUND=""
 .else
@@ -84,15 +97,15 @@ PLIST_SUB+=	WITH_ESOUND="@comment "
 CONFIGURE_ARGS+=	--without-esound
 .endif
 
-.if !defined(WITHOUT_JACK) && (exists(${LOCALBASE}/lib/libjack.so) || defined(WITH_JACK))
+.if defined(WITH_JACK)
 LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
 PLIST_SUB+=	WITH_JACK=""
 .else
 PLIST_SUB+=	WITH_JACK="@comment "
-CONFIGURE_ARGS+=	--disable-jack
+CONFIGURE_ARGS+=	--without-jack
 .endif
 
-.if !defined(WITHOUT_GNOMEVFS2) && (${HAVE_GNOME:Mgnomevfs2} != "" || defined(WITH_GNOMEVFS2))
+.if defined(WITH_GNOMEVFS2)
 USE_GNOME+=	gnomevfs2
 PLIST_SUB+=	WITH_GNOMEVFS2=""
 .else
@@ -100,28 +113,29 @@ PLIST_SUB+=	WITH_GNOMEVFS2="@comment "
 CONFIGURE_ARGS+=	--disable-gnomevfs
 .endif
 
-.if !defined(WITHOUT_PULSEAUDIO) && (exists(${LOCALBASE}/lib/libpulse.so.0) || defined(WITH_PULSEAUDIO))
+.if defined(WITH_PULSEAUDIO)
 LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
 PLIST_SUB+=	WITH_PULSEAUDIO=""
 .else
 PLIST_SUB+=	WITH_PULSEAUDIO="@comment "
-CONFIGURE_ARGS+=	--disable-pulseaudio
+CONFIGURE_ARGS+=	--without-pulseaudio
 .endif
 
-.if !defined(WITHOUT_XVMC) && (exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) || exists(${X11BASE}/lib/libXvMC.so.1) || defined(WITH_XVMC))
-.if defined(WITH_NVIDIA_GL)
-CONFIGURE_ARGS+=--with-xvmc-lib=XvMCNVIDIA
+.if defined(WITH_XVMC)
+.if defined(WITH_NVIDIA_GL) || exists(${X11BASE}/lib/libXvMCNVIDIA.so.1)
+CONFIGURE_ARGS+=	--with-xvmc-lib=XvMCNVIDIA
 LIB_DEPENDS+=	XvMCNVIDIA.1:${PORTSDIR}/x11/nvidia-driver
 .else
-CONFIGURE_ARGS+=--with-xvmc-lib=XvMCW
+CONFIGURE_ARGS+=	--with-xvmc-lib=XvMCW
 LIB_DEPENDS+=	XvMC.1:${PORTSDIR}/x11/libXvMC
 .endif
 PLIST_SUB+=	WITH_XVMC=""
 .else
+CONFIGURE_ARGS+=	--disable-xvmc
 PLIST_SUB+=	WITH_XVMC="@comment "
 .endif
 
-.if !defined(WITHOUT_SMB) && (exists(${LOCALBASE}/lib/libsmbclient.so.0) || defined (WITH_SMB))
+.if defined(WITH_SMB)
 LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
 PLIST_SUB+=	WITH_SMB=""
 .else
@@ -129,7 +143,7 @@ PLIST_SUB+=	WITH_SMB="@comment "
 CONFIGURE_ARGS+=	--disable-samba
 .endif
 
-.if !defined(WITHOUT_AALIB) && (exists(${LOCALBASE}/lib/libaa.so.1) || defined (WITH_AALIB))
+.if defined(WITH_AALIB)
 LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
 PLIST_SUB+=	WITH_AALIB=""
 .else
@@ -137,15 +151,15 @@ PLIST_SUB+=	WITH_AALIB="@comment "
 CONFIGURE_ARGS+=	--disable-aalib --disable-aalibtest
 .endif
 
-.if !defined(WITHOUT_IMAGEMAGICK) && (exists(${LOCALBASE}/lib/libWand.so.10) || defined (WITH_IMAGEMAGICK))
+.if defined(WITH_IMAGEMAGICK)
 LIB_DEPENDS+=	Wand.10:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	WITH_IMAGEMAGICK=""
 .else
 PLIST_SUB+=	WITH_IMAGEMAGICK="@comment "
-CONFIGURE_ARGS+=	--disable-imagemagick
+CONFIGURE_ARGS+=	--without-imagemagick
 .endif
 
-.if !defined(WITHOUT_GTK2) && (${HAVE_GNOME:Mgtk20} != "" || defined(WITH_GTK2))
+.if defined(WITH_GTK2)
 USE_GNOME+=	gtk20
 PLIST_SUB+=	WITH_GTK2=""
 .else
@@ -153,7 +167,7 @@ PLIST_SUB+=	WITH_GTK2="@comment "
 CONFIGURE_ARGS+=	--disable-gdkpixbuf
 .endif
 
-.if ${CONFIGURE_ARGS:M*--disable-imagemagick*} == "" || ${CONFIGURE_ARGS:M*-disable-gdkpixbuf*} == ""
+.if ${CONFIGURE_ARGS:M*--without-imagemagick*} == "" || ${CONFIGURE_ARGS:M*-disable-gdkpixbuf*} == ""
 PLIST_SUB+=	WITH_DMX_IMAGE=""
 .else
 PLIST_SUB+=	WITH_DMX_IMAGE="@comment "
@@ -166,52 +180,6 @@ PLIST_SUB+=	WITH_VIDIX="@comment "
 CONFIGURE_ARGS+=	--disable-vidix
 .endif
 
-pre-everything::
-	@${ECHO_MSG} "===>"
-	@${ECHO_MSG} "===> You can enable some features by defining following variables."
-	@${ECHO_MSG} "===>"
-.if !exists(${LOCALBASE}/bin/artsc-config) && !defined(WITH_ARTS) || defined(WITHOUT_ARTS)
-	@${ECHO_MSG} "===> WITH_ARTS   (arts support)"
-.else
-	@${ECHO_MSG} "===> WITH_ARTS   (arts support, enabled)"
-.endif
-.if !exists(${LOCALBASE}/lib/libcaca.a) && !defined(WITH_CACA) || defined(WITHOUT_CACA)
-	@${ECHO_MSG} "===> WITH_CACA (libcaca support)"
-.else
-	@${ECHO_MSG} "===> WITH_CACA (libcaca support, enabled)"
-.endif
-.if !(${HAVE_GNOME:Mgnomevfs2} != "") && !defined(WITH_GNOMEVFS2) || defined(WITHOUT_GNOMEVFS2)
-	@${ECHO_MSG} "===> WITH_GNOMEVFS2 (gnomevfs2 support)"
-.else
-	@${ECHO_MSG} "===> WITH_GNOMEVFS2 (gnomevfs2 support, enabled)"
-.endif
-.if !(${HAVE_GNOME:Mesound} != "") && !defined(WITH_ESOUND) || defined(WITHOUT_ESOUND)
-	@${ECHO_MSG} "===> WITH_ESOUND (esound support)"
-.else
-	@${ECHO_MSG} "===> WITH_ESOUND (esound support, enabled)"
-.endif
-.if !exists(${LOCALBASE}/lib/libjack.so) && !defined(WITH_JACK) || defined(WITHOUT_JACK)
-	@${ECHO_MSG} "===> WITH_JACK (JACK support)"
-.else
-	@${ECHO_MSG} "===> WITH_JACK (JACK support, enabled)"
-.endif
-.if !exists(${LOCALBASE}/lib/libpulse.so.0) && !defined(WITH_PULSEAUDIO) || defined(WITHOUT_PULSEAUDIO)
-	@${ECHO_MSG} "===> WITH_PULSEAUDIO (pulseaudio support)"
-.else
-	@${ECHO_MSG} "===> WITH_PULSEAUDIO (pulseaudio support, enabled)"
-.endif
-.if !exists(${LOCALBASE}/lib/libsmbclient.so.0) && !defined (WITH_SMB) || defined(WITHOUT_SMB)
-	@${ECHO_MSG} "===> WITH_SMB (SMB support)"
-.else
-	@${ECHO_MSG} "===> WITH_SMB (SMB support, enabled)"
-.endif
-.if !exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) && !defined(WITH_XVMC) || defined(WITHOUT_XVMC)
-	@${ECHO_MSG} "===> WITH_XVMC (XvMC support)"
-.else
-	@${ECHO_MSG} "===> WITH_XVMC (XvMC support, enabled)"
-.endif
-	@${ECHO_MSG} "===>"
-
 post-patch:
 .for f in libtool ltmain.sh
 	@${REINPLACE_CMD} -e \
@@ -222,8 +190,8 @@ post-patch:
 
 pre-configure:
 	@${REINPLACE_CMD} -e \
-		's|THREAD_LIBS=.*$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \
-		 s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \
+		's|THREAD_LIBS=".*"|THREAD_LIBS="\$$THREAD_LIBS"|g ; \
+		 s|THREAD_CFLAGS=".*"|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \
 		 s|-L/usr/local/lib||g ; \
 		 s|-I/usr/local/include||g ; \
 		 s|-lgiconv|-liconv|g ; \
diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index d12ad182fddd..801a7ef5da25 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/libxine/distinfo
@@ -1,3 +1,3 @@
-MD5 (xine-lib-1.1.4.tar.gz) = 6631bf12e1e9bfc740797e0c56f46be6
-SHA256 (xine-lib-1.1.4.tar.gz) = 1de93c996645c966585a45a622dbaeeaa4b60f866a12b230bae3308209175eab
-SIZE (xine-lib-1.1.4.tar.gz) = 8603909
+MD5 (xine-lib-1.1.7.tar.gz) = a613a3adf44b5098e04842250dbd2251
+SHA256 (xine-lib-1.1.7.tar.gz) = 9f7b405597b948f134becf0126ff1f1ecb9ddfeeb4987f26617c9783f1ae51da
+SIZE (xine-lib-1.1.7.tar.gz) = 8868650
diff --git a/multimedia/libxine/files/patch-src:libreal:audio_decoder.c b/multimedia/libxine/files/patch-src:libreal:audio_decoder.c
deleted file mode 100644
index 7148d0253651..000000000000
--- a/multimedia/libxine/files/patch-src:libreal:audio_decoder.c
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/libreal/audio_decoder.c.orig	Sun Jul  9 23:39:11 2006
-+++ src/libreal/audio_decoder.c	Sun Jul 23 21:38:59 2006
-@@ -48,6 +48,14 @@
- #include "buffer.h"
- #include "xineutils.h"
- 
-+#if defined(__FreeBSD__)
-+void ___brk_addr(void) {exit(0);}
-+void __ctype_b(void) {exit(0);}
-+char **__environ={NULL};
-+#undef stderr
-+FILE *stderr=NULL;
-+#endif
-+
- typedef struct {
-   audio_decoder_class_t   decoder_class;
- 
-@@ -713,28 +721,14 @@
- 
-   /* try some auto-detection */
- 
--  if (!stat ("/usr/local/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/usr/local/RealPlayer8/Codecs";
--  if (!stat ("/usr/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/usr/RealPlayer8/Codecs";
--  if (!stat ("/usr/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/usr/lib/RealPlayer8/Codecs";
--  if (!stat ("/opt/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/opt/RealPlayer8/Codecs";
--  if (!stat ("/usr/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/usr/lib/RealPlayer9/users/Real/Codecs";
--  if (!stat ("/usr/lib/RealPlayer10/codecs/drvc.so", &s)) 
--    default_real_codec_path = "/usr/lib/RealPlayer10/codecs";
--  if (!stat ("/usr/lib64/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/usr/lib64/RealPlayer8/Codecs";
--  if (!stat ("/usr/lib64/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/usr/lib64/RealPlayer9/users/Real/Codecs";
--  if (!stat ("/usr/lib64/RealPlayer10/codecs/drvc.so", &s)) 
--    default_real_codec_path = "/usr/lib64/RealPlayer10/codecs";
--  if (!stat ("/usr/lib/codecs/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/usr/lib/codecs";
--  if (!stat ("/usr/lib/win32/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/usr/lib/win32";
-+  if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
-+    default_real_codec_path = "/usr/local/lib/RealPlayer8/Codecs";
-+  if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
-+    default_real_codec_path = "/usr/local/lib/RealPlayer9/users/Real/Codecs";
-+  if (!stat ("/usr/X11R6/lib/RealPlayer/codecs/drvc.so", &s)) 
-+    default_real_codec_path = "/usr/X11R6/lib/RealPlayer/codecs";
-+  if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s)) 
-+    default_real_codec_path = "/usr/local/lib/win32";
-   
-   real_codec_path = config->register_string (config, "decoder.external.real_codecs_path", 
- 					     default_real_codec_path,
diff --git a/multimedia/libxine/files/patch-src:libreal:xine_decoder.c b/multimedia/libxine/files/patch-src:libreal:xine_decoder.c
deleted file mode 100644
index 5e91bbb32d3e..000000000000
--- a/multimedia/libxine/files/patch-src:libreal:xine_decoder.c
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/libreal/xine_decoder.c.orig	Sun Jul  9 23:39:11 2006
-+++ src/libreal/xine_decoder.c	Sun Jul 23 21:41:12 2006
-@@ -47,6 +47,14 @@
- #include "buffer.h"
- #include "xineutils.h"
- 
-+#if defined(__FreeBSD__)
-+void ___brk_addr(void) {exit(0);}
-+void __ctype_b(void) {exit(0);}
-+char **__environ={NULL};
-+#undef stderr
-+FILE *stderr=NULL;
-+#endif
-+
- typedef struct {
-   video_decoder_class_t   decoder_class;
- 
-@@ -606,28 +614,14 @@
- 
-   /* try some auto-detection */
- 
--  if (!stat ("/usr/local/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/usr/local/RealPlayer8/Codecs";
--  if (!stat ("/usr/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/usr/RealPlayer8/Codecs";
--  if (!stat ("/usr/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/usr/lib/RealPlayer8/Codecs";
--  if (!stat ("/opt/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/opt/RealPlayer8/Codecs";
--  if (!stat ("/usr/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/usr/lib/RealPlayer9/users/Real/Codecs";
--  if (!stat ("/usr/lib/RealPlayer10/codecs/drvc.so", &s)) 
--    default_real_codec_path = "/usr/lib/RealPlayer10/codecs";
--  if (!stat ("/usr/lib64/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/usr/lib64/RealPlayer8/Codecs";
--  if (!stat ("/usr/lib64/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/usr/lib64/RealPlayer9/users/Real/Codecs";
--  if (!stat ("/usr/lib64/RealPlayer10/codecs/drvc.so", &s)) 
--    default_real_codec_path = "/usr/lib64/RealPlayer10/codecs";
--  if (!stat ("/usr/lib/codecs/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/usr/lib/codecs";
--  if (!stat ("/usr/lib/win32/drv3.so.6.0", &s)) 
--    default_real_codec_path = "/usr/lib/win32";
-+  if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) 
-+    default_real_codec_path = "/usr/local/lib/RealPlayer8/Codecs";
-+  if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) 
-+    default_real_codec_path = "/usr/local/lib/RealPlayer9/users/Real/Codecs";
-+  if (!stat ("/usr/X11R6/lib/RealPlayer/codecs/drvc.so", &s)) 
-+    default_real_codec_path = "/usr/X11R6/lib/RealPlayer/codecs";
-+  if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s)) 
-+    default_real_codec_path = "/usr/local/lib/win32";
-   
-   real_codec_path = config->register_string (config, "decoder.external.real_codecs_path", 
- 					     default_real_codec_path,
diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:tomsmocomp:tomsmocompmacros.h b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:tomsmocomp:tomsmocompmacros.h
deleted file mode 100644
index 98e41c4f0d4d..000000000000
--- a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:tomsmocomp:tomsmocompmacros.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h.orig	Sat Jul 30 03:14:40 2005
-+++ src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h	Sun Dec 11 02:54:16 2005
-@@ -1,8 +1,6 @@
- #include <string.h>
- #include <math.h>
--#ifdef HAVE_MALLOC_H
--#include <malloc.h>
--#endif
-+#include <stdlib.h>
- 
- #define USE_FOR_DSCALER
- 
diff --git a/multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c b/multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c
index 22a0dc4837db..767308552286 100644
--- a/multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c
+++ b/multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c
@@ -1,6 +1,6 @@
---- src/audio_out/audio_oss_out.c.orig	Mon Dec 13 07:01:02 2004
-+++ src/audio_out/audio_oss_out.c	Mon Jan 30 03:02:46 2006
-@@ -155,7 +155,7 @@
+--- src/audio_out/audio_oss_out.c.orig	Mon Apr 16 02:42:15 2007
++++ src/audio_out/audio_oss_out.c	Sun Jul  1 14:42:59 2007
+@@ -163,7 +163,7 @@
  		       uint32_t bits, uint32_t rate, int mode) {
  
    oss_driver_t *this = (oss_driver_t *) this_gen;
@@ -9,7 +9,7 @@
  
    xprintf(this->xine, XINE_VERBOSITY_DEBUG,
  	  "audio_oss_out: ao_open rate=%d, mode=%d, dev=%s\n", rate, mode, this->audio_dev);
-@@ -287,14 +287,14 @@
+@@ -295,14 +295,14 @@
        if (bits==8) {
  	xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: SNDCTL_DSP_SETFMT failed for AFMT_U8.\n");
          if (tmp != AFMT_U8)
@@ -26,7 +26,7 @@
          else
            xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: The AFMT_S16_NE ioctl failed.\n");
          return 0;
-@@ -313,7 +313,7 @@
+@@ -321,7 +321,7 @@
      tmp = AFMT_AC3;
      if (ioctl(this->audio_fd, SNDCTL_DSP_SETFMT, &tmp) < 0 || tmp != AFMT_AC3) {
        xprintf(this->xine, XINE_VERBOSITY_DEBUG, 
@@ -35,67 +35,61 @@
        tmp = AFMT_S16_LE;
        ioctl(this->audio_fd, SNDCTL_DSP_SETFMT, &tmp);
      }
-@@ -369,7 +369,7 @@
+@@ -377,7 +377,7 @@
  
    count_info    info;
    oss_driver_t *this = (oss_driver_t *) this_gen;
 -  int           bytes_left;
-+  long           bytes_left;
++  long          bytes_left;
    int           frames;
    struct        timeval tv;
  
-@@ -507,7 +507,7 @@
+@@ -515,7 +515,7 @@
  static int ao_oss_get_property (ao_driver_t *this_gen, int property) {
  
    oss_driver_t *this = (oss_driver_t *) this_gen;
 -  int           audio_devs;
-+  long           audio_devs;
++  long          audio_devs;
  
    switch(property) {
    case AO_PROP_PCM_VOL:
-@@ -515,8 +515,8 @@
-     if(!this->mixer.mute) {
+@@ -524,7 +524,7 @@
        
        if(this->mixer.fd != -1) {
--	int cmd = 0;
+ 	IOCTL_REQUEST_TYPE cmd = 0;
 -	int v;
-+	long cmd = 0;
 +	long v;
  	
  	ioctl(this->mixer.fd, SOUND_MIXER_READ_DEVMASK, &audio_devs);
  	
-@@ -546,7 +546,7 @@
+@@ -554,7 +554,7 @@
  static int ao_oss_set_property (ao_driver_t *this_gen, int property, int value) {
  
    oss_driver_t *this = (oss_driver_t *) this_gen;
 -  int           audio_devs;
-+  long           audio_devs;
++  long          audio_devs;
  
    switch(property) {
    case AO_PROP_PCM_VOL:
-@@ -554,8 +554,8 @@
-     if(!this->mixer.mute) {
+@@ -563,7 +563,7 @@
        
        if(this->mixer.fd != -1) {
--	int cmd = 0;
+ 	IOCTL_REQUEST_TYPE cmd = 0;
 -	int v;
-+	long cmd = 0;
 +	long v;
  	
  	ioctl(this->mixer.fd, SOUND_MIXER_READ_DEVMASK, &audio_devs);
  	
-@@ -583,8 +583,8 @@
-     if(this->mixer.mute) {
+@@ -592,7 +592,7 @@
        
        if(this->mixer.fd != -1) {
--	int cmd = 0;
+ 	IOCTL_REQUEST_TYPE cmd = 0;
 -	int v = 0;
-+	long cmd = 0;
 +	long v = 0;
  	
  	ioctl(this->mixer.fd, SOUND_MIXER_READ_DEVMASK, &audio_devs);
  	
-@@ -657,7 +657,7 @@
+@@ -665,7 +665,7 @@
  static int probe_audio_devices(oss_driver_t *this) {
    const char *base_names[2] = {"/dev/dsp", "/dev/sound/dsp"};
    int base_num, i;
@@ -104,15 +98,16 @@
    int best_rate;
    char devname[30];
  
-@@ -696,9 +696,9 @@
+@@ -704,9 +704,9 @@
    oss_class_t     *class = (oss_class_t *) class_gen;
    config_values_t *config = class->config;
    oss_driver_t    *this;
 -  int              caps;
-+  long              caps;
-   int              audio_fd;
+-  int              audio_fd;
 -  int              num_channels, status, arg;
-+  long              num_channels, status, arg;
++  long             caps;
++  long             audio_fd;
++  long             num_channels, status, arg;
    static char     *sync_methods[] = {"auto", "getodelay", "getoptr", "softsync", "probebuffer", NULL};
    static char     *devname_opts[] = {"auto", "/dev/dsp", "/dev/sound/dsp", NULL};
    int devname_val, devname_num;
diff --git a/multimedia/libxine/files/patch-src_input_input_vcd.c b/multimedia/libxine/files/patch-src_input_input_vcd.c
deleted file mode 100644
index aea48f003666..000000000000
--- a/multimedia/libxine/files/patch-src_input_input_vcd.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/input/input_vcd.c.orig	Thu Sep 28 06:51:16 2006
-+++ src/input/input_vcd.c	Thu Sep 28 07:03:55 2006
-@@ -25,7 +25,6 @@
- #include "config.h"
- #endif
- 
--#include <netinet/in.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/stat.h>
-@@ -34,6 +33,7 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <string.h>
-+#include <netinet/in.h>
- #ifdef HAVE_LINUX_CDROM_H
- # include <linux/cdrom.h>
- #endif
diff --git a/multimedia/libxine/files/patch-src_libreal_real_common.c b/multimedia/libxine/files/patch-src_libreal_real_common.c
new file mode 100644
index 000000000000..02bf6057e2c8
--- /dev/null
+++ b/multimedia/libxine/files/patch-src_libreal_real_common.c
@@ -0,0 +1,10 @@
+--- src/libreal/real_common.c.orig	Sun Jul  1 14:29:20 2007
++++ src/libreal/real_common.c	Sun Jul  1 14:29:55 2007
+@@ -91,6 +91,7 @@
+   else try_real_subpath("lib/codecs")
+   else try_real_subpath("lib64/RealPlayer10/codecs")
+   else try_real_subpath("lib/RealPlayer10/codecs")
++  else try_real_subpath("lib/RealPlayer/codecs")
+   else try_real_subpath("lib64/RealPlayer9/users/Real/Codecs")
+   else try_real_subpath("lib/RealPlayer9/users/Real/Codecs")
+   else try_real_subpath("lib/RealPlayer8/Codecs")
diff --git a/multimedia/libxine/files/patch-src_libreal_xine_real_audio_decoder.c b/multimedia/libxine/files/patch-src_libreal_xine_real_audio_decoder.c
new file mode 100644
index 000000000000..3c69b44fc805
--- /dev/null
+++ b/multimedia/libxine/files/patch-src_libreal_xine_real_audio_decoder.c
@@ -0,0 +1,17 @@
+--- src/libreal/xine_real_audio_decoder.c.orig	Tue Apr 17 10:00:50 2007
++++ src/libreal/xine_real_audio_decoder.c	Sun Jul  1 14:24:05 2007
+@@ -47,6 +47,14 @@
+ 
+ #include "real_common.h"
+ 
++#if defined(__FreeBSD__)
++void ___brk_addr(void) {exit(0);}
++void __ctype_b(void) {exit(0);}
++char **__environ={NULL};
++#undef stderr
++FILE *stderr=NULL;
++#endif
++
+ typedef struct {
+   audio_decoder_class_t   decoder_class;
+ 
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index d55a77c03a36..f812f0bbfb22 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -40,112 +40,112 @@ include/xine/xmlparser.h
 lib/libxine.la
 lib/libxine.so
 lib/libxine.so.1
-lib/xine/plugins/1.1.4/post/xineplug_post_audio_filters.so
-lib/xine/plugins/1.1.4/post/xineplug_post_goom.so
-lib/xine/plugins/1.1.4/post/xineplug_post_mosaico.so
-lib/xine/plugins/1.1.4/post/xineplug_post_planar.so
-lib/xine/plugins/1.1.4/post/xineplug_post_switch.so
-lib/xine/plugins/1.1.4/post/xineplug_post_tvtime.so
-lib/xine/plugins/1.1.4/post/xineplug_post_visualizations.so
-@exec mkdir -p %D/lib/xine/plugins/1.1.4/vidix
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/cyberblade_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mach64_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mga_crtc2_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mga_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/nvidia_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/pm2_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/pm3_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/radeon_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/rage128_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/savage_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/sis_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/unichrome_vid.so
-%%WITH_ARTS%%lib/xine/plugins/1.1.4/xineplug_ao_out_arts.so
-%%WITH_ESOUND%%lib/xine/plugins/1.1.4/xineplug_ao_out_esd.so
-%%WITH_JACK%%lib/xine/plugins/1.1.4/xineplug_ao_out_jack.so
-lib/xine/plugins/1.1.4/xineplug_ao_out_file.so
-lib/xine/plugins/1.1.4/xineplug_ao_out_none.so
-lib/xine/plugins/1.1.4/xineplug_ao_out_oss.so
-%%WITH_PULSEAUDIO%%lib/xine/plugins/1.1.4/xineplug_ao_out_pulseaudio.so
-lib/xine/plugins/1.1.4/xineplug_decode_a52.so
-lib/xine/plugins/1.1.4/xineplug_decode_bitplane.so
-lib/xine/plugins/1.1.4/xineplug_decode_dts.so
-lib/xine/plugins/1.1.4/xineplug_decode_dvaudio.so
-lib/xine/plugins/1.1.4/xineplug_decode_faad.so
-lib/xine/plugins/1.1.4/xineplug_decode_ff.so
-%%WITH_GTK2%%lib/xine/plugins/1.1.4/xineplug_decode_gdk_pixbuf.so
-lib/xine/plugins/1.1.4/xineplug_decode_gsm610.so
-%%WITH_IMAGEMAGICK%%lib/xine/plugins/1.1.4/xineplug_decode_image.so
-lib/xine/plugins/1.1.4/xineplug_decode_lpcm.so
-lib/xine/plugins/1.1.4/xineplug_decode_mad.so
-lib/xine/plugins/1.1.4/xineplug_decode_mpc.so
-lib/xine/plugins/1.1.4/xineplug_decode_mpeg2.so
-lib/xine/plugins/1.1.4/xineplug_decode_nsf.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_decode_qt.so
-lib/xine/plugins/1.1.4/xineplug_decode_real.so
-lib/xine/plugins/1.1.4/xineplug_decode_real_audio.so
-lib/xine/plugins/1.1.4/xineplug_decode_rgb.so
-lib/xine/plugins/1.1.4/xineplug_decode_speex.so
-lib/xine/plugins/1.1.4/xineplug_decode_spu.so
-lib/xine/plugins/1.1.4/xineplug_decode_spucc.so
-lib/xine/plugins/1.1.4/xineplug_decode_spucmml.so
-lib/xine/plugins/1.1.4/xineplug_decode_spudvb.so
-lib/xine/plugins/1.1.4/xineplug_decode_sputext.so
-lib/xine/plugins/1.1.4/xineplug_decode_theora.so
-lib/xine/plugins/1.1.4/xineplug_decode_vorbis.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_decode_w32dll.so
-lib/xine/plugins/1.1.4/xineplug_decode_yuv.so
-lib/xine/plugins/1.1.4/xineplug_dmx_asf.so
-lib/xine/plugins/1.1.4/xineplug_dmx_audio.so
-lib/xine/plugins/1.1.4/xineplug_dmx_avi.so
-lib/xine/plugins/1.1.4/xineplug_dmx_fli.so
-lib/xine/plugins/1.1.4/xineplug_dmx_flv.so
-lib/xine/plugins/1.1.4/xineplug_dmx_games.so
-lib/xine/plugins/1.1.4/xineplug_dmx_iff.so
-%%WITH_DMX_IMAGE%%lib/xine/plugins/1.1.4/xineplug_dmx_image.so
-lib/xine/plugins/1.1.4/xineplug_dmx_matroska.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mng.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mpeg.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_block.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_elem.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_pes.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_ts.so
-lib/xine/plugins/1.1.4/xineplug_dmx_nsv.so
-lib/xine/plugins/1.1.4/xineplug_dmx_ogg.so
-lib/xine/plugins/1.1.4/xineplug_dmx_pva.so
-lib/xine/plugins/1.1.4/xineplug_dmx_qt.so
-lib/xine/plugins/1.1.4/xineplug_dmx_rawdv.so
-lib/xine/plugins/1.1.4/xineplug_dmx_real.so
-lib/xine/plugins/1.1.4/xineplug_dmx_slave.so
-lib/xine/plugins/1.1.4/xineplug_dmx_sputext.so
-lib/xine/plugins/1.1.4/xineplug_dmx_yuv4mpeg2.so
-lib/xine/plugins/1.1.4/xineplug_dmx_yuv_frames.so
-lib/xine/plugins/1.1.4/xineplug_flac.so
-lib/xine/plugins/1.1.4/xineplug_inp_cdda.so
-lib/xine/plugins/1.1.4/xineplug_inp_dvb.so
-lib/xine/plugins/1.1.4/xineplug_inp_dvd.so
-lib/xine/plugins/1.1.4/xineplug_inp_file.so
-%%WITH_GNOMEVFS2%%lib/xine/plugins/1.1.4/xineplug_inp_gnome_vfs.so
-lib/xine/plugins/1.1.4/xineplug_inp_http.so
-lib/xine/plugins/1.1.4/xineplug_inp_mms.so
-lib/xine/plugins/1.1.4/xineplug_inp_net.so
-lib/xine/plugins/1.1.4/xineplug_inp_pnm.so
-lib/xine/plugins/1.1.4/xineplug_inp_rtp.so
-lib/xine/plugins/1.1.4/xineplug_inp_rtsp.so
-%%WITH_SMB%%lib/xine/plugins/1.1.4/xineplug_inp_smb.so
-lib/xine/plugins/1.1.4/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/1.1.4/xineplug_inp_vcd.so
-lib/xine/plugins/1.1.4/xineplug_inp_vcdo.so
-%%WITH_AALIB%%lib/xine/plugins/1.1.4/xineplug_vo_out_aa.so
-%%WITH_CACA%%lib/xine/plugins/1.1.4/xineplug_vo_out_caca.so
-lib/xine/plugins/1.1.4/xineplug_vo_out_none.so
-lib/xine/plugins/1.1.4/xineplug_vo_out_opengl.so
-lib/xine/plugins/1.1.4/xineplug_vo_out_sdl.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_vo_out_vidix.so
-lib/xine/plugins/1.1.4/xineplug_vo_out_xshm.so
-lib/xine/plugins/1.1.4/xineplug_vo_out_xv.so
-%%WITH_XVMC%%lib/xine/plugins/1.1.4/xineplug_vo_out_xvmc.so
-%%WITH_XVMC%%lib/xine/plugins/1.1.4/xineplug_vo_out_xxmc.so
+%%PLUGINSDIR%%/mime.types
+%%PLUGINSDIR%%/post/xineplug_post_audio_filters.so
+%%PLUGINSDIR%%/post/xineplug_post_goom.so
+%%PLUGINSDIR%%/post/xineplug_post_mosaico.so
+%%PLUGINSDIR%%/post/xineplug_post_planar.so
+%%PLUGINSDIR%%/post/xineplug_post_switch.so
+%%PLUGINSDIR%%/post/xineplug_post_tvtime.so
+%%PLUGINSDIR%%/post/xineplug_post_visualizations.so
+@exec mkdir -p %D/%%PLUGINSDIR%%/vidix
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/cyberblade_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/mach64_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/mga_crtc2_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/mga_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/nvidia_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/pm2_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/pm3_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/radeon_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/rage128_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/savage_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/sis_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/unichrome_vid.so
+%%WITH_ARTS%%%%PLUGINSDIR%%/xineplug_ao_out_arts.so
+%%WITH_ESOUND%%%%PLUGINSDIR%%/xineplug_ao_out_esd.so
+%%WITH_JACK%%%%PLUGINSDIR%%/xineplug_ao_out_jack.so
+%%PLUGINSDIR%%/xineplug_ao_out_file.so
+%%PLUGINSDIR%%/xineplug_ao_out_none.so
+%%PLUGINSDIR%%/xineplug_ao_out_oss.so
+%%WITH_PULSEAUDIO%%%%PLUGINSDIR%%/xineplug_ao_out_pulseaudio.so
+%%PLUGINSDIR%%/xineplug_decode_a52.so
+%%PLUGINSDIR%%/xineplug_decode_bitplane.so
+%%PLUGINSDIR%%/xineplug_decode_dts.so
+%%PLUGINSDIR%%/xineplug_decode_dvaudio.so
+%%PLUGINSDIR%%/xineplug_decode_faad.so
+%%PLUGINSDIR%%/xineplug_decode_ff.so
+%%WITH_GTK2%%%%PLUGINSDIR%%/xineplug_decode_gdk_pixbuf.so
+%%PLUGINSDIR%%/xineplug_decode_gsm610.so
+%%WITH_IMAGEMAGICK%%%%PLUGINSDIR%%/xineplug_decode_image.so
+%%PLUGINSDIR%%/xineplug_decode_lpcm.so
+%%PLUGINSDIR%%/xineplug_decode_mad.so
+%%PLUGINSDIR%%/xineplug_decode_mpc.so
+%%PLUGINSDIR%%/xineplug_decode_mpeg2.so
+%%PLUGINSDIR%%/xineplug_decode_nsf.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/xineplug_decode_qt.so
+%%PLUGINSDIR%%/xineplug_decode_real.so
+%%PLUGINSDIR%%/xineplug_decode_rgb.so
+%%PLUGINSDIR%%/xineplug_decode_speex.so
+%%PLUGINSDIR%%/xineplug_decode_spu.so
+%%PLUGINSDIR%%/xineplug_decode_spucc.so
+%%PLUGINSDIR%%/xineplug_decode_spucmml.so
+%%PLUGINSDIR%%/xineplug_decode_spudvb.so
+%%PLUGINSDIR%%/xineplug_decode_sputext.so
+%%PLUGINSDIR%%/xineplug_decode_theora.so
+%%PLUGINSDIR%%/xineplug_decode_vorbis.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/xineplug_decode_w32dll.so
+%%PLUGINSDIR%%/xineplug_decode_yuv.so
+%%PLUGINSDIR%%/xineplug_dmx_asf.so
+%%PLUGINSDIR%%/xineplug_dmx_audio.so
+%%PLUGINSDIR%%/xineplug_dmx_avi.so
+%%PLUGINSDIR%%/xineplug_dmx_fli.so
+%%PLUGINSDIR%%/xineplug_dmx_flv.so
+%%PLUGINSDIR%%/xineplug_dmx_games.so
+%%PLUGINSDIR%%/xineplug_dmx_iff.so
+%%WITH_DMX_IMAGE%%%%PLUGINSDIR%%/xineplug_dmx_image.so
+%%PLUGINSDIR%%/xineplug_dmx_matroska.so
+%%PLUGINSDIR%%/xineplug_dmx_mng.so
+%%PLUGINSDIR%%/xineplug_dmx_mpeg.so
+%%PLUGINSDIR%%/xineplug_dmx_mpeg_block.so
+%%PLUGINSDIR%%/xineplug_dmx_mpeg_elem.so
+%%PLUGINSDIR%%/xineplug_dmx_mpeg_pes.so
+%%PLUGINSDIR%%/xineplug_dmx_mpeg_ts.so
+%%PLUGINSDIR%%/xineplug_dmx_nsv.so
+%%PLUGINSDIR%%/xineplug_dmx_ogg.so
+%%PLUGINSDIR%%/xineplug_dmx_pva.so
+%%PLUGINSDIR%%/xineplug_dmx_qt.so
+%%PLUGINSDIR%%/xineplug_dmx_rawdv.so
+%%PLUGINSDIR%%/xineplug_dmx_real.so
+%%PLUGINSDIR%%/xineplug_dmx_slave.so
+%%PLUGINSDIR%%/xineplug_dmx_sputext.so
+%%PLUGINSDIR%%/xineplug_dmx_yuv4mpeg2.so
+%%PLUGINSDIR%%/xineplug_dmx_yuv_frames.so
+%%PLUGINSDIR%%/xineplug_flac.so
+%%PLUGINSDIR%%/xineplug_inp_cdda.so
+%%PLUGINSDIR%%/xineplug_inp_dvb.so
+%%PLUGINSDIR%%/xineplug_inp_dvd.so
+%%PLUGINSDIR%%/xineplug_inp_file.so
+%%WITH_GNOMEVFS2%%%%PLUGINSDIR%%/xineplug_inp_gnome_vfs.so
+%%PLUGINSDIR%%/xineplug_inp_http.so
+%%PLUGINSDIR%%/xineplug_inp_mms.so
+%%PLUGINSDIR%%/xineplug_inp_net.so
+%%PLUGINSDIR%%/xineplug_inp_pnm.so
+%%PLUGINSDIR%%/xineplug_inp_rtp.so
+%%PLUGINSDIR%%/xineplug_inp_rtsp.so
+%%WITH_SMB%%%%PLUGINSDIR%%/xineplug_inp_smb.so
+%%PLUGINSDIR%%/xineplug_inp_stdin_fifo.so
+%%PLUGINSDIR%%/xineplug_inp_vcd.so
+%%PLUGINSDIR%%/xineplug_inp_vcdo.so
+%%WITH_AALIB%%%%PLUGINSDIR%%/xineplug_vo_out_aa.so
+%%WITH_CACA%%%%PLUGINSDIR%%/xineplug_vo_out_caca.so
+%%PLUGINSDIR%%/xineplug_vo_out_none.so
+%%PLUGINSDIR%%/xineplug_vo_out_opengl.so
+%%PLUGINSDIR%%/xineplug_vo_out_sdl.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/xineplug_vo_out_vidix.so
+%%PLUGINSDIR%%/xineplug_vo_out_xshm.so
+%%PLUGINSDIR%%/xineplug_vo_out_xv.so
+%%WITH_XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xvmc.so
+%%WITH_XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xxmc.so
 libdata/pkgconfig/libxine.pc
 share/aclocal/xine.m4
 %%DOCSDIR%%/README
@@ -213,9 +213,9 @@ share/locale/sk/LC_MESSAGES/libxine1.mo
 %%DATADIR%%/libxine1/fonts/serif-48.xinefont.gz
 %%DATADIR%%/libxine1/fonts/serif-64.xinefont.gz
 @dirrm include/xine
-@dirrm lib/xine/plugins/1.1.4/vidix
-@dirrm lib/xine/plugins/1.1.4/post
-@dirrm lib/xine/plugins/1.1.4
+@dirrm %%PLUGINSDIR%%/vidix
+@dirrm %%PLUGINSDIR%%/post
+@dirrm %%PLUGINSDIR%%
 @dirrm lib/xine/plugins
 @dirrm lib/xine
 @dirrm %%DOCSDIR%%/hackersguide