Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/vdr-plugin-xineliboutput/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile	8 Dec 2011 19:41:25 -0000	1.7
+++ Makefile	9 Dec 2011 20:39:11 -0000
@@ -6,25 +6,24 @@
 #
 
 PORTNAME=	vdr-plugin-xineliboutput
-PORTVERSION=	1.0.90s20110308.2305
-PORTREVISION=	11
+PORTVERSION=	1.0.90s20111129.1002
 CATEGORIES=	multimedia
 MASTER_SITES=	SF:release \
 		LOCAL:snapshot
 MASTER_SITE_SUBDIR=	xineliboutput/files/xineliboutput/vdr-xineliboutput-${PORTVERSION}/:release \
 		nox/:snapshot
-DISTNAME=	${PORTNAME:S/-plugin-/-plugin-/}_${DISTVERSIONPREFIX}${DISTVERSION:S/s/+cvs/:S/$/.orig/}${DISTVERSIONSUFFIX}
+DISTNAME=	${PORTNAME}_${DISTVERSIONPREFIX}${DISTVERSION:S/s/+cvs/}${DISTVERSIONSUFFIX}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:snapshot
 
 MAINTAINER=	nox@FreeBSD.org
 COMMENT=	Video Disk Recorder - xineliboutput plugin/viewer
 
-LIB_DEPENDS+=	extractor.3:${PORTSDIR}/textproc/libextractor \
-		xine.1:${PORTSDIR}/multimedia/libxine \
+LIB_DEPENDS+=	xine.1:${PORTSDIR}/multimedia/libxine \
 		avutil.1:${PORTSDIR}/multimedia/ffmpeg \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		vdpau.1:${PORTSDIR}/multimedia/libvdpau
 
+USE_BZIP2=	yes
 PATCH_STRIP=	-p1
 USE_GNOME+=	pkgconfig
 USE_XORG+=	xrandr xrender
@@ -36,10 +35,28 @@ WRKSRC=		${WRKDIR}/vdr-${PLUGIN}
 
 .include	"${.CURDIR}/../vdr/Makefile.plugins"
 
-MAKE_ARGS+=	CONFIGURE_OPTS="${CONFIGURE_OPTS}"
+# libbluray in ports is too old
+# OPTIONS=	LIBBLURAY	"Enable libbluray support"		on
+OPTIONS=	LIBEXTRACTOR	"Enable libextractor support"		off
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_LIBEXTRACTOR)
+LIB_DEPENDS+=	extractor.3:${PORTSDIR}/textproc/libextractor
+CONFIGURE_OPTS+=	--enable-libextractor
+.else
+CONFIGURE_OPTS+=	--disable-libextractor
+.endif
+
+.if defined(WITH_LIBBLURAY)
+CONFIGURE_OPTS+=	--enable-libbluray
+LIB_DEPENDS+=	bluray.0:${PORTSDIR}/multimedia/libbluray
+.else
+CONFIGURE_OPTS+=	--disable-libbluray
+.endif
+
+MAKE_ARGS+=	CONFIGURE_OPTS="${CONFIGURE_OPTS}"
+
 post-patch: post-patch-plugin
 # clang doesn't know -MG
 	${TOUCH} -t 200001010000 ${WRKSRC}/nosignal_720x576.c \
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/multimedia/vdr-plugin-xineliboutput/distinfo,v
retrieving revision 1.1
diff -u -p -r1.1 distinfo
--- distinfo	26 Mar 2011 19:21:47 -0000	1.1
+++ distinfo	8 Dec 2011 20:24:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (vdr/vdr-plugin-xineliboutput_1.0.90+cvs20110308.2305.orig.tar.gz) = 9d5ae04c96cdebcd0f6eebc32242bfbfcbc5fa0d1c7aaf12cbebb5226a3a6a61
-SIZE (vdr/vdr-plugin-xineliboutput_1.0.90+cvs20110308.2305.orig.tar.gz) = 440599
+SHA256 (vdr/vdr-plugin-xineliboutput_1.0.90+cvs20111129.1002.tar.bz2) = ce659755ef526f333b565dde70b261c22ad604d59303d5a0c54666101b014d4c
+SIZE (vdr/vdr-plugin-xineliboutput_1.0.90+cvs20111129.1002.tar.bz2) = 371781
Index: files/patch-configure
===================================================================
RCS file: /home/pcvs/ports/multimedia/vdr-plugin-xineliboutput/files/patch-configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure
--- files/patch-configure	26 Mar 2011 19:21:47 -0000	1.1
+++ files/patch-configure	8 Dec 2011 21:36:34 -0000
@@ -1,24 +1,26 @@
 --- a/configure
 +++ a/configure
-@@ -348,10 +348,13 @@ test_pkgconfig
+@@ -350,11 +350,14 @@ test_pkgconfig
  [ $debug = yes ] && \
    test_library   X11  do_error     "none.h"         "-lnolib"
  
--test_library     VDR   libextractor "extractor.h"      "-lextractor" "EXTRACTOR_getKeywords(0,0)"
--test_library     VDR   libcap       "sys/capability.h" "-lcap"       "cap_get_proc()"
--test_library     XINE  libxine      "xine.h"           "-lxine"      "xine_init(0)"
--test_library     DLFCN dlfcn        "dlfcn.h"          "-ldl"        "dlopen(0,0)"
-+#test_library     VDR   libextractor "extractor.h"      "-lextractor" "EXTRACTOR_getKeywords(0,0)"
+-test_library     VDR   libextractor "extractor.h"        "-lextractor" "EXTRACTOR_getKeywords(0,0)"
+-test_library     VDR   libcap       "sys/capability.h"   "-lcap"       "cap_get_proc()"
+-test_library     VDR   libbluray    "libbluray/bluray.h" "-lbluray"    "bd_get_disc_info(0)"
+-test_library     XINE  libxine      "xine.h"             "-lxine"      "xine_init(0)"
+-test_library     DLFCN dlfcn        "dlfcn.h"            "-ldl"        "dlopen(0,0)"
++#test_library     VDR   libextractor "extractor.h"        "-lextractor" "EXTRACTOR_getKeywords(0,0)"
 +test_library     VDR   libextractor "extractor.h"      "-lextractor" "EXTRACTOR_getKeywords(0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
-+#test_library     VDR   libcap       "sys/capability.h" "-lcap"       "cap_get_proc()"
-+#test_library     XINE  libxine      "xine.h"           "-lxine"      "xine_init(0)"
-+test_library     XINE  libxine      "xine.h"           "-lxine"      "xine_init(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
-+#test_library     DLFCN dlfcn        "dlfcn.h"          "-ldl"        "dlopen(0,0)"
-+test_library     DLFCN dlfcn        "dlfcn.h"          ""        "dlopen(0,0)"
++#test_library     VDR   libcap       "sys/capability.h"   "-lcap"       "cap_get_proc()"
++#test_library     VDR   libbluray    "libbluray/bluray.h" "-lbluray"    "bd_get_disc_info(0)"
++test_library     VDR   libbluray    "libbluray/bluray.h" "-lbluray"    "bd_get_disc_info(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
++#test_library     XINE  libxine      "xine.h"             "-lxine"      "xine_init(0)"
++test_library     XINE  libxine      "xine.h"             "-lxine"      "xine_init(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
++test_library     DLFCN dlfcn        "dlfcn.h"            ""        "dlopen(0,0)"
  
  if enabled libxine; then
  
-@@ -363,19 +366,30 @@ if enabled libxine; then
+@@ -366,24 +369,40 @@ if enabled libxine; then
    fi
    log " $XINEPLUGINDIR"
  
@@ -57,6 +59,17 @@
 +    test_library X11  opengl       "GL/glx.h"                  "-lGL -lGLU -lglut"  "glXQueryVersion(0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
 +#    test_library none vdpau        "vdpau/vdpau_x11.h"         "-lvdpau"     "vdp_device_create_x11(0,0,0,0)"
 +    test_library none vdpau        "vdpau/vdpau_x11.h"         "-lvdpau"     "vdp_device_create_x11(0,0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
++#    test_library X11  dbus-glib-1  \
++#      "dbus/dbus-glib.h" \
++#      "-ldbus-glib-1 -lgobject-2.0 -lglib-2.0" \
++#      "dbus_g_bus_get(0,0)" \
++#      "-I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include"
      test_library X11  dbus-glib-1  \
        "dbus/dbus-glib.h" \
        "-ldbus-glib-1 -lgobject-2.0 -lglib-2.0" \
+       "dbus_g_bus_get(0,0)" \
+-      "-I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include"
++      "-I/usr/include/dbus-1.0 -I${LOCALBASE}/include/dbus-1.0 -I/usr/include/glib-2.0 -I${LOCALBASE}/include/glib-2.0 -L${LOCALBASE}/lib"
+   fi
+ fi
+ 
Index: files/patch-tools-sys_cap.h
===================================================================
RCS file: /home/pcvs/ports/multimedia/vdr-plugin-xineliboutput/files/patch-tools-sys_cap.h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-tools-sys_cap.h
--- files/patch-tools-sys_cap.h	26 Mar 2011 19:21:47 -0000	1.1
+++ files/patch-tools-sys_cap.h	29 Jul 2011 12:15:35 -0000
@@ -4,8 +4,9 @@
  #ifndef _XINELIBOUTPUT_SYS_CAP_H_
  #define _XINELIBOUTPUT_SYS_CAP_H_
  
+-#include "../features.h"
 +#ifdef HAVE_LIBCAP
- #include "features.h"
++# include "../features.h"
 +#endif
  
  #include <unistd.h>