3 files changed, 45 insertions, 49 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index fbce75cde9c3..769727cbd653 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	1.1.18.1
-PORTREVISION=	2
+PORTVERSION=	1.1.19
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
 PKGNAMEPREFIX=	lib
@@ -29,14 +28,15 @@ LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac \
 		vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \
 		theora.0:${PORTSDIR}/multimedia/libtheora \
 		mad.2:${PORTSDIR}/audio/libmad \
-		dca.0:${PORTSDIR}/multimedia/libdca
+		dca.0:${PORTSDIR}/multimedia/libdca \
+		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
+		faad.2:${PORTSDIR}/audio/faad
 
 .if !defined(PACKAGE_BUILDING)
 LIB_DEPENDS+=	dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/multimedia/libdvdcss
 .endif
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
@@ -47,15 +47,21 @@ USE_GL=		gl glu
 USE_PERL5_BUILD=yes
 USE_SDL=	sdl
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${LOCALBASE}/include/ffmeg" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		THREAD_LIBS="${PTHREAD_LIBS}" \
 		EXTRA_X_LIBS="-lGL -lGLU -lXext -lX11 -lm"
-CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32 --enable-ipv6 \
+CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32 \
+		--enable-ipv6 \
 		--with-external-libmad \
-		--with-external-libdts --with-libflac --disable-v4l
+		--with-external-libdts \
+		--with-libflac \
+		--with-external-ffmpeg \
+		--with-external-libfaad \
+		--disable-v4l \
+		--without-alsa
 MAKE_JOBS_SAFE=	yes
 
 OPTIONS=	ARTS "Enable aRts support" off \
@@ -64,26 +70,32 @@ OPTIONS=	ARTS "Enable aRts support" off \
 		JACK "Enable JACK support" off \
 		GNOMEVFS2 "Enable GnomeVFS2 support" off \
 		PULSEAUDIO "Enable PulseAudio support" off \
-		FFMPEG "Enable external FFMpeg" on \
 		XVMC "Enable XvMC support" off \
 		SMB "Enable SMB protocol support" off \
 		AALIB "Enable aalib support" off \
 		IMAGEMAGICK "Enable ImageMagick support" off \
 		GTK2 "Enable gdkpixbuf support" off \
-		WAVPACK "Enable WavPack support" on \
-		FAAD "Enable external faad support" off
+		WAVPACK "Enable WavPack support" off
 
 MAN1=	xine-config.1 xine-list-1.1.1
 MAN5=	xine.5
 
 DOCSDIR=	${PREFIX}/share/doc/xine-lib
-PLIST_SUB=	PLUGINSDIR="lib/xine/plugins/1.28"
+PLIST_SUB=	PLUGINSDIR="lib/xine/plugins/1.29"
 
 # DVDCSS version hardcoded in src/input/input_dvd.c misc/cdda_server.c
 # and src/input/libdvdnav/dvd_input.c (dlopen'ed)
 DVDCSS_LIBVERSION=	3
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+CONFIGURE_ARGS+=	--disable-nls
+.endif
 
 .if defined(WITH_ARTS)
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
@@ -134,15 +146,6 @@ PLIST_SUB+=	WITH_PULSEAUDIO="@comment "
 CONFIGURE_ARGS+=	--without-pulseaudio
 .endif
 
-.if defined(WITH_FFMPEG)
-LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
-CONFIGURE_ARGS+=	--with-external-ffmpeg
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include/ffmeg" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/ffmpeg"
-.else
-CONFIGURE_ARGS+=	--with-external-ffmpeg=no
-.endif
-
 .if defined(WITH_XVMC)
 .if defined(WITH_NVIDIA_GL) || exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1)
 CONFIGURE_ARGS+=	--with-xvmc-lib=XvMCNVIDIA
@@ -198,13 +201,6 @@ PLIST_SUB+=	WITH_WAVPACK="@comment "
 CONFIGURE_ARGS+=	--without-wavpack
 .endif
 
-.if defined(WITH_FAAD)
-LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
-CONFIGURE_ARGS+=	--with-external-libfaad=yes
-.else
-CONFIGURE_ARGS+=	--with-external-libfaad=no
-.endif
-
 .if ${CONFIGURE_ARGS:M*--without-imagemagick*} == "" || ${CONFIGURE_ARGS:M*-disable-gdkpixbuf*} == ""
 PLIST_SUB+=	WITH_DMX_IMAGE=""
 .else
@@ -250,4 +246,4 @@ pre-configure:
 pre-build:
 	@${CP} -p ${LOCALBASE}/include/dts.h ${WRKSRC}/src/libdts/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index 12b4c7144409..a700a189de51 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/libxine/distinfo
@@ -1,3 +1,3 @@
-MD5 (xine-lib-1.1.18.1.tar.xz) = 2888985933a955db22aafc91207a7b9f
-SHA256 (xine-lib-1.1.18.1.tar.xz) = fa280f1d0f8592042c178257a312cf837e75580134e02205099e649e38fa6d9b
-SIZE (xine-lib-1.1.18.1.tar.xz) = 5778900
+MD5 (xine-lib-1.1.19.tar.xz) = d0969c067dc32f33c5ea431e5e2106ce
+SHA256 (xine-lib-1.1.19.tar.xz) = f834f646880bb44186018d12280ac27c8314447de9335b6fe390157b26df9cd9
+SIZE (xine-lib-1.1.19.tar.xz) = 5782580
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 2d3ee92ec6e9..929bf50b580c 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -179,18 +179,18 @@ share/aclocal/xine.m4
 %%DOCSDIR%%/hackersguide/library.png
 %%DOCSDIR%%/hackersguide/overlays.png
 %%DOCSDIR%%/hackersguide/post_frame.png
-share/locale/cs/LC_MESSAGES/libxine1.mo
-share/locale/de/LC_MESSAGES/libxine1.mo
-share/locale/en_US/LC_MESSAGES/libxine1.mo
-share/locale/eo/LC_MESSAGES/libxine1.mo
-share/locale/es/LC_MESSAGES/libxine1.mo
-share/locale/eu/LC_MESSAGES/libxine1.mo
-share/locale/fr/LC_MESSAGES/libxine1.mo
-share/locale/it/LC_MESSAGES/libxine1.mo
-share/locale/pl/LC_MESSAGES/libxine1.mo
-share/locale/pt_BR/LC_MESSAGES/libxine1.mo
-share/locale/sk/LC_MESSAGES/libxine1.mo
-share/locale/tr/LC_MESSAGES/libxine1.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/libxine1.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libxine1.mo
+%%NLS%%share/locale/en_US/LC_MESSAGES/libxine1.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/libxine1.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libxine1.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/libxine1.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libxine1.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libxine1.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/libxine1.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/libxine1.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/libxine1.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/libxine1.mo
 %%DATADIR%%/libxine1/fonts/cc-16.xinefont.gz
 %%DATADIR%%/libxine1/fonts/cc-20.xinefont.gz
 %%DATADIR%%/libxine1/fonts/cc-24.xinefont.gz
@@ -235,10 +235,10 @@ share/locale/tr/LC_MESSAGES/libxine1.mo
 @dirrm lib/xine
 @dirrm %%DOCSDIR%%/hackersguide
 @dirrm %%DOCSDIR%%
-@dirrmtry share/locale/pl_PL/LC_MESSAGES
-@dirrmtry share/locale/pl_PL
-@dirrmtry share/locale/en_US/LC_MESSAGES
-@dirrmtry share/locale/en_US
+%%NLS%%@dirrmtry share/locale/pl_PL/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pl_PL
+%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en_US
 @dirrm %%DATADIR%%/libxine1/fonts
 @dirrm %%DATADIR%%/libxine1
 @dirrm %%DATADIR%%