Index: head/multimedia/vdr-plugin-xineliboutput/Makefile
===================================================================
--- head/multimedia/vdr-plugin-xineliboutput/Makefile	(revision 561534)
+++ head/multimedia/vdr-plugin-xineliboutput/Makefile	(revision 561535)
@@ -1,67 +1,67 @@
 # Created by: Juergen Lock <nox@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	vdr-plugin-xineliboutput
 PORTVERSION=	1.0.90s20120511
-PORTREVISION=	29
+PORTREVISION=	30
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/xineliboutput/files/xineliboutput/vdr-xineliboutput-${PORTVERSION}/:release \
 		LOCAL/nox:snapshot
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:snapshot
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Video Disk Recorder - xineliboutput plugin/viewer
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libxine.so:multimedia/libxine \
 		libavutil.so:multimedia/ffmpeg \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libvdpau.so:multimedia/libvdpau
 
 PATCH_STRIP=	-p1
 USES=		compiler:c++11-lang gl pkgconfig tar:bzip2 xorg
 USE_XORG=	xrandr xrender
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--cc="${CC}" --cxx="${CXX}" --add-cflags=-I${VDRDIR}
 USE_GL=		gl glu glut
 WRKSRC=		${WRKDIR}/vdr-${PLUGIN}
-XINE_PLUGINSDIR=lib/xine/plugins/2.7
+XINE_PLUGINSDIR=lib/xine/plugins/2.9
 
 PORTDOCS=	README HISTORY
 PORTEXAMPLES=	xine
 
 PLIST_SUB=	XINE_PLUGINSDIR=${XINE_PLUGINSDIR}
 
 OPTIONS_DEFINE=	LIBBLURAY LIBEXTRACTOR EXAMPLES DOCS
 
 LIBEXTRACTOR_LIB_DEPENDS=	libextractor.so:textproc/libextractor
 LIBEXTRACTOR_CONFIGURE_ENABLE=	libextractor
 LIBBLURAY_LIB_DEPENDS=		libbluray.so:multimedia/libbluray
 LIBBLURAY_CONFIGURE_ENABLE=	libbluray
 
 .include	"${.CURDIR}/../vdr/Makefile.plugins"
 
 post-patch: post-patch-plugin
 # clang doesn't know -MG
 	${TOUCH} -t 200001010000 ${WRKSRC}/nosignal_720x576.c \
 		${WRKSRC}/black_720x576.c ${WRKSRC}/vdrlogo_720x576.c
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr
 
 post-install: post-install-pluginlocales
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}
 	${INSTALL_DATA} ${WRKSRC}/examples/allowed_hosts.conf \
 		${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/allowed_hosts.conf.sample
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/xine
 	${INSTALL_DATA} ${FILESDIR}/keymap ${STAGEDIR}${EXAMPLESDIR}/xine
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/multimedia/xine/Makefile
===================================================================
--- head/multimedia/xine/Makefile	(revision 561534)
+++ head/multimedia/xine/Makefile	(revision 561535)
@@ -1,69 +1,69 @@
 # $FreeBSD$
 
 PORTNAME=	xine
 PORTVERSION=	0.99.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-ui/${PORTVERSION}
 DISTNAME=	${PORTNAME}-ui-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 multimedia player
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libxine.so:multimedia/libxine
 
 USES=		desktop-file-utils gmake gnome iconv jpeg localbase pkgconfig \
 		readline shared-mime-info tar:xz xorg
 USE_XORG=	x11 xext xinerama xscrnsaver xt xtst xv xxf86vm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-vdr-keys \
 		--disable-nvtvsimple \
 		--disable-rpath
 MAKE_ENV=	V=1
 INSTALLS_ICONS=	yes
 
 LLD_UNSAFE=	yes	# lld disallows preemption of protected visibility syms
 
 DOCSDIR=	${PREFIX}/share/doc/xine-ui
 
 OPTIONS_DEFINE=		AALIB CACA CURL DOCS LIRC NLS XFT
 OPTIONS_DEFAULT=	CURL XFT
 OPTIONS_DEFINE_i386=	WIN32_CODECS
 OPTIONS_SUB=		yes
 
 AALIB_LIB_DEPENDS=	libaa.so:graphics/aalib
 AALIB_CONFIGURE_WITH=	aalib
 CACA_LIB_DEPENDS=	libcaca.so:graphics/libcaca
 CACA_RUN_DEPENDS=	${LOCALBASE}/${XINE_PLUGINSDIR}/xineplug_vo_out_caca.so:multimedia/libxine
 CACA_CONFIGURE_WITH=	caca
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	curl
 LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CONFIGURE_ENV=	LIRC_CFLAGS="-I${LOCALBASE}/include" \
 			LIRC_LIBS="-L${LOCALBASE}/libs -llirc_client"
 LIRC_CONFIGURE_ENABLE=	lirc
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 WIN32_CODECS_DESC=	Enable win32 codecs
 WIN32_CODECS_RUN_DEPENDS=\
 			win32-codecs>0:multimedia/win32-codecs
 XFT_USE=		XORG=xft
 XFT_CONFIGURE_ENABLE=	xft
 
-XINE_PLUGINSDIR=	lib/xine/plugins/2.7
+XINE_PLUGINSDIR=	lib/xine/plugins/2.9
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's/font = */font = *-*-bold-o-*-*-12-*-*-*-*-*-*-*/g' \
 		${WRKSRC}/src/xitk/skins/xinetic/skinconfig
 	@${REINPLACE_CMD} -e \
 		's|<string.h>|<strings.h>|' ${WRKSRC}/src/aaui/main.c
 	@${REINPLACE_CMD} -e \
 		's|<\(readline.h\)>|<readline/\1>| ; \
 		 s|<\(history.h\)>|<readline/\1>|' ${WRKSRC}/src/xitk/network.c
 
 .include <bsd.port.mk>