Update xine to 0.9.18 and libxine to 1-beta4.

35 files changed, 618 insertions, 461 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index b6edd9f3bc1f..817d799ab56c 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -6,31 +6,31 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	0.9.13
+PORTVERSION=	1.0.b4
 CATEGORIES=	graphics
-MASTER_SITES=	http://xine.sourceforge.net/files/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	lib
-DISTNAME=	${PORTNAME}-lib-${PORTVERSION}
+DISTNAME=	${PORTNAME}-lib-1-beta4
 
 MAINTAINER=	nobutaka@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libavcodec.a:${PORTSDIR}/multimedia/ffmpeg \
-		${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
-LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52 \
+BUILD_DEPENDS=	${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
+LIB_DEPENDS=	avcodec.0:${PORTSDIR}/multimedia/ffmpeg \
+		a52.0:${PORTSDIR}/audio/liba52 \
+		mad.1:${PORTSDIR}/audio/mad \
 		aa.1:${PORTSDIR}/graphics/aalib \
-		SDL-1.1:${PORTSDIR}/devel/sdl12 \
 		intl.4:${PORTSDIR}/devel/gettext \
-		iconv.3:${PORTSDIR}/converters/libiconv
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-lib-${PORTVERSION}
+		iconv.3:${PORTSDIR}/converters/libiconv \
+		SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
+		vorbis.2:${PORTSDIR}/audio/libvorbis \
+		ogg.4:${PORTSDIR}/audio/libogg
 
 USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	imlib
+WANT_GNOME=	yes
 USE_GMAKE=	yes
-USE_AUTOMAKE=	yes
 USE_MESA=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -40,21 +40,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		THREAD_LIBS="${PTHREAD_LIBS}" \
 		X_EXTRA_LIBS="-lGL -lGLU -lXext -lX11 -lm"
 CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32 \
-		--disable-dxr3 --disable-vidix --disable-dha-kmod \
-		--disable-alsa
+		--program-transform-name="" --disable-vidix
 INSTALLS_SHLIB=	yes
 
 MAN1=		xine-config.1
-MAN3=		ao_driver_t.3 ao_functions_t.3 autoplay_group.3 \
-		audio_cap.3 audio_group.3 audio_prop.3 \
-		browse_group.3 build_info.3 cfg_data_t.3 config_group.3 \
-		config_values_s.3 config_values_t.3 demux_strategy.3 \
-		event_group.3 loadplugins_group.3 mrl_t.3 mrl_types.3 \
-		status_group.3 ui_callbacks.3 version_group.3 video_cap.3 \
-		video_group.3 video_prop.3 video_ratio.3 visual_types.3 \
-		vo_driver_s.3 vo_driver_t.3 vo_frame_t.3 vo_overlay_t.3 \
-		xine-lib.3 xine.h.3 xine_api.3 xine_init.3 xine_management.3 \
-		xine_t.3 xine_version.3
 
 .include <bsd.port.pre.mk>
 
@@ -64,27 +53,36 @@ PLIST_SUB=	HAVE_LIBXV=""
 PLIST_SUB=	HAVE_LIBXV="@comment "
 .endif
 
-.if exists(${LOCALBASE}/bin/artsc-config)
+.if exists(${LOCALBASE}/bin/artsc-config) || defined(WITH_ARTS)
+LIB_DEPENDS+=    artsc.0:${PORTSDIR}/audio/arts
 PLIST_SUB+=	HAVE_ARTS=""
 .else
 PLIST_SUB+=	HAVE_ARTS="@comment "
 .endif
 
-.if exists(${LOCALBASE}/include/vorbis/codec.h)
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
-
-PLIST_SUB+=	HAVE_VORBIS=""
+.if ${HAVE_GNOME:Mesound} != "" || defined(WITH_ESOUND)
+WANT_GNOME=	yes
+USE_GNOME+=	esound
+PLIST_SUB+=	HAVE_ESOUND=""
 .else
-PLIST_SUB+=	HAVE_VORBIS="@comment "
+PLIST_SUB+=	HAVE_ESOUND="@comment "
 .endif
 
-.if exists(${LOCALBASE}/include/ogg/ogg.h)
-LIB_DEPENDS+=	ogg.4:${PORTSDIR}/audio/libogg
-
-PLIST_SUB+=	HAVE_OGG=""
+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)
+	@${ECHO_MSG} "===> WITH_ARTS   (arts support)"
 .else
-PLIST_SUB+=	HAVE_OGG="@comment "
+	@${ECHO_MSG} "===> WITH_ARTS   (arts support, enabled)"
 .endif
+.if !(${HAVE_GNOME:Mesound} != "") && !defined(WITH_ESOUND)
+	@${ECHO_MSG} "===> WITH_ESOUND (esound support)"
+.else
+	@${ECHO_MSG} "===> WITH_ESOUND (esound support, enabled)"
+.endif
+	@${ECHO_MSG} "===>"
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -93,17 +91,12 @@ post-patch:
 		 s|-L/usr/local/lib||g ; \
 		 s|-I/usr/local/include||g ; \
 		 s|-lgiconv|-liconv|g ; \
-		 s|-funroll-loops||g' ${WRKSRC}/configure.in
+		 s|-funroll-loops||g' ${WRKSRC}/configure
 .if ${OSVERSION} >= 500035
 	@${REINPLACE_CMD} -e \
 		 's|-malign-loops|-falign-loops|g ; \
 		  s|-malign-jumps|-falign-jumps|g ; \
-		  s|-malign-functions|-falign-functions|g' ${WRKSRC}/configure.in
+		  s|-malign-functions|-falign-functions|g' ${WRKSRC}/configure
 .endif
-	@${REINPLACE_CMD} -e \
-		's|aclocal,|${ACLOCAL},|g ; \
-		 s|autoconf,|${AUTOCONF},|g ; \
-		 s|automake,|${AUTOMAKE},|g ; \
-		 s|autoheader,|${AUTOHEADER},|g' ${WRKSRC}/aclocal.m4
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index a22c1d5eeab2..542007496147 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/libxine/distinfo
@@ -1 +1 @@
-MD5 (xine-lib-0.9.13.tar.gz) = 2e37c40bb78732187e3375a220405063
+MD5 (xine-lib-1-beta4.tar.gz) = 6524afaefe7577f0d0f4058eb3b97702
diff --git a/multimedia/libxine/files/patch-Makefile.am b/multimedia/libxine/files/patch-Makefile.am
deleted file mode 100644
index ac4a8416b18c..000000000000
--- a/multimedia/libxine/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig	Thu May 16 23:50:02 2002
-+++ Makefile.am	Thu May 16 23:50:14 2002
-@@ -4,7 +4,7 @@
- 
- AUTOMAKE_OPTIONS = 1.3
- 
--SUBDIRS = doc m4 intl po misc include src
-+SUBDIRS = doc intl po misc include src
- 
- EXTRA_DIST = cvscompile.sh automake.diff \
-              debian/README.Debian debian/changelog debian/control \
diff --git a/multimedia/libxine/files/patch-src:dxr3:video_out_dxr3.c b/multimedia/libxine/files/patch-src:dxr3:video_out_dxr3.c
new file mode 100644
index 000000000000..717c5438acf7
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:dxr3:video_out_dxr3.c
@@ -0,0 +1,11 @@
+--- src/dxr3/video_out_dxr3.c.orig	Sat Feb  1 22:26:00 2003
++++ src/dxr3/video_out_dxr3.c	Sat Feb  1 22:26:38 2003
+@@ -278,7 +278,7 @@
+   }
+   
+   snprintf (tmpstr, sizeof(tmpstr), "%s_mv%s", class->devname, class->devnum);
+-  if ((this->fd_video = open (tmpstr, O_WRONLY | O_SYNC )) < 0) {
++  if ((this->fd_video = open (tmpstr, O_WRONLY | O_FSYNC )) < 0) {
+     printf("video_out_dxr3: Failed to open video device %s (%s)\n",
+       tmpstr, strerror(errno));
+     return 0;
diff --git a/multimedia/libxine/files/patch-src:input:Makefile.am b/multimedia/libxine/files/patch-src:input:Makefile.am
deleted file mode 100644
index 691b53444ddd..000000000000
--- a/multimedia/libxine/files/patch-src:input:Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/input/Makefile.am.orig	Thu May 16 22:20:25 2002
-+++ src/input/Makefile.am	Thu May 16 22:20:29 2002
-@@ -15,10 +15,9 @@
- if HAVE_CDROM_IOCTLS
- in_dvd = xineplug_inp_dvd.la
- in_vcd = xineplug_inp_vcd.la
--in_cda = xineplug_inp_cda.la
- endif
- 
--lib_LTLIBRARIES = xineplug_inp_file.la $(in_dvd) $(in_vcd) $(in_cda) \
-+lib_LTLIBRARIES = xineplug_inp_file.la $(in_dvd) $(in_vcd) \
- 	xineplug_inp_stdin_fifo.la xineplug_inp_net.la \
- 	xineplug_inp_rtp.la xineplug_inp_http.la xineplug_inp_mms.la
- 
-@@ -53,10 +52,6 @@
- xineplug_inp_http_la_SOURCES = input_http.c net_buf_ctrl.c
- xineplug_inp_http_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
- xineplug_inp_http_la_LDFLAGS = -avoid-version -module
--
--xineplug_inp_cda_la_SOURCES = input_cda.c
--xineplug_inp_cda_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
--xineplug_inp_cda_la_LDFLAGS = -avoid-version -module
- 
- include_HEADERS = input_plugin.h
- noinst_HEADERS = dvd_udf.h read_cache.h net_buf_ctrl.h mms.h
diff --git a/multimedia/libxine/files/patch-src:input:input_dvd.c b/multimedia/libxine/files/patch-src:input:input_dvd.c
new file mode 100644
index 000000000000..a57dbd5d8fa0
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:input:input_dvd.c
@@ -0,0 +1,20 @@
+--- src/input/input_dvd.c.orig	Sat Jan 11 23:47:08 2003
++++ src/input/input_dvd.c	Sat Jan 11 23:48:51 2003
+@@ -41,6 +41,7 @@
+ #include <stdlib.h>
+ #include <stddef.h>
+ #include <dirent.h>
++#include <sys/param.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+@@ -132,6 +133,9 @@
+ /* Array to hold MRLs returned by get_autoplay_list */
+ #define MAX_DIR_ENTRIES 1250
+ #define MAX_STR_LEN     255  
++
++#define off64_t off_t
++#define lseek64 lseek
+ 
+ typedef struct {
+   input_plugin_t    input_plugin; /* Parent input plugin type        */
diff --git a/multimedia/libxine/files/patch-src:input:input_rtp.c b/multimedia/libxine/files/patch-src:input:input_rtp.c
deleted file mode 100644
index 6392e831cc39..000000000000
--- a/multimedia/libxine/files/patch-src:input:input_rtp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/input/input_rtp.c.orig	Sat Oct 27 19:14:06 2001
-+++ src/input/input_rtp.c	Sat Oct 27 19:14:14 2001
-@@ -67,7 +67,6 @@
- #endif
- 
- #include <stdio.h>
--#include <malloc.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <string.h>
-
diff --git a/multimedia/libxine/files/patch-src:input:input_vcd.c b/multimedia/libxine/files/patch-src:input:input_vcd.c
new file mode 100644
index 000000000000..26b8a1d3ca38
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:input:input_vcd.c
@@ -0,0 +1,89 @@
+--- src/input/input_vcd.c.orig	Sat Jan 11 23:50:19 2003
++++ src/input/input_vcd.c	Sat Jan 11 23:54:36 2003
+@@ -398,7 +398,7 @@
+     return 0;
+ 
+   do {
+-    if (lseek (this->fd, this->cur_sector * bsize, SEEK_SET) == -1) {
++    if (lseek (this->fd, this->cls->cur_sector * bsize, SEEK_SET) == -1) {
+       printf ("input_vcd: seek error %d\n", errno);
+       return 0;
+     }
+@@ -406,7 +406,7 @@
+       printf ("input_vcd: read error %d\n", errno);
+       return 0;
+     }
+-    this->cur_sector++;
++    this->cls->cur_sector++;
+   } while ((data.subheader[2]&~0x01)==0x60);
+   memcpy (buf, data.data, VCDSECTORSIZE);
+   return VCDSECTORSIZE;
+@@ -538,7 +538,7 @@
+     return NULL;
+ 
+   do {
+-    if (lseek (this->fd, this->cur_sector * bsize, SEEK_SET) == -1) {
++    if (lseek (this->fd, this->cls->cur_sector * bsize, SEEK_SET) == -1) {
+       printf ("input_vcd: seek error %d\n", errno);
+       return NULL;
+     }
+@@ -546,7 +546,7 @@
+       printf ("input_vcd: read error %d\n", errno);
+       return NULL;
+     }
+-    this->cur_sector++;
++    this->cls->cur_sector++;
+   } while ((data.subheader[2]&~0x01)==0x60);
+ 
+   buf = fifo->buffer_pool_alloc (fifo);
+@@ -695,7 +695,7 @@
+ 
+   start = 
+     ntohl(this->cls->tocent
+-	  [this->cur_track+1 - this->tochdr.starting_track].addr.lba);
++	  [this->cur_track+1 - this->cls->tochdr.starting_track].addr.lba);
+ 
+   /*  printf("seek: start sector:%lu, origin: %d, offset:%qu\n", 
+ 	 start, origin, offset);
+@@ -704,14 +704,14 @@
+   switch (origin) {
+   case SEEK_SET:
+     dist = offset / VCDSECTORSIZE;
+-    this->cur_sector = start + dist;
++    this->cls->cur_sector = start + dist;
+     break;
+   case SEEK_CUR:
+ 
+     if (offset) 
+       printf ("input_vcd: SEEK_CUR not implemented for offset != 0\n");
+ 
+-    sector_pos = this->cur_sector;
++    sector_pos = this->cls->cur_sector;
+ 
+     return sector_pos * VCDSECTORSIZE;
+ 
+@@ -761,10 +761,10 @@
+   len = 
+     ntohl(this->cls->tocent
+ 	  [this->cur_track+2 
+-	  - this->tochdr.starting_track].addr.lba)
++	  - this->cls->tochdr.starting_track].addr.lba)
+     - ntohl(this->cls->tocent
+ 	    [this->cur_track+1 
+-	    - this->tochdr.starting_track].addr.lba);
++	    - this->cls->tochdr.starting_track].addr.lba);
+   
+   return len * 2352; /*VCDSECTORSIZE;*/
+ 
+@@ -888,9 +888,9 @@
+       return 0;
+     }
+   
+-    this->cur_sector = 
++    this->cls->cur_sector = 
+       ntohl(this->cls->tocent
+-	    [this->cur_track+1 - this->tochdr.starting_track].addr.lba);
++	    [this->cur_track+1 - this->cls->tochdr.starting_track].addr.lba);
+     
+   }
+ #endif
diff --git a/multimedia/libxine/files/patch-src:input:libdvdnav:vm.c b/multimedia/libxine/files/patch-src:input:libdvdnav:vm.c
new file mode 100644
index 000000000000..59a92de19884
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:input:libdvdnav:vm.c
@@ -0,0 +1,11 @@
+--- src/input/libdvdnav/vm.c.orig	Sat Jan 11 23:43:55 2003
++++ src/input/libdvdnav/vm.c	Sat Jan 11 23:45:47 2003
+@@ -48,6 +48,8 @@
+ 
+ #define STRICT
+ 
++#define off64_t off_t
++#define lseek64 lseek
+ 
+ /* Local prototypes */
+ 
diff --git a/multimedia/libxine/files/patch-src:input:libreal:real.c b/multimedia/libxine/files/patch-src:input:libreal:real.c
new file mode 100644
index 000000000000..33b487a35922
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:input:libreal:real.c
@@ -0,0 +1,10 @@
+--- src/input/libreal/real.c.orig	Sat Feb  1 22:31:41 2003
++++ src/input/libreal/real.c	Sat Feb  1 22:33:31 2003
+@@ -26,6 +26,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <sys/types.h>
+ 
+ #include "real.h"
+ #include "asmrp.h"
diff --git a/multimedia/libxine/files/patch-src:input:libreal:sdpplin.c b/multimedia/libxine/files/patch-src:input:libreal:sdpplin.c
new file mode 100644
index 000000000000..8e8d174befae
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:input:libreal:sdpplin.c
@@ -0,0 +1,12 @@
+--- src/input/libreal/sdpplin.c.orig	Sun Jan  5 19:28:03 2003
++++ src/input/libreal/sdpplin.c	Sun Jan  5 19:29:02 2003
+@@ -22,7 +22,8 @@
+  * sdp/sdpplin parser.
+  *
+  */
+- 
++
++#include <sys/types.h> 
+ #include "rmff.h"
+ #include "rtsp.h"
+ #include "sdpplin.h"
diff --git a/multimedia/libxine/files/patch-src:input:librtsp:rtsp.c b/multimedia/libxine/files/patch-src:input:librtsp:rtsp.c
new file mode 100644
index 000000000000..bcdf81cde1c7
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:input:librtsp:rtsp.c
@@ -0,0 +1,10 @@
+--- src/input/librtsp/rtsp.c.orig	Sun Jan  5 19:30:50 2003
++++ src/input/librtsp/rtsp.c	Sun Jan  5 19:31:21 2003
+@@ -23,6 +23,7 @@
+  * *not* RFC 2326 compilant yet.
+  */
+ 
++#include <sys/types.h>
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <assert.h>
diff --git a/multimedia/libxine/files/patch-src:input:librtsp:rtsp_session.c b/multimedia/libxine/files/patch-src:input:librtsp:rtsp_session.c
new file mode 100644
index 000000000000..573a1b953f5c
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:input:librtsp:rtsp_session.c
@@ -0,0 +1,10 @@
+--- src/input/librtsp/rtsp_session.c.orig	Sun Jan  5 19:33:57 2003
++++ src/input/librtsp/rtsp_session.c	Sun Jan  5 19:34:29 2003
+@@ -22,6 +22,7 @@
+  * high level interface to rtsp servers.
+  */
+ 
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <netdb.h>
diff --git a/multimedia/libxine/files/patch-src:liba52:Makefile.am b/multimedia/libxine/files/patch-src:liba52:Makefile.am
deleted file mode 100644
index 6f5c3a299811..000000000000
--- a/multimedia/libxine/files/patch-src:liba52:Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/liba52/Makefile.am.orig	Tue Mar 26 08:07:16 2002
-+++ src/liba52/Makefile.am	Sat May 25 11:03:48 2002
-@@ -8,13 +8,9 @@
- 
- lib_LTLIBRARIES = xineplug_decode_a52.la
- 
--xineplug_decode_a52_la_SOURCES =  bitstream.c bit_allocate.c \
--	parse.c downmix.c imdct.c imdct_mlib.c \
--	xine_decoder.c
-+xineplug_decode_a52_la_SOURCES = xine_decoder.c
-+xineplug_decode_a52_la_LIBADD = -la52 -ldjbfft
- xineplug_decode_a52_la_LDFLAGS = -avoid-version -module
--
--noinst_HEADERS = a52.h a52_internal.h \
--	bitstream.h tables.h
- 
- ##
- ## Install header files (default=$includedir/xine)
diff --git a/multimedia/libxine/files/patch-src:liba52:Makefile.in b/multimedia/libxine/files/patch-src:liba52:Makefile.in
new file mode 100644
index 000000000000..01356e92ee90
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:liba52:Makefile.in
@@ -0,0 +1,40 @@
+--- src/liba52/Makefile.in.orig	Sun Jan  5 18:47:47 2003
++++ src/liba52/Makefile.in	Sun Jan  5 18:47:56 2003
+@@ -208,25 +208,12 @@
+ 
+ lib_LTLIBRARIES = xineplug_decode_a52.la
+ 
+-xineplug_decode_a52_la_SOURCES = \
+-	bitstream.c \
+-	bit_allocate.c \
+-	downmix.c \
+-	imdct.c \
+-	parse.c \
+-	xine_decoder.c
++xineplug_decode_a52_la_SOURCES = xine_decoder.c
+ 
+ 
+-xineplug_decode_a52_la_LIBADD = $(XINE_LIB)
++xineplug_decode_a52_la_LIBADD = $(XINE_LIB) -la52 -ldjbfft
+ xineplug_decode_a52_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+ 
+-noinst_HEADERS = \
+-	a52.h \
+-	a52_internal.h \
+-	bitstream.h \
+-	tables.h
+-
+-subdir = src/liba52
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+@@ -234,8 +221,7 @@
+ 
+ xineplug_decode_a52_la_DEPENDENCIES = \
+ 	$(top_builddir)/src/xine-engine/libxine.la
+-am_xineplug_decode_a52_la_OBJECTS = bitstream.lo bit_allocate.lo \
+-	downmix.lo imdct.lo parse.lo xine_decoder.lo
++am_xineplug_decode_a52_la_OBJECTS = xine_decoder.lo
+ xineplug_decode_a52_la_OBJECTS = $(am_xineplug_decode_a52_la_OBJECTS)
+ 
+ DEFS = @DEFS@
diff --git a/multimedia/libxine/files/patch-src:liba52:xine_decoder.c b/multimedia/libxine/files/patch-src:liba52:xine_decoder.c
index 5a1826987a2f..bd261755a741 100644
--- a/multimedia/libxine/files/patch-src:liba52:xine_decoder.c
+++ b/multimedia/libxine/files/patch-src:liba52:xine_decoder.c
@@ -1,63 +1,13 @@
---- src/liba52/xine_decoder.c.orig	Sun Apr 28 22:57:28 2002
-+++ src/liba52/xine_decoder.c	Thu May 16 22:16:31 2002
-@@ -36,8 +36,8 @@
- #include <fcntl.h>
+--- src/liba52/xine_decoder.c.orig	Mon Nov 25 06:08:51 2002
++++ src/liba52/xine_decoder.c	Sat Nov 30 11:38:41 2002
+@@ -37,8 +37,8 @@
  
+ #include "xine_internal.h"
  #include "audio_out.h"
 -#include "a52.h"
 -#include "a52_internal.h"
 +#include <a52dec/a52.h>
 +#include <a52dec/a52_internal.h>
  #include "buffer.h"
- #include "xine_internal.h"
  #include "xineutils.h"
-@@ -58,7 +58,7 @@
-   int              frame_length, frame_todo;
-   uint16_t         syncword;
- 
--  a52_state_t      a52_state;
-+  a52_state_t      *a52_state;
-   int              a52_flags;
-   int              a52_bit_rate;
-   int              a52_sample_rate;
-@@ -154,8 +154,11 @@
-   this->output_open   = 0;
-   this->pts           = 0;
- 
--  if( !this->samples )
--    this->samples = a52_init (xine_mm_accel(), &this->samples_base);
-+  this->a52_state = a52_init (xine_mm_accel());
-+
-+  if( (this->a52_state) != NULL )
-+    if( !this->samples )
-+      this->samples = a52_samples (this->a52_state);
- 
-   /*
-    * find out if this driver supports a52 output
-@@ -284,7 +287,7 @@
-     
-     a52_output_flags = this->a52_flags_map[this->a52_flags & A52_CHANNEL_MASK];
-     
--    if (a52_frame (&this->a52_state, 
-+    if (a52_frame (this->a52_state, 
- 		   this->frame_buffer, 
- 		   &a52_output_flags,
- 		   &level, 384)) {
-@@ -293,7 +296,7 @@
-     }
-     
-     if (this->disable_dynrng)
--      a52_dynrng (&this->a52_state, NULL, NULL);
-+      a52_dynrng (this->a52_state, NULL, NULL);
- 
-     this->have_lfe = a52_output_flags & A52_LFE;
-     if (this->have_lfe)
-@@ -334,7 +337,7 @@
-     buf->num_frames = 256*6;
  
-     for (i = 0; i < 6; i++) {
--      if (a52_block (&this->a52_state, this->samples)) {
-+      if (a52_block (this->a52_state)) {
- 	printf ("liba52: a52_block error\n");
- 	buf->num_frames = 0;
- 	break; 
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:Makefile.am b/multimedia/libxine/files/patch-src:libffmpeg:Makefile.am
deleted file mode 100644
index 3ad31f89d757..000000000000
--- a/multimedia/libxine/files/patch-src:libffmpeg:Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/libffmpeg/Makefile.am.orig	Tue Nov 27 03:34:06 2001
-+++ src/libffmpeg/Makefile.am	Thu Nov 29 17:26:16 2001
-@@ -2,7 +2,6 @@
- ## Process this file with automake to produce Makefile.in
- ##
- 
--SUBDIRS = libavcodec 
- 
- CFLAGS = @GLOBAL_CFLAGS@
- 
-@@ -13,9 +12,8 @@
- lib_LTLIBRARIES = xineplug_decode_ff.la
- 
- xineplug_decode_ff_la_SOURCES = xine_decoder.c
--xineplug_decode_ff_la_LDFLAGS = \
--		$(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \
--		-avoid-version -module
-+xineplug_decode_ff_la_LIBADD = -lavcodec
-+xineplug_decode_ff_la_LDFLAGS = -avoid-version -module
- 
- debug:
- 	@list='$(SUBDIRS)'; for subdir in $$list; do \
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:Makefile.in b/multimedia/libxine/files/patch-src:libffmpeg:Makefile.in
new file mode 100644
index 000000000000..3e608305fbc7
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:libffmpeg:Makefile.in
@@ -0,0 +1,32 @@
+--- src/libffmpeg/Makefile.in.orig	Thu Jan 16 23:08:15 2003
++++ src/libffmpeg/Makefile.in	Fri Jan 17 00:50:59 2003
+@@ -204,8 +204,6 @@
+ install_sh = @install_sh@
+ w32_path = @w32_path@
+ 
+-SUBDIRS = libavcodec 
+-
+ # I don't think this should include internal docs that are not interesting
+ # for end users at all... -siggi
+ EXTRA_DIST = 
+@@ -217,8 +215,7 @@
+ 
+ xineplug_decode_ff_la_SOURCES = xine_decoder.c
+ xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+-xineplug_decode_ff_la_LIBADD = $(XINE_LIB) \
+-	$(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la
++xineplug_decode_ff_la_LIBADD = $(XINE_LIB) -lavcodec
+ 
+ subdir = src/libffmpeg
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -226,9 +223,7 @@
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ 
+-xineplug_decode_ff_la_DEPENDENCIES = \
+-	$(top_builddir)/src/xine-engine/libxine.la \
+-	$(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la
++xineplug_decode_ff_la_DEPENDENCIES = $(top_builddir)/src/xine-engine/libxine.la
+ am_xineplug_decode_ff_la_OBJECTS = xine_decoder.lo
+ xineplug_decode_ff_la_OBJECTS = $(am_xineplug_decode_ff_la_OBJECTS)
+ 
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:xine_decoder.c b/multimedia/libxine/files/patch-src:libffmpeg:xine_decoder.c
index 6a259c1ece57..27282f779bbb 100644
--- a/multimedia/libxine/files/patch-src:libffmpeg:xine_decoder.c
+++ b/multimedia/libxine/files/patch-src:libffmpeg:xine_decoder.c
@@ -1,8 +1,8 @@
---- src/libffmpeg/xine_decoder.c.orig	Fri Aug  2 00:26:53 2002
-+++ src/libffmpeg/xine_decoder.c	Mon Aug  5 22:56:40 2002
-@@ -39,8 +39,8 @@
- #include "metronom.h"
+--- src/libffmpeg/xine_decoder.c.orig	Thu Jan 30 23:25:11 2003
++++ src/libffmpeg/xine_decoder.c	Thu Jan 30 23:25:14 2003
+@@ -40,8 +40,8 @@
  #include "xineutils.h"
+ #include "math.h"
  
 -#include "libavcodec/avcodec.h"
 -#include "libavcodec/dsputil.h"
@@ -11,33 +11,3 @@
  
  /*
  #define LOG
-@@ -379,29 +379,6 @@
- 
- static char *ff_get_id(void) {
-   return "ffmpeg video decoder";
--}
--
--void avcodec_register_all(void)
--{
--    static int inited = 0;
--    
--    if (inited != 0)
--	return;
--    inited = 1;
--
--    /* decoders */
--    register_avcodec(&h263_decoder);
--    register_avcodec(&mpeg4_decoder);
--    register_avcodec(&msmpeg4v1_decoder);
--    register_avcodec(&msmpeg4v2_decoder);
--    register_avcodec(&msmpeg4v3_decoder);
--    register_avcodec(&wmv1_decoder);
--    register_avcodec(&wmv2_decoder);
--    register_avcodec(&mpeg_decoder);
--    register_avcodec(&h263i_decoder);
--    register_avcodec(&rv10_decoder);
--    register_avcodec(&svq1_decoder);
--    register_avcodec(&mjpeg_decoder);
- }
- 
- static void init_routine(void) {
diff --git a/multimedia/libxine/files/patch-src:libmad:Makefile.in b/multimedia/libxine/files/patch-src:libmad:Makefile.in
new file mode 100644
index 000000000000..041e72d5a00f
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:libmad:Makefile.in
@@ -0,0 +1,47 @@
+--- src/libmad/Makefile.in.orig	Sun Jan  5 19:01:05 2003
++++ src/libmad/Makefile.in	Sun Jan  5 19:07:10 2003
+@@ -210,42 +210,12 @@
+ 
+ lib_LTLIBRARIES = xineplug_decode_mad.la
+ 
+-xineplug_decode_mad_la_SOURCES = \
+-	bit.c \
+-	fixed.c \
+-	frame.c \
+-	huffman.c \
+-	layer12.c \
+-	layer3.c \
+-	stream.c \
+-	synth.c \
+-	timer.c \
+-	version.c \
+-	xine_decoder.c
++xineplug_decode_mad_la_SOURCES = xine_decoder.c
+ 
+ 
+-xineplug_decode_mad_la_LIBADD = $(XINE_LIB)
++xineplug_decode_mad_la_LIBADD = $(XINE_LIB) -lmad
+ xineplug_decode_mad_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+ 
+-noinst_HEADERS = \
+-	D.dat \
+-	imdct_s.dat \
+-	qc_table.dat \
+-	rq_table.dat \
+-	sf_table.dat \
+-	bit.h \
+-	fixed.h \
+-	frame.h \
+-	global.h \
+-	huffman.h \
+-	layer12.h \
+-	layer3.h \
+-	stream.h \
+-	synth.h \
+-	timer.h \
+-	version.h
+-
+-subdir = src/libmad
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
diff --git a/multimedia/libxine/files/patch-src:libmad:xine_decoder.c b/multimedia/libxine/files/patch-src:libmad:xine_decoder.c
new file mode 100644
index 000000000000..72b04986dfe5
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:libmad:xine_decoder.c
@@ -0,0 +1,16 @@
+--- src/libmad/xine_decoder.c.orig	Sat Nov 30 11:56:16 2002
++++ src/libmad/xine_decoder.c	Sat Nov 30 12:00:04 2002
+@@ -24,12 +24,11 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
++#include <mad.h>
+ 
+ #include "xine_internal.h"
+ #include "audio_out.h"
+ #include "buffer.h"
+-#include "frame.h"
+-#include "synth.h"
+ #include "xineutils.h"
+ 
+ /*
diff --git a/multimedia/libxine/files/patch-src:libw32dll:DirectShow:Makefile.am b/multimedia/libxine/files/patch-src:libw32dll:DirectShow:Makefile.am
deleted file mode 100644
index 604e19e594e6..000000000000
--- a/multimedia/libxine/files/patch-src:libw32dll:DirectShow:Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
---- src/libw32dll/DirectShow/Makefile.am.orig	Fri Jan 11 04:59:50 2002
-+++ src/libw32dll/DirectShow/Makefile.am	Tue Jan 29 12:12:58 2002
-@@ -1,3 +1,4 @@
-+INCLUDES = @INCLUDES@ -I$(srcdir)/..
- 
- CFLAGS = @GLOBAL_CFLAGS@ @X_CFLAGS@ -fno-omit-frame-pointer \
- 	-Wmissing-prototypes -Wimplicit-function-declaration \
diff --git a/multimedia/libxine/files/patch-src:libw32dll:wine:Makefile.am b/multimedia/libxine/files/patch-src:libw32dll:wine:Makefile.am
deleted file mode 100644
index 1a426603d07a..000000000000
--- a/multimedia/libxine/files/patch-src:libw32dll:wine:Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libw32dll/wine/Makefile.am.orig	Tue Mar 26 08:07:17 2002
-+++ src/libw32dll/wine/Makefile.am	Sat May 25 10:25:26 2002
-@@ -4,6 +4,8 @@
- 
- ##
- ##
-+INCLUDES = @INCLUDES@ -I$(srcdir)/..
-+
- CFLAGS = @CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \
- 	-Wmissing-prototypes -Wimplicit-function-declaration \
- 	-DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \
diff --git a/multimedia/libxine/files/patch-src:video_out:video_out_sdl.c b/multimedia/libxine/files/patch-src:video_out:video_out_sdl.c
index ae6f697f1859..b33ddbd6c25b 100644
--- a/multimedia/libxine/files/patch-src:video_out:video_out_sdl.c
+++ b/multimedia/libxine/files/patch-src:video_out:video_out_sdl.c
@@ -1,5 +1,5 @@
---- src/video_out/video_out_sdl.c.orig	Sun Jun  2 02:04:24 2002
-+++ src/video_out/video_out_sdl.c	Sun Jun  2 02:04:30 2002
+--- src/video_out/video_out_sdl.c.orig	Sun Jan  5 19:23:55 2003
++++ src/video_out/video_out_sdl.c	Sun Jan  5 19:24:18 2003
 @@ -47,7 +47,7 @@
  #include <string.h>
  #include <inttypes.h>
@@ -7,5 +7,5 @@
 -#include <SDL/SDL.h>
 +#include <SDL11/SDL.h>
  
- #include "video_out.h"
+ #include "xine.h"
  #include "xine_internal.h"
diff --git a/multimedia/libxine/files/patch-video_out:video_out_syncfb.c b/multimedia/libxine/files/patch-video_out:video_out_syncfb.c
deleted file mode 100644
index 79d7dfadf678..000000000000
--- a/multimedia/libxine/files/patch-video_out:video_out_syncfb.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/video_out/video_out_syncfb.c.orig	Thu May 16 23:32:35 2002
-+++ src/video_out/video_out_syncfb.c	Thu May 16 23:32:57 2002
-@@ -39,6 +39,7 @@
- #include <sys/ioccom.h>
- #endif
- 
-+#include <sys/types.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- #include <sys/shm.h>
diff --git a/multimedia/libxine/pkg-comment b/multimedia/libxine/pkg-comment
index 3f7138e01ae3..f3567413c91d 100644
--- a/multimedia/libxine/pkg-comment
+++ b/multimedia/libxine/pkg-comment
@@ -1 +1 @@
-Libraries for xine UNIX video player
+Libraries for xine multimedia player
diff --git a/multimedia/libxine/pkg-descr b/multimedia/libxine/pkg-descr
index 15ee32a4db07..f9464b084658 100644
--- a/multimedia/libxine/pkg-descr
+++ b/multimedia/libxine/pkg-descr
@@ -1,8 +1,8 @@
-xine is a free gpl-licensed video player for unix-like systems.
-We support mpeg-2 and mpeg-1 system (audio + video multiplexed) streams,
-mpeg elementary streams (audio/video only, e.g. mp3 files) and
-AVI files (using win32 codec dlls).
+xine is a free multimedia player. It plays back CDs, DVDs, and VCDs.
+It also decodes multimedia files like AVI, MOV, WMV, and MP3 from local disk
+drives, and displays multimedia streamed over the Internet. It interprets many
+of the most common multimedia formats available.
 
 These are the libraries for the xine.
 
-WWW: http://xine.sourceforge.net/
+WWW: http://www.xinehq.de/
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 5b0aaa93fc1e..be4d2a99f7f9 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -1,180 +1,197 @@
 bin/xine-config
-include/xine/compat.h
+include/xine.h
 include/xine/attributes.h
+include/xine/audio_decoder.h
 include/xine/audio_out.h
 include/xine/buffer.h
+include/xine/compat.h
 include/xine/configfile.h
 include/xine/demux.h
-include/xine/events.h
 include/xine/input_plugin.h
 include/xine/lrb.h
 include/xine/metronom.h
+include/xine/nav_types.h
 include/xine/osd.h
+include/xine/plugin_catalog.h
+include/xine/post.h
 include/xine/ppcasm_string.h
-include/xine/qtpalette.h
 include/xine/resample.h
 include/xine/scratch.h
 include/xine/spu_decoder.h
 include/xine/spu_decoder_api.h
+include/xine/video_decoder.h
 include/xine/video_out.h
-include/xine/video_out_x11.h
 include/xine/video_overlay.h
+include/xine/vo_scale.h
+include/xine/xine_buffer.h
+include/xine/xine_check.h
 include/xine/xine_internal.h
+include/xine/xine_plugin.h
 include/xine/xineintl.h
 include/xine/xineutils.h
 include/xine/xmllexer.h
 include/xine/xmlparser.h
-include/xine.h
 lib/libxine.so
-lib/libxine.so.2
-lib/libxineutils.so
-lib/libxineutils.so.2
-%%HAVE_ARTS%%lib/xine/plugins/xineplug_ao_out_arts.so
-lib/xine/plugins/xineplug_ao_out_esd.so
-lib/xine/plugins/xineplug_ao_out_oss.so
-lib/xine/plugins/xineplug_decode_a52.so
-lib/xine/plugins/xineplug_decode_adpcm.so
-lib/xine/plugins/xineplug_decode_cinepak.so
-lib/xine/plugins/xineplug_decode_cyuv.so
-lib/xine/plugins/xineplug_decode_divx4.so
-lib/xine/plugins/xineplug_decode_dts.so
-lib/xine/plugins/xineplug_decode_faad.so
-lib/xine/plugins/xineplug_decode_ff.so
-lib/xine/plugins/xineplug_decode_fli.so
-lib/xine/plugins/xineplug_decode_lpcm.so
-lib/xine/plugins/xineplug_decode_mad.so
-lib/xine/plugins/xineplug_decode_mpeg2.so
-lib/xine/plugins/xineplug_decode_msrle.so
-lib/xine/plugins/xineplug_decode_msvc.so
-lib/xine/plugins/xineplug_decode_rgb.so
-lib/xine/plugins/xineplug_decode_roqaudio.so
-lib/xine/plugins/xineplug_decode_roqvideo.so
-lib/xine/plugins/xineplug_decode_spu.so
-lib/xine/plugins/xineplug_decode_spucc.so
-lib/xine/plugins/xineplug_decode_sputext.so
-lib/xine/plugins/xineplug_decode_svq1.so
-%%HAVE_VORBIS%%lib/xine/plugins/xineplug_decode_vorbis.so
-lib/xine/plugins/xineplug_decode_yuv.so
-lib/xine/plugins/xineplug_decode_w32dll.so
-lib/xine/plugins/xineplug_dmx_asf.so
-lib/xine/plugins/xineplug_dmx_avi.so
-lib/xine/plugins/xineplug_dmx_cda.so
-lib/xine/plugins/xineplug_dmx_film.so
-lib/xine/plugins/xineplug_dmx_fli.so
-lib/xine/plugins/xineplug_dmx_idcin.so
-lib/xine/plugins/xineplug_dmx_mpeg.so
-lib/xine/plugins/xineplug_dmx_mpeg_audio.so
-lib/xine/plugins/xineplug_dmx_mpeg_block.so
-lib/xine/plugins/xineplug_dmx_mpeg_elem.so
-lib/xine/plugins/xineplug_dmx_mpeg_pes.so
-lib/xine/plugins/xineplug_dmx_mpeg_ts.so
-%%HAVE_OGG%%lib/xine/plugins/xineplug_dmx_ogg.so
-lib/xine/plugins/xineplug_dmx_roq.so
-lib/xine/plugins/xineplug_dmx_smjpeg.so
-lib/xine/plugins/xineplug_dmx_wav.so
-lib/xine/plugins/xineplug_dmx_qt.so
-lib/xine/plugins/xineplug_inp_dvd.so
-lib/xine/plugins/xineplug_inp_file.so
-lib/xine/plugins/xineplug_inp_http.so
-lib/xine/plugins/xineplug_inp_mms.so
-lib/xine/plugins/xineplug_inp_net.so
-lib/xine/plugins/xineplug_inp_rtp.so
-lib/xine/plugins/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/xineplug_inp_vcd.so
-lib/xine/plugins/xineplug_vo_out_aa.so
-lib/xine/plugins/xineplug_vo_out_opengl.so
-lib/xine/plugins/xineplug_vo_out_sdl.so
-lib/xine/plugins/xineplug_vo_out_syncfb.so
-lib/xine/plugins/xineplug_vo_out_xshm.so
-%%HAVE_LIBXV%%lib/xine/plugins/xineplug_vo_out_xv.so
-share/doc/xine/xine-lib-API/html/annotated.html
-share/doc/xine/xine-lib-API/html/doxygen.css
-share/doc/xine/xine-lib-API/html/doxygen.gif
-share/doc/xine/xine-lib-API/html/files.html
-share/doc/xine/xine-lib-API/html/functions.html
-share/doc/xine/xine-lib-API/html/globals.html
-share/doc/xine/xine-lib-API/html/group__audio__cap.html
-share/doc/xine/xine-lib-API/html/group__audio__group.html
-share/doc/xine/xine-lib-API/html/group__audio__prop.html
-share/doc/xine/xine-lib-API/html/group__autoplay__group.html
-share/doc/xine/xine-lib-API/html/group__browse__group.html
-share/doc/xine/xine-lib-API/html/group__build__info.html
-share/doc/xine/xine-lib-API/html/group__config__group.html
-share/doc/xine/xine-lib-API/html/group__demux__strategy.html
-share/doc/xine/xine-lib-API/html/group__event__group.html
-share/doc/xine/xine-lib-API/html/group__loadplugins__group.html
-share/doc/xine/xine-lib-API/html/group__mrl__types.html
-share/doc/xine/xine-lib-API/html/group__status__group.html
-share/doc/xine/xine-lib-API/html/group__ui__callbacks.html
-share/doc/xine/xine-lib-API/html/group__version__group.html
-share/doc/xine/xine-lib-API/html/group__video__cap.html
-share/doc/xine/xine-lib-API/html/group__video__group.html
-share/doc/xine/xine-lib-API/html/group__video__prop.html
-share/doc/xine/xine-lib-API/html/group__video__ratio.html
-share/doc/xine/xine-lib-API/html/group__visual__types.html
-share/doc/xine/xine-lib-API/html/group__xine__api.html
-share/doc/xine/xine-lib-API/html/group__xine__init.html
-share/doc/xine/xine-lib-API/html/group__xine__management.html
-share/doc/xine/xine-lib-API/html/group__xine__version.html
-share/doc/xine/xine-lib-API/html/index.html
-share/doc/xine/xine-lib-API/html/modules.html
-share/doc/xine/xine-lib-API/html/structao__driver__t.html
-share/doc/xine/xine-lib-API/html/structao__functions__t.html
-share/doc/xine/xine-lib-API/html/structcfg__data__t.html
-share/doc/xine/xine-lib-API/html/structconfig__values__s.html
-share/doc/xine/xine-lib-API/html/structconfig__values__t.html
-share/doc/xine/xine-lib-API/html/structmrl__t.html
-share/doc/xine/xine-lib-API/html/structvo__driver__s.html
-share/doc/xine/xine-lib-API/html/structvo__driver__t.html
-share/doc/xine/xine-lib-API/html/structvo__frame__t.html
-share/doc/xine/xine-lib-API/html/structvo__overlay__t.html
-share/doc/xine/xine-lib-API/html/structxine__t.html
-share/doc/xine/xine-lib-API/html/xine_8h-source.html
-share/doc/xine/xine-lib-API/html/xine_8h.html
-share/doc/xine/xine-lib-API/html/xine_logo.png
-share/locale/cs/LC_MESSAGES/xine-lib.mo
-share/locale/de/LC_MESSAGES/xine-lib.mo
-share/locale/es/LC_MESSAGES/xine-lib.mo
-share/locale/fr/LC_MESSAGES/xine-lib.mo
-share/locale/pl_PL/LC_MESSAGES/xine-lib.mo
-share/locale/pt_BR/LC_MESSAGES/xine-lib.mo
-share/locale/sk/LC_MESSAGES/xine-lib.mo
-share/xine/fonts/cc-16.xinefont.gz
-share/xine/fonts/cc-20.xinefont.gz
-share/xine/fonts/cc-24.xinefont.gz
-share/xine/fonts/cc-32.xinefont.gz
-share/xine/fonts/cci-16.xinefont.gz
-share/xine/fonts/cci-20.xinefont.gz
-share/xine/fonts/cci-24.xinefont.gz
-share/xine/fonts/cci-32.xinefont.gz
-share/xine/fonts/cetus-16.xinefont.gz
-share/xine/fonts/cetus-20.xinefont.gz
-share/xine/fonts/cetus-24.xinefont.gz
-share/xine/fonts/cetus-32.xinefont.gz
-share/xine/fonts/mono-16.xinefont.gz
-share/xine/fonts/mono-20.xinefont.gz
-share/xine/fonts/mono-24.xinefont.gz
-share/xine/fonts/mono-32.xinefont.gz
-share/xine/fonts/sans-16.xinefont.gz
-share/xine/fonts/sans-20.xinefont.gz
-share/xine/fonts/sans-24.xinefont.gz
-share/xine/fonts/sans-32.xinefont.gz
-share/xine/fonts/sanshu-16.xinefont.gz
-share/xine/fonts/sanshu-20.xinefont.gz
-share/xine/fonts/sanshu-24.xinefont.gz
-share/xine/fonts/sanshu-32.xinefont.gz
-share/xine/fonts/serif-16.xinefont.gz
-share/xine/fonts/serif-20.xinefont.gz
-share/xine/fonts/serif-24.xinefont.gz
-share/xine/fonts/serif-32.xinefont.gz
-share/xine/skins/xine_logo.mpv
+lib/libxine.so.3
+lib/pkgconfig/libxine.pc
+lib/xine/plugins/1.0.0/post/xineplug_post_goom.so
+lib/xine/plugins/1.0.0/post/xineplug_post_invert.so
+lib/xine/plugins/1.0.0/post/xineplug_post_visualizations.so
+%%HAVE_ARTS%%lib/xine/plugins/1.0.0/xineplug_ao_out_arts.so
+%%HAVE_ESOUND%%lib/xine/plugins/1.0.0/xineplug_ao_out_esd.so
+lib/xine/plugins/1.0.0/xineplug_ao_out_oss.so
+lib/xine/plugins/1.0.0/xineplug_decode_a52.so
+lib/xine/plugins/1.0.0/xineplug_decode_adpcm.so
+lib/xine/plugins/1.0.0/xineplug_decode_cinepak.so
+lib/xine/plugins/1.0.0/xineplug_decode_cyuv.so
+lib/xine/plugins/1.0.0/xineplug_decode_dts.so
+lib/xine/plugins/1.0.0/xineplug_decode_dxr3_spu.so
+lib/xine/plugins/1.0.0/xineplug_decode_dxr3_video.so
+lib/xine/plugins/1.0.0/xineplug_decode_faad.so
+lib/xine/plugins/1.0.0/xineplug_decode_ff.so
+lib/xine/plugins/1.0.0/xineplug_decode_fli.so
+lib/xine/plugins/1.0.0/xineplug_decode_gsm610.so
+lib/xine/plugins/1.0.0/xineplug_decode_idcinvideo.so
+lib/xine/plugins/1.0.0/xineplug_decode_interplayaudio.so
+lib/xine/plugins/1.0.0/xineplug_decode_interplayvideo.so
+lib/xine/plugins/1.0.0/xineplug_decode_logpcm.so
+lib/xine/plugins/1.0.0/xineplug_decode_lpcm.so
+lib/xine/plugins/1.0.0/xineplug_decode_mad.so
+lib/xine/plugins/1.0.0/xineplug_decode_mpeg2.so
+lib/xine/plugins/1.0.0/xineplug_decode_msrle.so
+lib/xine/plugins/1.0.0/xineplug_decode_msvc.so
+lib/xine/plugins/1.0.0/xineplug_decode_nsf.so
+lib/xine/plugins/1.0.0/xineplug_decode_qt.so
+lib/xine/plugins/1.0.0/xineplug_decode_qtrle.so
+lib/xine/plugins/1.0.0/xineplug_decode_qtrpza.so
+lib/xine/plugins/1.0.0/xineplug_decode_qtsmc.so
+lib/xine/plugins/1.0.0/xineplug_decode_real.so
+lib/xine/plugins/1.0.0/xineplug_decode_real_audio.so
+lib/xine/plugins/1.0.0/xineplug_decode_rgb.so
+lib/xine/plugins/1.0.0/xineplug_decode_roqaudio.so
+lib/xine/plugins/1.0.0/xineplug_decode_roqvideo.so
+lib/xine/plugins/1.0.0/xineplug_decode_spu.so
+lib/xine/plugins/1.0.0/xineplug_decode_spucc.so
+lib/xine/plugins/1.0.0/xineplug_decode_sputext.so
+lib/xine/plugins/1.0.0/xineplug_decode_svq1.so
+lib/xine/plugins/1.0.0/xineplug_decode_yuv_frames.so
+lib/xine/plugins/1.0.0/xineplug_decode_vorbis.so
+lib/xine/plugins/1.0.0/xineplug_decode_w32dll.so
+lib/xine/plugins/1.0.0/xineplug_decode_wc3video.so
+lib/xine/plugins/1.0.0/xineplug_decode_yuv.so
+lib/xine/plugins/1.0.0/xineplug_dmx_asf.so
+lib/xine/plugins/1.0.0/xineplug_dmx_audio.so
+lib/xine/plugins/1.0.0/xineplug_dmx_avi.so
+lib/xine/plugins/1.0.0/xineplug_dmx_fli.so
+lib/xine/plugins/1.0.0/xineplug_dmx_games.so
+lib/xine/plugins/1.0.0/xineplug_dmx_mng.so
+lib/xine/plugins/1.0.0/xineplug_dmx_mpeg.so
+lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_block.so
+lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_elem.so
+lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_ts.so
+lib/xine/plugins/1.0.0/xineplug_dmx_ogg.so
+lib/xine/plugins/1.0.0/xineplug_dmx_pva.so
+lib/xine/plugins/1.0.0/xineplug_dmx_qt.so
+lib/xine/plugins/1.0.0/xineplug_dmx_rawdv.so
+lib/xine/plugins/1.0.0/xineplug_dmx_real.so
+lib/xine/plugins/1.0.0/xineplug_dmx_sputext.so
+lib/xine/plugins/1.0.0/xineplug_dmx_yuv4mpeg2.so
+lib/xine/plugins/1.0.0/xineplug_dmx_yuv_frames.so
+lib/xine/plugins/1.0.0/xineplug_inp_cdda.so
+lib/xine/plugins/1.0.0/xineplug_inp_dvb.so
+lib/xine/plugins/1.0.0/xineplug_inp_dvd.so
+lib/xine/plugins/1.0.0/xineplug_inp_file.so
+lib/xine/plugins/1.0.0/xineplug_inp_http.so
+lib/xine/plugins/1.0.0/xineplug_inp_mms.so
+lib/xine/plugins/1.0.0/xineplug_inp_net.so
+lib/xine/plugins/1.0.0/xineplug_inp_pnm.so
+lib/xine/plugins/1.0.0/xineplug_inp_rtsp.so
+lib/xine/plugins/1.0.0/xineplug_inp_stdin_fifo.so
+lib/xine/plugins/1.0.0/xineplug_inp_vcd.so
+lib/xine/plugins/1.0.0/xineplug_vo_out_aa.so
+lib/xine/plugins/1.0.0/xineplug_vo_out_dxr3.so
+lib/xine/plugins/1.0.0/xineplug_vo_out_none.so
+lib/xine/plugins/1.0.0/xineplug_vo_out_pgx64.so
+lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.so
+lib/xine/plugins/1.0.0/xineplug_vo_out_syncfb.so
+%%HAVE_LIBXV%%lib/xine/plugins/1.0.0/xineplug_vo_out_xv.so
+lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.so
+share/aclocal/xine.m4
+share/doc/xine/README
+share/doc/xine/README.config_en
+share/doc/xine/README.dvb
+share/doc/xine/README.dxr3
+share/doc/xine/README.dxr3_pl
+share/doc/xine/README.freebsd
+share/doc/xine/README.irix
+share/doc/xine/README.mrl
+share/doc/xine/README.opengl
+share/doc/xine/README.plugins
+share/doc/xine/README.solaris
+share/doc/xine/README.syncfb
+share/doc/xine/README.tvmode
+share/doc/xine/dataflow.dia
+share/doc/xine/faq/faq.html
+share/doc/xine/faq/faq.txt
+share/locale/cs/LC_MESSAGES/libxine1.mo
+share/locale/de/LC_MESSAGES/libxine1.mo
+share/locale/es/LC_MESSAGES/libxine1.mo
+share/locale/fr/LC_MESSAGES/libxine1.mo
+share/locale/pl_PL/LC_MESSAGES/libxine1.mo
+share/locale/pt_BR/LC_MESSAGES/libxine1.mo
+share/locale/sk/LC_MESSAGES/libxine1.mo
+share/xine/libxine1/fonts/cc-16.xinefont.gz
+share/xine/libxine1/fonts/cc-20.xinefont.gz
+share/xine/libxine1/fonts/cc-24.xinefont.gz
+share/xine/libxine1/fonts/cc-32.xinefont.gz
+share/xine/libxine1/fonts/cci-16.xinefont.gz
+share/xine/libxine1/fonts/cci-20.xinefont.gz
+share/xine/libxine1/fonts/cci-24.xinefont.gz
+share/xine/libxine1/fonts/cci-32.xinefont.gz
+share/xine/libxine1/fonts/cetus-16.xinefont.gz
+share/xine/libxine1/fonts/cetus-20.xinefont.gz
+share/xine/libxine1/fonts/cetus-24.xinefont.gz
+share/xine/libxine1/fonts/cetus-32.xinefont.gz
+share/xine/libxine1/fonts/mono-16.xinefont.gz
+share/xine/libxine1/fonts/mono-20.xinefont.gz
+share/xine/libxine1/fonts/mono-24.xinefont.gz
+share/xine/libxine1/fonts/mono-32.xinefont.gz
+share/xine/libxine1/fonts/sans-16.xinefont.gz
+share/xine/libxine1/fonts/sans-20.xinefont.gz
+share/xine/libxine1/fonts/sans-24.xinefont.gz
+share/xine/libxine1/fonts/sans-32.xinefont.gz
+share/xine/libxine1/fonts/sanshu-16.xinefont.gz
+share/xine/libxine1/fonts/sanshu-20.xinefont.gz
+share/xine/libxine1/fonts/sanshu-24.xinefont.gz
+share/xine/libxine1/fonts/sanshu-32.xinefont.gz
+share/xine/libxine1/fonts/serif-16.xinefont.gz
+share/xine/libxine1/fonts/serif-20.xinefont.gz
+share/xine/libxine1/fonts/serif-24.xinefont.gz
+share/xine/libxine1/fonts/serif-32.xinefont.gz
 @dirrm include/xine
-@dirrm lib/xine/plugins/vidix
+@unexec rmdir %D/lib/pkgconfig 2>/dev/null || true
+@dirrm lib/xine/plugins/1.0.0/post
+@dirrm lib/xine/plugins/1.0.0/vidix
+@dirrm lib/xine/plugins/1.0.0
 @dirrm lib/xine/plugins
 @dirrm lib/xine
-@dirrm share/doc/xine/xine-lib-API/html
-@dirrm share/doc/xine/xine-lib-API
+@dirrm share/doc/xine/faq
 @dirrm share/doc/xine
-@dirrm share/xine/fonts
-@dirrm share/xine/skins
+@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/de 2>/dev/null || true
+@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/es 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl_PL/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl_PL 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
+@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sk 2>/dev/null || true
+@unexec rmdir %D/share/locale 2>/dev/null || true
+@dirrm share/xine/libxine1/fonts
+@dirrm share/xine/libxine1
 @dirrm share/xine
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 354404c7fb1d..6efee0eefdfa 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -6,23 +6,21 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	0.9.13
+PORTVERSION=	0.9.18
 CATEGORIES=	graphics
-MASTER_SITES=	http://xine.sourceforge.net/files/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-ui-${PORTVERSION}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 
-LIB_DEPENDS=	xine.2:${PORTSDIR}/graphics/libxine \
+LIB_DEPENDS=	xine.3:${PORTSDIR}/graphics/libxine \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		png.5:${PORTSDIR}/graphics/png \
 		intl.4:${PORTSDIR}/devel/gettext
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	imlib
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
@@ -30,10 +28,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		THREAD_LIBS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32
+CONFIGURE_ARGS=	--program-transform-name=""
 
 MANLANG=	"" de es fr pl
-MAN1=		aaxine.1 xine.1 xine-bugreport.1 xine-check.1 xine-remote.1
+MAN1=		aaxine.1 xine-bugreport.1 xine-check.1 xine-remote.1 xine.1
 
 .include <bsd.port.pre.mk>
 
@@ -70,7 +68,7 @@ post-install:
 .for l in es fr pl
 	@${CP} ${PREFIX}/man/man1/xine-check.1 ${PREFIX}/man/${l}/man1/xine-check.1
 .endfor
-.for l in de es fr pl
+.for l in es fr
 	@${CP} ${PREFIX}/man/man1/xine-remote.1 ${PREFIX}/man/${l}/man1/xine-remote.1
 .endfor
 	@${CAT} ${PKGMESSAGE}
diff --git a/multimedia/xine/distinfo b/multimedia/xine/distinfo
index ccf1bca61be8..fff8c4e48552 100644
--- a/multimedia/xine/distinfo
+++ b/multimedia/xine/distinfo
@@ -1 +1 @@
-MD5 (xine-ui-0.9.13.tar.gz) = 7f7838f90b830ec25b905c8eb0215321
+MD5 (xine-ui-0.9.18.tar.gz) = 7aaabeb4cac95f66000741f970a17eca
diff --git a/multimedia/xine/files/patch-misc:desktops:Makefile.in b/multimedia/xine/files/patch-misc:desktops:Makefile.in
deleted file mode 100644
index a7ebea8b218f..000000000000
--- a/multimedia/xine/files/patch-misc:desktops:Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/desktops/Makefile.in.orig	Sat Nov 24 06:09:08 2001
-+++ misc/desktops/Makefile.in	Sat Nov 24 06:13:05 2001
-@@ -205,7 +205,6 @@
- 
- install-data-am: install-dataDATA
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-data: install-data-am
- 
- install-am: all-am
diff --git a/multimedia/xine/files/patch-src:xitk:session.c b/multimedia/xine/files/patch-src:xitk:session.c
new file mode 100644
index 000000000000..fa54d950ba07
--- /dev/null
+++ b/multimedia/xine/files/patch-src:xitk:session.c
@@ -0,0 +1,10 @@
+--- src/xitk/session.c.orig	Sat Feb  1 21:23:01 2003
++++ src/xitk/session.c	Sat Feb  1 21:25:03 2003
+@@ -41,6 +41,7 @@
+ #include <sys/stat.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
++#include <sys/select.h>
+ #include <errno.h>
+ 
+ #include "common.h"
diff --git a/multimedia/xine/pkg-comment b/multimedia/xine/pkg-comment
index 06f5da71ff92..5fbe86653da7 100644
--- a/multimedia/xine/pkg-comment
+++ b/multimedia/xine/pkg-comment
@@ -1 +1 @@
-A MPEG-1 and MPEG-2 player
+An X11 multimedia player
diff --git a/multimedia/xine/pkg-descr b/multimedia/xine/pkg-descr
index 45208b6e79c1..e3b94aeb5af9 100644
--- a/multimedia/xine/pkg-descr
+++ b/multimedia/xine/pkg-descr
@@ -1,16 +1,6 @@
-xine is a free video player for unix-like systems, which plays mpeg-2 and
-mpeg-1 system (audio + video multiplexed) streams, eventually mpeg-4 and
-other formats might be added.
+xine is a free multimedia player. It plays back CDs, DVDs, and VCDs.
+It also decodes multimedia files like AVI, MOV, WMV, and MP3 from local disk
+drives, and displays multimedia streamed over the Internet. It interprets many
+of the most common multimedia formats available.
 
-xine plays the video and audio data of mpeg-2 videos and synchronizes
-the playback of both.  Depending on the properties of the mpeg stream,
-playback will need more or less processor power, 100% frame rate
-has been seen on a 667 MHz P III system.
-
-xine can play Video CDs and DVDs directly (but only unlocked, unencrypted
-DVDs for obvious - legal - reasons, see the FAQ or homepage for a
-discussion of this subject).
-
-WWW: http://xine.sourceforge.net/
-
--- Alexander Langer <alex@FreeBSD.org>
+WWW: http://www.xinehq.de/
diff --git a/multimedia/xine/pkg-plist b/multimedia/xine/pkg-plist
index d7b7e99d730f..169f157ec25b 100644
--- a/multimedia/xine/pkg-plist
+++ b/multimedia/xine/pkg-plist
@@ -1,4 +1,5 @@
 bin/aaxine
+bin/fbxine
 bin/xine
 bin/xine-bugreport
 bin/xine-check
@@ -11,7 +12,6 @@ share/doc/xine-ui/FAQ_it
 share/doc/xine-ui/FAQ_pl
 share/doc/xine-ui/FAQ_uk
 share/doc/xine-ui/README.config_en
-share/doc/xine-ui/README.corba
 share/doc/xine-ui/README.divx4
 share/doc/xine-ui/README.dxr3
 share/doc/xine-ui/README.dxr3_pl
@@ -22,6 +22,7 @@ share/doc/xine-ui/README.opengl
 share/doc/xine-ui/README.solaris
 share/doc/xine-ui/README.syncfb
 share/doc/xine-ui/README.tvmode
+share/doc/xine-ui/README_cs
 share/doc/xine-ui/README_de
 share/doc/xine-ui/README_en
 share/doc/xine-ui/README_es
@@ -32,7 +33,6 @@ share/doc/xine-ui/README_pl
 share/doc/xine-ui/README_uk
 share/doc/xine-ui/bug_report_form
 share/doc/xitk/README
-share/idl/xine.idl
 share/locale/cs/LC_MESSAGES/xine-ui.mo
 share/locale/cs/LC_MESSAGES/xitk.mo
 share/locale/de/LC_MESSAGES/xine-ui.mo
@@ -49,14 +49,17 @@ share/locale/sk/LC_MESSAGES/xine-ui.mo
 share/locale/sk/LC_MESSAGES/xitk.mo
 share/locale/uk/LC_MESSAGES/xine-ui.mo
 share/locale/uk/LC_MESSAGES/xitk.mo
+share/pixmaps/xine.xpm
+share/pixmaps/xine_16x16.png
+share/pixmaps/xine_22x22.png
+share/pixmaps/xine_32x32.png
+share/pixmaps/xine_48x48.png
 share/xine/desktop/xine.desktop
-share/xine/desktop/xine.wmconfig
-share/xine/desktop/xine.xpm
-share/xine/desktop/xine_16x16.png
-share/xine/desktop/xine_22x22.png
-share/xine/desktop/xine_32x32.png
-share/xine/desktop/xine_48x48.png
+share/xine/skins/CelomaChrome/ArrowLeft.png
+share/xine/skins/CelomaChrome/ArrowRight.png
 share/xine/skins/CelomaChrome/BigArrowDown.png
+share/xine/skins/CelomaChrome/BigArrowLeft.png
+share/xine/skins/CelomaChrome/BigArrowRight.png
 share/xine/skins/CelomaChrome/BigArrowUp.png
 share/xine/skins/CelomaChrome/CtlBg.png
 share/xine/skins/CelomaChrome/CtlBtn.png
@@ -77,6 +80,7 @@ share/xine/skins/CelomaChrome/MainEject.png
 share/xine/skins/CelomaChrome/MainFastB.png
 share/xine/skins/CelomaChrome/MainFastF.png
 share/xine/skins/CelomaChrome/MainMute.png
+share/xine/skins/CelomaChrome/MainNav.png
 share/xine/skins/CelomaChrome/MainNext.png
 share/xine/skins/CelomaChrome/MainPause.png
 share/xine/skins/CelomaChrome/MainPlay.png
@@ -101,12 +105,16 @@ share/xine/skins/CelomaChrome/PlItemBtn.png
 share/xine/skins/CelomaChrome/PlMoveDn.png
 share/xine/skins/CelomaChrome/PlMoveUp.png
 share/xine/skins/CelomaChrome/PlPlay.png
+share/xine/skins/CelomaChrome/PlSlidHBg.png
+share/xine/skins/CelomaChrome/PlSlidHPad.png
 share/xine/skins/CelomaChrome/SetupBtn.png
 share/xine/skins/CelomaChrome/SkArrowDown.png
 share/xine/skins/CelomaChrome/SkArrowUp.png
 share/xine/skins/CelomaChrome/SkItemBtn.png
 share/xine/skins/CelomaChrome/SkSlidBG.png
+share/xine/skins/CelomaChrome/SkSlidHBg.png
 share/xine/skins/CelomaChrome/SkSlidPad.png
+share/xine/skins/CelomaChrome/SlidHPad.png
 share/xine/skins/CelomaChrome/SliderHBg.png
 share/xine/skins/CelomaChrome/SliderHPad.png
 share/xine/skins/CelomaChrome/SliderVBg.png
@@ -117,12 +125,17 @@ share/xine/skins/cloudy/ComBox.png
 share/xine/skins/cloudy/ComDismiss.png
 share/xine/skins/cloudy/ComLetters.png
 share/xine/skins/cloudy/ComScrollArrowDown.png
+share/xine/skins/cloudy/ComScrollArrowLeft.png
+share/xine/skins/cloudy/ComScrollArrowRight.png
 share/xine/skins/cloudy/ComScrollArrowUp.png
 share/xine/skins/cloudy/ComScrollBg.png
+share/xine/skins/cloudy/ComScrollHBg.png
+share/xine/skins/cloudy/ComScrollHPad.png
 share/xine/skins/cloudy/ComScrollPad.png
 share/xine/skins/cloudy/CtlBg.png
 share/xine/skins/cloudy/CtlSkinItem.png
 share/xine/skins/cloudy/CtlSkinScrollBg.png
+share/xine/skins/cloudy/CtlSkinScrollHBg.png
 share/xine/skins/cloudy/CtlSliderBg.png
 share/xine/skins/cloudy/CtlSliderPad.png
 share/xine/skins/cloudy/MainAutoButton.png
@@ -133,6 +146,7 @@ share/xine/skins/cloudy/MainEject.png
 share/xine/skins/cloudy/MainFullScreen.png
 share/xine/skins/cloudy/MainMrlBtn.png
 share/xine/skins/cloudy/MainMute.png
+share/xine/skins/cloudy/MainNav.png
 share/xine/skins/cloudy/MainNext.png
 share/xine/skins/cloudy/MainPause.png
 share/xine/skins/cloudy/MainPlBtn.png
@@ -154,6 +168,7 @@ share/xine/skins/cloudy/MrlBg.png
 share/xine/skins/cloudy/MrlItem.png
 share/xine/skins/cloudy/MrlPlay.png
 share/xine/skins/cloudy/MrlSelect.png
+share/xine/skins/cloudy/MrlSlidHBg.png
 share/xine/skins/cloudy/PlAdd.png
 share/xine/skins/cloudy/PlBg.png
 share/xine/skins/cloudy/PlDelete.png
@@ -167,9 +182,12 @@ share/xine/skins/cloudy/fatsolid.pcf.gz
 share/xine/skins/cloudy/fonts.dir
 share/xine/skins/cloudy/skinconfig
 share/xine/skins/cloudy/smooth.pcf.gz
-share/xine/skins/xinetic/ArrowDown.png
-share/xine/skins/xinetic/ArrowUp.png
+share/xine/skins/xine-ui_logo.mpv
+share/xine/skins/xinetic/ArrowLeft.png
+share/xine/skins/xinetic/ArrowRight.png
 share/xine/skins/xinetic/BigArrowDown.png
+share/xine/skins/xinetic/BigArrowLeft.png
+share/xine/skins/xinetic/BigArrowRight.png
 share/xine/skins/xinetic/BigArrowUp.png
 share/xine/skins/xinetic/CtlBg.png
 share/xine/skins/xinetic/CtlBtn.png
@@ -188,6 +206,7 @@ share/xine/skins/xinetic/MainFastB.png
 share/xine/skins/xinetic/MainFastF.png
 share/xine/skins/xinetic/MainFullScreen.png
 share/xine/skins/xinetic/MainMute.png
+share/xine/skins/xinetic/MainNav.png
 share/xine/skins/xinetic/MainNext.png
 share/xine/skins/xinetic/MainPause.png
 share/xine/skins/xinetic/MainPlay.png
@@ -213,11 +232,17 @@ share/xine/skins/xinetic/PlItemBtn.png
 share/xine/skins/xinetic/PlMoveDn.png
 share/xine/skins/xinetic/PlMoveUp.png
 share/xine/skins/xinetic/PlPlay.png
+share/xine/skins/xinetic/PlSlidHBg.png
 share/xine/skins/xinetic/SkArrowDown.png
+share/xine/skins/xinetic/SkArrowLeft.png
+share/xine/skins/xinetic/SkArrowRight.png
 share/xine/skins/xinetic/SkArrowUp.png
 share/xine/skins/xinetic/SkItemBtn.png
 share/xine/skins/xinetic/SkSlidBG.png
+share/xine/skins/xinetic/SkSlidHBg.png
+share/xine/skins/xinetic/SkSlidHPad.png
 share/xine/skins/xinetic/SkSlidPad.png
+share/xine/skins/xinetic/SlidHPad.png
 share/xine/skins/xinetic/SliderHBg.png
 share/xine/skins/xinetic/SliderHPad.png
 share/xine/skins/xinetic/SliderVBg.png
@@ -225,18 +250,39 @@ share/xine/skins/xinetic/SliderVPad.png
 share/xine/skins/xinetic/SmallArrowDown.png
 share/xine/skins/xinetic/SmallArrowUp.png
 share/xine/skins/xinetic/skinconfig
-@dirrm man/es/man1
-@dirrm man/es
-@dirrm man/fr/man1
-@dirrm man/fr
-@dirrm man/pl/man1
-@dirrm man/pl
+share/xine/visuals/default.avi
+@unexec rmdir %D/man/de/man1 2>/dev/null || true
+@unexec rmdir %D/man/de 2>/dev/null || true
+@unexec rmdir %D/man/es/man1 2>/dev/null || true
+@unexec rmdir %D/man/es 2>/dev/null || true
+@unexec rmdir %D/man/fr/man1 2>/dev/null || true
+@unexec rmdir %D/man/fr 2>/dev/null || true
+@unexec rmdir %D/man/pl/man1 2>/dev/null || true
+@unexec rmdir %D/man/pl 2>/dev/null || true
+@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/de 2>/dev/null || true
+@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/es 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl_PL/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl_PL 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
+@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sk 2>/dev/null || true
+@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/uk 2>/dev/null || true
+@unexec rmdir %D/share/locale 2>/dev/null || true
+@dirrm share/xine/visuals
 @dirrm share/xine/skins/CelomaChrome
 @dirrm share/xine/skins/cloudy
 @dirrm share/xine/skins/xinetic
 @dirrm share/xine/desktop
-@unexec rmdir %D/share/idl 2>/dev/null || true
-@unexec rmdir %D/share/xine/skins 2>/dev/null || true
+@dirrm share/xine/skins
 @unexec rmdir %D/share/xine 2>/dev/null || true
+@unexec rmdir %D/share/pixmaps 2>/dev/null || true
 @dirrm share/doc/xine-ui
 @dirrm share/doc/xitk