9 files changed, 68 insertions, 33 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index cb0c75430077..8c277b2632f6 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.7
 CATEGORIES=	graphics
 MASTER_SITES=	http://xine.sourceforge.net/files/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	lib
-DISTFILES=	${PORTNAME}-lib-${PORTVERSION}${EXTRACT_SUFX}
+DISTNAME=	${PORTNAME}-lib-${PORTVERSION}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 
@@ -71,7 +71,7 @@ PLIST_SUB+=	HAVE_OGG=""
 PLIST_SUB+=	HAVE_OGG="@comment "
 .endif
 
-# DVD input plugin for xine-0.9.5 is not available yet.
+# DVD input plugin for xine-0.9.7 is not available yet.
 .if 0
 .if defined(WITH_CSS)
 # http://members.home.nl/mphm.janssen/linuxvideo/linuxvideo.html
diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index cbea96d23a66..ee69c68bd513 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/libxine/distinfo
@@ -1 +1 @@
-MD5 (xine-lib-0.9.6.tar.gz) = 24029e1afc6f12fc1dec81a733f895f3
+MD5 (xine-lib-0.9.7.tar.gz) = 52f3cfdcf2066d36746fb98b735b0fbc
diff --git a/multimedia/libxine/files/patch-src:input:Makefile.am b/multimedia/libxine/files/patch-src:input:Makefile.am
new file mode 100644
index 000000000000..261585a13598
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:input:Makefile.am
@@ -0,0 +1,26 @@
+--- src/input/Makefile.am.orig	Sat Dec  8 09:36:21 2001
++++ src/input/Makefile.am	Tue Dec 11 10:14:50 2001
+@@ -17,10 +17,10 @@
+ if HAVE_CDROM_IOCTLS
+ in_dvd = xineplug_inp_dvd.la
+ in_vcd = xineplug_inp_vcd.la
+-in_cda = xineplug_inp_cda.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
+ 
+@@ -45,8 +45,8 @@
+ xineplug_inp_http_la_SOURCES = input_http.c
+ xineplug_inp_http_la_LDFLAGS = -avoid-version -module
+ 
+-xineplug_inp_cda_la_SOURCES = input_cda.c
+-xineplug_inp_cda_la_LDFLAGS = -avoid-version -module
++#xineplug_inp_cda_la_SOURCES = input_cda.c
++#xineplug_inp_cda_la_LDFLAGS = -avoid-version -module
+ 
+ include_HEADERS = input_plugin.h
+ noinst_HEADERS = dvd_udf.h read_cache.h
diff --git a/multimedia/libxine/files/patch-src:liblpcm:xine_decoder.c b/multimedia/libxine/files/patch-src:liblpcm:xine_decoder.c
deleted file mode 100644
index 7099b9ce9ce8..000000000000
--- a/multimedia/libxine/files/patch-src:liblpcm:xine_decoder.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/liblpcm/xine_decoder.c.orig	Fri Nov 30 20:46:02 2001
-+++ src/liblpcm/xine_decoder.c	Fri Nov 30 20:46:23 2001
-@@ -117,7 +117,7 @@
- 
-   stream_be = ( buf->type == BUF_AUDIO_LPCM_BE );
-   if (stream_be != this->cpu_be)
--    swab (audio_buffer->mem, sample_buffer, buf->size);
-+    swab (sample_buffer, audio_buffer->mem, buf->size);
-   else
-     memcpy (audio_buffer->mem, sample_buffer, buf->size);
- 
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index b47cb2196c51..3ca34f8a6430 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -1,4 +1,5 @@
 bin/xine-config
+include/xine/compat.h
 include/xine/attributes.h
 include/xine/audio_out.h
 include/xine/buffer.h
@@ -10,20 +11,23 @@ include/xine/events.h
 include/xine/input_plugin.h
 include/xine/lrb.h
 include/xine/metronom.h
+include/xine/osd.h
 include/xine/resample.h
+include/xine/scratch.h
 include/xine/spu_decoder.h
 include/xine/spu_decoder_api.h
 include/xine/video_out.h
 include/xine/video_out_x11.h
+include/xine/video_overlay.h
 include/xine/xine_internal.h
 include/xine/xineutils.h
 include/xine.h
 lib/libxine.la
 lib/libxine.so
-lib/libxine.so.5
+lib/libxine.so.0
 lib/libxineutils.la
 lib/libxineutils.so
-lib/libxineutils.so.5
+lib/libxineutils.so.0
 %%HAVE_ARTS%%lib/xine/plugins/xineplug_ao_out_arts.la
 %%HAVE_ARTS%%lib/xine/plugins/xineplug_ao_out_arts.so
 lib/xine/plugins/xineplug_ao_out_esd.la
@@ -48,6 +52,8 @@ lib/xine/plugins/xineplug_decode_mpeg2.la
 lib/xine/plugins/xineplug_decode_mpeg2.so
 lib/xine/plugins/xineplug_decode_spu.la
 lib/xine/plugins/xineplug_decode_spu.so
+lib/xine/plugins/xineplug_decode_sputext.la
+lib/xine/plugins/xineplug_decode_sputext.so
 %%HAVE_VORBIS%%lib/xine/plugins/xineplug_decode_vorbis.la
 %%HAVE_VORBIS%%lib/xine/plugins/xineplug_decode_vorbis.so
 lib/xine/plugins/xineplug_decode_w32dll.la
@@ -56,6 +62,8 @@ lib/xine/plugins/xineplug_dmx_asf.la
 lib/xine/plugins/xineplug_dmx_asf.so
 lib/xine/plugins/xineplug_dmx_avi.la
 lib/xine/plugins/xineplug_dmx_avi.so
+lib/xine/plugins/xineplug_dmx_cda.la
+lib/xine/plugins/xineplug_dmx_cda.so
 lib/xine/plugins/xineplug_dmx_mpeg.la
 lib/xine/plugins/xineplug_dmx_mpeg.so
 lib/xine/plugins/xineplug_dmx_mpeg_audio.la
@@ -139,6 +147,22 @@ 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/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/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.png
 @dirrm include/xine
 @dirrm lib/xine/plugins
@@ -146,5 +170,6 @@ share/xine/skins/xine_logo.png
 @dirrm share/doc/xine/xine-lib-API/html
 @dirrm share/doc/xine/xine-lib-API
 @dirrm share/doc/xine
+@dirrm share/xine/fonts
 @dirrm share/xine/skins
 @dirrm share/xine
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index c61a2dae2ffb..d98209c03711 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.7
 CATEGORIES=	graphics
 MASTER_SITES=	http://xine.sourceforge.net/files/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -15,14 +15,13 @@ DISTNAME=	${PORTNAME}-ui-${PORTVERSION}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 
-LIB_DEPENDS=	xine.5:${PORTSDIR}/graphics/libxine \
+LIB_DEPENDS=	xine.0:${PORTSDIR}/graphics/libxine \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		png.5:${PORTSDIR}/graphics/png \
 		intl.1:${PORTSDIR}/devel/gettext
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOMAKE=	yes
 USE_X_PREFIX=	yes
 USE_IMLIB=	yes
 USE_LIBTOOL=	yes
@@ -31,7 +30,7 @@ CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
 			CPPFLAGS="-I${LOCALBASE}/include" \
 			LIBS="-L${LOCALBASE}/lib"
 
-MANLANG=	"" fr pl
+MANLANG=	"" es fr pl
 MAN1=		aaxine.1 xine.1
 
 .include <bsd.port.pre.mk>
@@ -50,6 +49,7 @@ post-configure:
 
 post-install:
 	@${CP} ${PREFIX}/man/man1/aaxine.1 ${PREFIX}/man/fr/man1/aaxine.1
+	@${CP} ${PREFIX}/man/man1/aaxine.1 ${PREFIX}/man/es/man1/aaxine.1
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/xine/distinfo b/multimedia/xine/distinfo
index 2d098ff1b6ee..f0720834f07b 100644
--- a/multimedia/xine/distinfo
+++ b/multimedia/xine/distinfo
@@ -1 +1 @@
-MD5 (xine-ui-0.9.6.tar.gz) = 932298823ff7d0bbadbac9d312db8a89
+MD5 (xine-ui-0.9.7.tar.gz) = 60e79e052c9c694001e1ed1d480a6bca
diff --git a/multimedia/xine/files/patch-doc::man::Makefile.in b/multimedia/xine/files/patch-doc::man::Makefile.in
deleted file mode 100644
index f1933f4a70c1..000000000000
--- a/multimedia/xine/files/patch-doc::man::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/man/Makefile.in.orig	Fri Oct 19 22:07:35 2001
-+++ doc/man/Makefile.in	Fri Oct 19 22:07:46 2001
-@@ -106,7 +106,7 @@
- XINE_SKINDIR = @XINE_SKINDIR@
- XINE_SUB = @XINE_SUB@
- 
--SUBDIRS = fr es en pl
-+SUBDIRS = fr en pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/multimedia/xine/pkg-plist b/multimedia/xine/pkg-plist
index 125d497a4eac..9442f2fcd0e4 100644
--- a/multimedia/xine/pkg-plist
+++ b/multimedia/xine/pkg-plist
@@ -186,6 +186,12 @@ 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
 @dirrm share/xine/skins/lcd
 @dirrm share/xine/skins/pitt
 @dirrm share/xine/skins/xinetic