Move graphics/libdvdnav, graphics/libxine and graphics/xine to the multimedia category.

svn path=/head/; revision=76390
2024-12-23 04:23:08 +00:00 · 2003-02-24 12:54:56 +00:00 · 2003-02-24 12:54:56 +00:00 · 24fce7b8c8 · 2021-03-31 03:12:20 +00:00
commit 24fce7b8c8
parent f6e436fb7f
43 changed files with 10 additions and 1268 deletions
--- a/3
+++ b/3
@ -177,3 +177,6 @@ net/openldap|net/openldap12|2003-02-23|port renamed
 net/openldap2|net/openldap20|2003-02-23|port renamed
 www/caudium|www/caudium10|2003-02-23|port renamed
 mail/imp||2003-02-24|security vulnerability
+graphics/libdvdnav|multimedia/libdvdnav|2003-02-24|new category
+graphics/libxine|multimedia/libxine|2003-02-24|new category
+graphics/xine|multimedia/xine|2003-02-24|new category
--- a/graphics/Makefile
+++ b/graphics/Makefile
@ -183,7 +183,6 @@
    SUBDIR += libaux
    SUBDIR += libdjvu++
    SUBDIR += libdvbpsi
-    SUBDIR += libdvdnav
    SUBDIR += libexif
    SUBDIR += libexif-gtk
    SUBDIR += libfame
@ -205,7 +204,6 @@
    SUBDIR += libv3d
    SUBDIR += libwmf
    SUBDIR += libwpcg
-    SUBDIR += libxine
    SUBDIR += linplasma
    SUBDIR += linux-bmrt
    SUBDIR += linux-imlib
@ -411,7 +409,6 @@
    SUBDIR += xfpovray
    SUBDIR += xfractint
    SUBDIR += xgrasp
-    SUBDIR += xine
    SUBDIR += xine_d4d_plugin
    SUBDIR += xine_d5d_plugin
    SUBDIR += xli
--- a/graphics/libdvdnav/Makefile
+++ b/graphics/libdvdnav/Makefile
@ -1,31 +0,0 @@
-# New ports collection makefile for:    libdvdnav
-# Date created:         21 May 2002
-# Whom:                 MANTANI Nobutaka <nobutaka@nobutaka.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libdvdnav
-PORTVERSION=	0.1.3
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	dvd
-
-MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	The library for the xine-dvdnav plugin
-
-LIB_DEPENDS=	dvdread.2:${PORTSDIR}/multimedia/libdvdread
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		THREAD_LIBS="${PTHREAD_LIBS}"
-INSTALLS_SHLIB=	yes
-
-post-patch:
-	@${PERL} -pi -e \
-		's|THREAD_LIBS=.*$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \
-		 s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \
-		 s|-L/usr/local/lib|-L${LOCALBASE}/lib|g ; \
-		 s|-I/usr/local/include|-I${LOCALBASE}/include|g' ${WRKSRC}/configure
-
-.include <bsd.port.mk>
--- a/graphics/libdvdnav/distinfo
+++ b/graphics/libdvdnav/distinfo
@ -1 +0,0 @@
-MD5 (libdvdnav-0.1.3.tar.gz) = fcb07398ea7199189d82a1cdff86ee4b
--- a/graphics/libdvdnav/files/patch-example:Makefile.in
+++ b/graphics/libdvdnav/files/patch-example:Makefile.in
@ -1,11 +0,0 @@
--- examples/Makefile.in.orig	Tue May 21 01:52:35 2002
-+++ examples/Makefile.in	Tue May 21 01:52:51 2002
-@@ -116,7 +116,7 @@
- LIBS = @LIBS@
- menus_OBJECTS =  menus.$(OBJEXT)
- menus_DEPENDENCIES =  $(top_builddir)/src/libdvdnav.la
-menus_LDFLAGS = 
-+menus_LDFLAGS = $(THREAD_LIBS)
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--- a/graphics/libdvdnav/files/patch-ltmain.sh
+++ b/graphics/libdvdnav/files/patch-ltmain.sh
@ -1,32 +0,0 @@
--- ltmain.sh.orig	Mon Aug  5 16:46:18 2002
-+++ ltmain.sh	Mon Aug  5 22:32:19 2002
-@@ -961,6 +961,7 @@
- 	;;
- 
-       -avoid-version)
-+	build_old_libs=no
- 	avoid_version=yes
- 	continue
- 	;;
-@@ -2507,7 +2508,7 @@
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-+	      deplibs="$deplibs"
- 	    fi
- 	    ;;
- 	  esac
-@@ -4329,10 +4330,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
--- a/graphics/libdvdnav/pkg-descr
+++ b/graphics/libdvdnav/pkg-descr
@ -1,6 +0,0 @@
-The library for the xine-dvdnav plugin.
-
-WWW: http://dvd.sourceforge.net/xine-dvdnav.shtml
-
--
-MANTANI Nobutaka <nobutaka@nobutaka.com>
--- a/graphics/libdvdnav/pkg-plist
+++ b/graphics/libdvdnav/pkg-plist
@ -1,13 +0,0 @@
-bin/dvdnav-config
-include/dvdnav/decoder.h
-include/dvdnav/dvd_types.h
-include/dvdnav/dvdnav.h
-include/dvdnav/dvdnav_events.h
-include/dvdnav/dvdnav_internal.h
-include/dvdnav/read_cache.h
-include/dvdnav/vm.h
-include/dvdnav/vmcmd.h
-lib/libdvdnav.so.1
-lib/libdvdnav.so
-share/aclocal/dvdnav.m4
-@dirrm include/dvdnav
--- a/graphics/libxine/Makefile
+++ b/graphics/libxine/Makefile
@ -1,112 +0,0 @@
-# New ports collection makefile for:    libxine
-# Date created:         14 Oct 2000
-# Whom:                 alex
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xine
-PORTVERSION=	1.0.b4
-PORTREVISION=	1
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-PKGNAMEPREFIX=	lib
-DISTNAME=	${PORTNAME}-lib-1-beta4
-
-MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	Libraries for xine multimedia player
-
-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 \
-		intl.4:${PORTSDIR}/devel/gettext \
-		iconv.3:${PORTSDIR}/converters/libiconv \
-		SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		vorbis.2:${PORTSDIR}/audio/libvorbis \
-		ogg.4:${PORTSDIR}/audio/libogg \
-		mng.1:${PORTSDIR}/graphics/libmng
-
-USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-USE_GNOMENG=	yes
-WANT_GNOME=	yes
-USE_GNOME=	gnomehack
-USE_GMAKE=	yes
-USE_MESA=	yes
-USE_REINPLACE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" \
-		THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		THREAD_LIBS="${PTHREAD_LIBS}" \
-		X_EXTRA_LIBS="-lGL -lGLU -lXext -lX11 -lm"
-CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32 \
-		--program-transform-name="" --disable-vidix
-INSTALLS_SHLIB=	yes
-
-MAN1=		xine-config.1
-
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} >= 4
-PLIST_SUB=	HAVE_LIBXV=""
-.else
-PLIST_SUB=	HAVE_LIBXV="@comment "
-.endif
-
-.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 ${HAVE_GNOME:Mesound} != "" || defined(WITH_ESOUND)
-USE_GNOME+=	esound
-PLIST_SUB+=	HAVE_ESOUND=""
-.else
-PLIST_SUB+=	HAVE_ESOUND="@comment "
-.endif
-
-.if exists(${X11BASE}/libdata/pkgconfig/gnome-vfs-2.0.pc)
-LIB_DEPENDS+=	gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2
-PLIST_SUB+=	HAVE_GNOMEVFS2=""
-.else
-PLIST_SUB+=	HAVE_GNOMEVFS2="@comment "
-.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)
-	@${ECHO_MSG} "===> WITH_ARTS   (arts support)"
-.else
-	@${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 \
-		'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 ; \
-		 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
-.endif
-
-.include <bsd.port.post.mk>
--- a/graphics/libxine/distinfo
+++ b/graphics/libxine/distinfo
@ -1 +0,0 @@
-MD5 (xine-lib-1-beta4.tar.gz) = 6524afaefe7577f0d0f4058eb3b97702
--- a/graphics/libxine/files/patch-configure
+++ b/graphics/libxine/files/patch-configure
@ -1,11 +0,0 @@
--- configure.orig	Sun Feb  9 23:46:52 2003
-+++ configure	Sun Feb  9 23:47:08 2003
-@@ -17057,7 +17057,7 @@
-   fi
-   ALSA_CFLAGS="$ALSA_CFLAGS"
- 
-  ac_save_CPPFLAGS="$CPPLAGS"
-+  ac_save_CPPFLAGS="$CPPFLAGS"
-   CPPFLAGS="$CPPFLAGS $ALSA_CFLAGS"
-   if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
-   echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5
--- a/graphics/libxine/files/patch-ltmain.sh
+++ b/graphics/libxine/files/patch-ltmain.sh
@ -1,23 +0,0 @@
--- ltmain.sh.orig	Wed Jan 16 09:00:24 2002
-+++ ltmain.sh	Fri Jan 25 05:08:03 2002
-@@ -958,6 +958,7 @@
- 	;;
- 
-       -avoid-version)
-+	build_old_libs=no
- 	avoid_version=yes
- 	continue
- 	;;
-@@ -4247,10 +4248,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
--- a/graphics/libxine/files/patch-src:dxr3:video_out_dxr3.c
+++ b/graphics/libxine/files/patch-src:dxr3:video_out_dxr3.c
@ -1,11 +0,0 @@
--- 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;
--- a/graphics/libxine/files/patch-src:input:input_dvd.c
+++ b/graphics/libxine/files/patch-src:input:input_dvd.c
@ -1,20 +0,0 @@
--- 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        */
--- a/graphics/libxine/files/patch-src:input:input_vcd.c
+++ b/graphics/libxine/files/patch-src:input:input_vcd.c
@ -1,89 +0,0 @@
--- 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
--- a/graphics/libxine/files/patch-src:input:libdvdnav:vm.c
+++ b/graphics/libxine/files/patch-src:input:libdvdnav:vm.c
@ -1,11 +0,0 @@
--- 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 */
- 
--- a/graphics/libxine/files/patch-src:input:libreal:real.c
+++ b/graphics/libxine/files/patch-src:input:libreal:real.c
@ -1,10 +0,0 @@
--- 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"
--- a/graphics/libxine/files/patch-src:input:libreal:sdpplin.c
+++ b/graphics/libxine/files/patch-src:input:libreal:sdpplin.c
@ -1,12 +0,0 @@
--- 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"
--- a/graphics/libxine/files/patch-src:input:librtsp:rtsp.c
+++ b/graphics/libxine/files/patch-src:input:librtsp:rtsp.c
@ -1,10 +0,0 @@
--- 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>
--- a/graphics/libxine/files/patch-src:input:librtsp:rtsp_session.c
+++ b/graphics/libxine/files/patch-src:input:librtsp:rtsp_session.c
@ -1,10 +0,0 @@
--- 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>
--- a/graphics/libxine/files/patch-src:liba52:Makefile.in
+++ b/graphics/libxine/files/patch-src:liba52:Makefile.in
@ -1,40 +0,0 @@
--- 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@
--- a/graphics/libxine/files/patch-src:liba52:xine_decoder.c
+++ b/graphics/libxine/files/patch-src:liba52:xine_decoder.c
@ -1,13 +0,0 @@
--- 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 "xineutils.h"
- 
--- a/graphics/libxine/files/patch-src:libffmpeg:Makefile.in
+++ b/graphics/libxine/files/patch-src:libffmpeg:Makefile.in
@ -1,32 +0,0 @@
--- 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)
- 
--- a/graphics/libxine/files/patch-src:libffmpeg:xine_decoder.c
+++ b/graphics/libxine/files/patch-src:libffmpeg:xine_decoder.c
@ -1,13 +0,0 @@
--- 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"
-+#include <ffmpeg/avcodec.h>
-+#include <ffmpeg/dsputil.h>
- 
- /*
- #define LOG
--- a/graphics/libxine/files/patch-src:libmad:Makefile.in
+++ b/graphics/libxine/files/patch-src:libmad:Makefile.in
@ -1,47 +0,0 @@
--- 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 =
--- a/graphics/libxine/files/patch-src:libmad:xine_decoder.c
+++ b/graphics/libxine/files/patch-src:libmad:xine_decoder.c
@ -1,16 +0,0 @@
--- 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"
- 
- /*
--- a/graphics/libxine/files/patch-src:libspudec:spu.c
+++ b/graphics/libxine/files/patch-src:libspudec:spu.c
@ -1,10 +0,0 @@
--- src/libspudec/spu.c.orig	Sat Oct 27 19:15:22 2001
-+++ src/libspudec/spu.c	Sat Oct 27 19:15:31 2001
-@@ -63,7 +63,6 @@
- #include <unistd.h>
- #include <string.h>
- #include <inttypes.h>
-#include <malloc.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- 
--- a/graphics/libxine/files/patch-src:video_out:video_out_sdl.c
+++ b/graphics/libxine/files/patch-src:video_out:video_out_sdl.c
@ -1,11 +0,0 @@
--- 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>
- #include <math.h>
-#include <SDL/SDL.h>
-+#include <SDL11/SDL.h>
- 
- #include "xine.h"
- #include "xine_internal.h"
--- a/graphics/libxine/pkg-descr
+++ b/graphics/libxine/pkg-descr
@ -1,8 +0,0 @@
-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://www.xinehq.de/
--- a/graphics/libxine/pkg-plist
+++ b/graphics/libxine/pkg-plist
@ -1,198 +0,0 @@
-bin/xine-config
-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/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/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_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
-lib/libxine.so
-lib/libxine.so.3
-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
-%%HAVE_GNOMEVFS2%%lib/xine/plugins/1.0.0/xineplug_inp_gnome_vfs.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
-libdata/pkgconfig/libxine.pc
-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/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
-@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
-@dirrm share/doc/xine/faq
-@dirrm share/doc/xine
-@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
--- a/graphics/xine/Makefile
+++ b/graphics/xine/Makefile
@ -1,77 +0,0 @@
-# New ports collection makefile for:    xine
-# Date created:         14 Oct 2000
-# Whom:                 alex
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xine
-PORTVERSION=	0.9.18
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-ui-${PORTVERSION}
-
-MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	An X11 multimedia player
-
-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_GMAKE=	yes
-USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		THREAD_LIBS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--program-transform-name=""
-
-MANLANG=	"" de es fr pl
-MAN1=		aaxine.1 xine-bugreport.1 xine-check.1 xine-remote.1 xine.1
-
-.include <bsd.port.pre.mk>
-
-.if (${ARCH} == "i386")
-.if !defined(WITHOUT_WIN32_CODECS)
-RUN_DEPENDS=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
-
-CODEC_PORT=	${PORTSDIR}/multimedia/win32-codecs
-CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
-.endif
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-		'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' ${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
-.endif
-	@${RM} ${WRKSRC}/src/xitk/xine-remote.c
-
-post-install:
-.for l in es fr
-	@${CP} ${PREFIX}/man/man1/aaxine.1 ${PREFIX}/man/${l}/man1/aaxine.1
-.endfor
-.for l in es fr pl
-	@${CP} ${PREFIX}/man/man1/xine-bugreport.1 ${PREFIX}/man/${l}/man1/xine-bugreport.1
-.endfor
-.for l in es fr pl
-	@${CP} ${PREFIX}/man/man1/xine-check.1 ${PREFIX}/man/${l}/man1/xine-check.1
-.endfor
-.for l in es fr
-	@${CP} ${PREFIX}/man/man1/xine-remote.1 ${PREFIX}/man/${l}/man1/xine-remote.1
-.endfor
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
--- a/graphics/xine/distinfo
+++ b/graphics/xine/distinfo
@ -1 +0,0 @@
-MD5 (xine-ui-0.9.18.tar.gz) = 7aaabeb4cac95f66000741f970a17eca
--- a/graphics/xine/files/patch-ltmain.sh
+++ b/graphics/xine/files/patch-ltmain.sh
@ -1,49 +0,0 @@
--- ltmain.sh.orig	Wed Jan 16 09:00:24 2002
-+++ ltmain.sh	Tue Jan 29 10:33:29 2002
-@@ -958,6 +958,7 @@
- 	;;
- 
-       -avoid-version)
-+	build_old_libs=no
- 	avoid_version=yes
- 	continue
- 	;;
-@@ -1045,14 +1046,14 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
-+	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
-	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -2459,7 +2460,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
-+	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
- 	  *)
-@@ -4247,10 +4248,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
--- a/graphics/xine/files/patch-readline:chardefs.h
+++ b/graphics/xine/files/patch-readline:chardefs.h
@ -1,12 +0,0 @@
--- readline/chardefs.h.orig	Sun May 19 23:29:25 2002
-+++ readline/chardefs.h	Sun May 19 23:29:37 2002
-@@ -32,9 +32,6 @@
- #    endif
- #    include <string.h>
- #  endif /* HAVE_STRING_H */
-#  if defined (HAVE_STRINGS_H)
-#    include <strings.h>
-#  endif /* HAVE_STRINGS_H */
- #else
- #  include <string.h>
- #endif /* !HAVE_CONFIG_H */
--- a/graphics/xine/files/patch-src:xitk:network.c
+++ b/graphics/xine/files/patch-src:xitk:network.c
@ -1,12 +0,0 @@
--- src/xitk/network.c.orig	Fri Jun 28 23:03:50 2002
-+++ src/xitk/network.c	Sat Jun 29 00:55:00 2002
-@@ -24,9 +24,6 @@
-  */
- /* required for getsubopt(); the __sun test avoids compilation problems on */
- /* solaris */
-#ifndef __sun
-#define _XOPEN_SOURCE 500
-#endif
- /* required for strncasecmp() */
- #define _BSD_SOURCE 1
- /* required to enable POSIX variant of getpwuid_r on solaris */
--- a/graphics/xine/files/patch-src:xitk:session.c
+++ b/graphics/xine/files/patch-src:xitk:session.c
@ -1,10 +0,0 @@
--- 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"
--- a/graphics/xine/pkg-descr
+++ b/graphics/xine/pkg-descr
@ -1,6 +0,0 @@
-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.
-
-WWW: http://www.xinehq.de/
--- a/graphics/xine/pkg-message
+++ b/graphics/xine/pkg-message
@ -1,4 +0,0 @@
-Make sure you've enough shared memory, the xine FAQ
-advises to have the following sysctl settings:
-kern.ipc.shmmax=67108864
-kern.ipc.shmall=32768
--- a/graphics/xine/pkg-plist
+++ b/graphics/xine/pkg-plist
@ -1,288 +0,0 @@
-bin/aaxine
-bin/fbxine
-bin/xine
-bin/xine-bugreport
-bin/xine-check
-bin/xine-remote
-share/doc/xine-ui/FAQ_de
-share/doc/xine-ui/FAQ_en
-share/doc/xine-ui/FAQ_es
-share/doc/xine-ui/FAQ_fr
-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.divx4
-share/doc/xine-ui/README.dxr3
-share/doc/xine-ui/README.dxr3_pl
-share/doc/xine-ui/README.freebsd
-share/doc/xine-ui/README.irix
-share/doc/xine-ui/README.mrl
-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
-share/doc/xine-ui/README_fi
-share/doc/xine-ui/README_fr
-share/doc/xine-ui/README_it
-share/doc/xine-ui/README_pl
-share/doc/xine-ui/README_uk
-share/doc/xine-ui/bug_report_form
-share/doc/xitk/README
-share/locale/cs/LC_MESSAGES/xine-ui.mo
-share/locale/cs/LC_MESSAGES/xitk.mo
-share/locale/de/LC_MESSAGES/xine-ui.mo
-share/locale/de/LC_MESSAGES/xitk.mo
-share/locale/es/LC_MESSAGES/xine-ui.mo
-share/locale/es/LC_MESSAGES/xitk.mo
-share/locale/fr/LC_MESSAGES/xine-ui.mo
-share/locale/fr/LC_MESSAGES/xitk.mo
-share/locale/pl_PL/LC_MESSAGES/xine-ui.mo
-share/locale/pl_PL/LC_MESSAGES/xitk.mo
-share/locale/pt_BR/LC_MESSAGES/xine-ui.mo
-share/locale/pt_BR/LC_MESSAGES/xitk.mo
-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/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
-share/xine/skins/CelomaChrome/CtlDismiss.png
-share/xine/skins/CelomaChrome/CtlItemBtn.png
-share/xine/skins/CelomaChrome/FsBtn.png
-share/xine/skins/CelomaChrome/HideBtn.png
-share/xine/skins/CelomaChrome/LettersBig.png
-share/xine/skins/CelomaChrome/LettersBlue.png
-share/xine/skins/CelomaChrome/LettersDigit.png
-share/xine/skins/CelomaChrome/LettersMiddle.png
-share/xine/skins/CelomaChrome/LettersMini.png
-share/xine/skins/CelomaChrome/MainAutoButton.png
-share/xine/skins/CelomaChrome/MainBg.png
-share/xine/skins/CelomaChrome/MainButton.png
-share/xine/skins/CelomaChrome/MainDummy.png
-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
-share/xine/skins/CelomaChrome/MainPower.png
-share/xine/skins/CelomaChrome/MainPrev.png
-share/xine/skins/CelomaChrome/MainStop.png
-share/xine/skins/CelomaChrome/MainVolumeBg.png
-share/xine/skins/CelomaChrome/MainVolumePad.png
-share/xine/skins/CelomaChrome/MrlBg.png
-share/xine/skins/CelomaChrome/MrlBtn.png
-share/xine/skins/CelomaChrome/MrlDismiss.png
-share/xine/skins/CelomaChrome/MrlSelect.png
-share/xine/skins/CelomaChrome/Onglet.png
-share/xine/skins/CelomaChrome/OngletSmall.png
-share/xine/skins/CelomaChrome/PlBg.png
-share/xine/skins/CelomaChrome/PlBtn.png
-share/xine/skins/CelomaChrome/PlDelete.png
-share/xine/skins/CelomaChrome/PlDeleteAll.png
-share/xine/skins/CelomaChrome/PlDismiss.png
-share/xine/skins/CelomaChrome/PlInputTxt.png
-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
-share/xine/skins/CelomaChrome/SliderVPad.png
-share/xine/skins/CelomaChrome/SnapBtn.png
-share/xine/skins/CelomaChrome/skinconfig
-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
-share/xine/skins/cloudy/MainBg.png
-share/xine/skins/cloudy/MainClose.png
-share/xine/skins/cloudy/MainCtlBtn.png
-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
-share/xine/skins/cloudy/MainPlay.png
-share/xine/skins/cloudy/MainPlayFast.png
-share/xine/skins/cloudy/MainPlaySlow.png
-share/xine/skins/cloudy/MainPower.png
-share/xine/skins/cloudy/MainPrev.png
-share/xine/skins/cloudy/MainSetup.png
-share/xine/skins/cloudy/MainSliderBg.png
-share/xine/skins/cloudy/MainSliderPad.png
-share/xine/skins/cloudy/MainSmallArrowDown.png
-share/xine/skins/cloudy/MainSmallArrowUp.png
-share/xine/skins/cloudy/MainSnapshot.png
-share/xine/skins/cloudy/MainStop.png
-share/xine/skins/cloudy/MainVolumeBg.png
-share/xine/skins/cloudy/MainVolumePad.png
-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
-share/xine/skins/cloudy/PlDeleteAll.png
-share/xine/skins/cloudy/PlInputText.png
-share/xine/skins/cloudy/PlItem.png
-share/xine/skins/cloudy/PlMoveDown.png
-share/xine/skins/cloudy/PlMoveUp.png
-share/xine/skins/cloudy/PlPlay.png
-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/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
-share/xine/skins/xinetic/CtlDismiss.png
-share/xine/skins/xinetic/CtlDummy.png
-share/xine/skins/xinetic/CtlReset.png
-share/xine/skins/xinetic/CtlSave.png
-share/xine/skins/xinetic/Letters.png
-share/xine/skins/xinetic/MainAutoButton.png
-share/xine/skins/xinetic/MainBg.png
-share/xine/skins/xinetic/MainCam.png
-share/xine/skins/xinetic/MainClose.png
-share/xine/skins/xinetic/MainDown.png
-share/xine/skins/xinetic/MainEject.png
-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
-share/xine/skins/xinetic/MainPower.png
-share/xine/skins/xinetic/MainPrev.png
-share/xine/skins/xinetic/MainSetup.png
-share/xine/skins/xinetic/MainStop.png
-share/xine/skins/xinetic/MainUp.png
-share/xine/skins/xinetic/MainVolumeBg.png
-share/xine/skins/xinetic/MainVolumePad.png
-share/xine/skins/xinetic/MrlBg.png
-share/xine/skins/xinetic/MrlBtn.png
-share/xine/skins/xinetic/MrlDismiss.png
-share/xine/skins/xinetic/MrlSelect.png
-share/xine/skins/xinetic/Onglet.png
-share/xine/skins/xinetic/PlBg.png
-share/xine/skins/xinetic/PlBtn.png
-share/xine/skins/xinetic/PlDelete.png
-share/xine/skins/xinetic/PlDeleteAll.png
-share/xine/skins/xinetic/PlDismiss.png
-share/xine/skins/xinetic/PlInputTxt.png
-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
-share/xine/skins/xinetic/SliderVPad.png
-share/xine/skins/xinetic/SmallArrowDown.png
-share/xine/skins/xinetic/SmallArrowUp.png
-share/xine/skins/xinetic/skinconfig
-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
-@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
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@ -19,10 +19,12 @@
    SUBDIR += libdivxencore
    SUBDIR += libdv
    SUBDIR += libdvdcss
+    SUBDIR += libdvdnav
    SUBDIR += libdvdplay
    SUBDIR += libdvdread
    SUBDIR += libmovtar
    SUBDIR += libmpeg2
+    SUBDIR += libxine
    SUBDIR += linux-divx4linux
    SUBDIR += linux-divx4linux4
    SUBDIR += linux-divxplayer
@ -48,6 +50,7 @@
    SUBDIR += vcdpad
    SUBDIR += vcdtools
    SUBDIR += win32-codecs
+    SUBDIR += xine
    SUBDIR += xmms
    SUBDIR += xmms-avi
    SUBDIR += xmps-opendivx-plugin
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	libdvdnav
 PORTVERSION=	0.1.3
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dvd

--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@ -8,7 +8,7 @@
 PORTNAME=	xine
 PORTVERSION=	1.0.b4
 PORTREVISION=	1
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	lib
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	xine
 PORTVERSION=	0.9.18
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-ui-${PORTVERSION}
@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-ui-${PORTVERSION}
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	An X11 multimedia player

-LIB_DEPENDS=	xine.3:${PORTSDIR}/graphics/libxine \
+LIB_DEPENDS=	xine.3:${PORTSDIR}/multimedia/libxine \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		png.5:${PORTSDIR}/graphics/png \
 		intl.4:${PORTSDIR}/devel/gettext
				`@ -1 +0,0 @@`
				`MD5 (libdvdnav-0.1.3.tar.gz) = fcb07398ea7199189d82a1cdff86ee4b`
				`@ -1 +0,0 @@`
				`MD5 (xine-lib-1-beta4.tar.gz) = 6524afaefe7577f0d0f4058eb3b97702`
				`@ -1 +0,0 @@`
				`MD5 (xine-ui-0.9.18.tar.gz) = 7aaabeb4cac95f66000741f970a17eca`