4 files changed, 79 insertions, 18 deletions

diff --git a/multimedia/tvheadend/Makefile b/multimedia/tvheadend/Makefile
index 54a39d7860b3..7fea9dd95aef 100644
--- a/multimedia/tvheadend/Makefile
+++ b/multimedia/tvheadend/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tvheadend
 PORTVERSION=	3.4.0.20130726.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://people.freebsd.org/~decke/distfiles/
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} dvb-scan-tables-20130714.tar.gz
@@ -16,8 +16,8 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
 
-LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
-		curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
+		libcurl.so:${PORTSDIR}/ftp/curl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	decke
@@ -38,13 +38,14 @@ GROUPS=		${TVHGROUP}
 SUB_LIST+=	TVHUSER="${TVHUSER}" \
 		TVHGROUP="${TVHGROUP}"
 
-OPTIONS_DEFINE=	AVAHI
+OPTIONS_DEFINE=	AVAHI DVBCSA FFMPEG
+OPTIONS_DEFAULT=DVBCSA FFMPEG
+DVBCSA_DESC=	Replace internal ffdecsa with dvbcsa
 
-CONFIGURE_ENV+=	PLATFORM=freebsd \
-		CFLAGS+="-I${LOCALBASE}/include" \
-		LDFLAGS+="-L${LOCALBASE}/lib -lexecinfo -lssl -lz"
-CONFIGURE_ARGS+=	--disable-dvbscan --disable-zlib
-CFLAGS+=	-Wno-conversion -Wno-int-to-pointer-cast
+CONFIGURE_ENV+=	PLATFORM=freebsd
+CONFIGURE_ARGS+=--disable-dvbscan --disable-zlib
+CFLAGS+=	-I${LOCALBASE}/include -Wno-conversion -Wno-int-to-pointer-cast
+LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo -lssl -lz
 
 .include <bsd.port.pre.mk>
 
@@ -63,7 +64,21 @@ CFLAGS+=	-Wno-microsoft \
 .endif
 
 .if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=	avahi-client:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+.endif
+
+.if ${PORT_OPTIONS:MDVBCSA}
+LIB_DEPENDS+=	libdvbcsa.so:${PORTSDIR}/multimedia/libdvbcsa
+CONFIGURE_ARGS+=	--enable-dvbcsa
+.else
+CONFIGURE_ARGS+=	--disable-dvbcsa
+.endif
+
+.if ${PORT_OPTIONS:MFFMPEG}
+LIB_DEPENDS+=	libavcodec1.so:${PORTSDIR}/multimedia/ffmpeg1
+CONFIGURE_ARGS+=	--enable-libav
+.else
+CONFIGURE_ARGS+=	--disable-libav
 .endif
 
 post-patch:
diff --git a/multimedia/tvheadend/files/patch-configure b/multimedia/tvheadend/files/patch-configure
new file mode 100644
index 000000000000..dc88c0c2bcfe
--- /dev/null
+++ b/multimedia/tvheadend/files/patch-configure
@@ -0,0 +1,36 @@
+--- configure.bak	2013-07-26 18:17:22.000000000 +0200
++++ configure	2013-08-11 16:45:03.066835565 +0200
+@@ -122,27 +122,27 @@
+ if enabled_or_auto libav; then
+   has_libav=true
+ 
+-  if $has_libav && ! check_pkg libavcodec "<=55.0.0"; then
++  if $has_libav && ! check_pkg libavcodec1 "<=55.0.0"; then
+     has_libav=false
+   fi
+ 
+-  if $has_libav && ! check_pkg libavcodec ">=52.96.0"; then
++  if $has_libav && ! check_pkg libavcodec1 ">=52.96.0"; then
+     has_libav=false
+   fi
+ 
+-  if $has_libav && ! check_pkg libavutil ">=50.43.0"; then
++  if $has_libav && ! check_pkg libavutil1 ">=50.43.0"; then
+     has_libav=false
+   fi
+ 
+-  if $has_libav && ! check_pkg libavformat "<=55.0.0"; then
++  if $has_libav && ! check_pkg libavformat1 "<=55.0.0"; then
+     has_libav=false
+   fi
+ 
+-  if $has_libav && ! check_pkg libavformat ">=53.10.0"; then
++  if $has_libav && ! check_pkg libavformat1 ">=53.10.0"; then
+     has_libav=false
+   fi
+ 
+-  if $has_libav && ! check_pkg libswscale ">=0.13.0"; then
++  if $has_libav && ! check_pkg libswscale1 ">=0.13.0"; then
+     has_libav=false
+   fi
+ 
diff --git a/multimedia/tvheadend/files/patch-src__trap.c b/multimedia/tvheadend/files/patch-src__trap.c
new file mode 100644
index 000000000000..6031c49d7a79
--- /dev/null
+++ b/multimedia/tvheadend/files/patch-src__trap.c
@@ -0,0 +1,18 @@
+--- src/trap.c.orig	2013-07-26 18:17:22.000000000 +0200
++++ src/trap.c	2013-09-01 16:07:04.247691694 +0200
+@@ -33,6 +33,7 @@
+ #include <limits.h>
+ #if ENABLE_EXECINFO
+ #include <execinfo.h>
++#include <dlfcn.h>
+ #endif
+ #include <stdio.h>
+ #include <stdarg.h>
+@@ -47,6 +48,7 @@
+ 
+ #define MAXFRAMES 100
+ 
++extern char **environ;
+ static char line1[200];
+ static char tmpbuf[1024];
+ static char libs[1024];
diff --git a/multimedia/tvheadend/pkg-message b/multimedia/tvheadend/pkg-message
index 51ca93379572..690fd5c24bce 100644
--- a/multimedia/tvheadend/pkg-message
+++ b/multimedia/tvheadend/pkg-message
@@ -1,13 +1,5 @@
 ============================================================================
 
-PLEASE BEWARE that tvheadend is quite new on FreeBSD and has
-not received a lot of testing yet. It might break for you and
-kill kenny or spill your beer so don't expect too much.
-
-Known issues:
-- no libav support
-- no libdvbcsa support
-
 For the first start in your /etc/rc.conf:
   tvheadend_enable="YES"
   tvheadend_flags="-C"