svn commit: r343721 - head/multimedia/tvheadend

[Bernhard Froehlich]

Author: decke
Date: Tue Feb 11 07:54:11 2014
New Revision: 343721
URL: http://svnweb.freebsd.org/changeset/ports/343721
QAT: https://qat.redports.org/buildarchive/r343721/

Log:
  - Attempt to fix the port after the ffmpeg1 removal. The commit r331762
  has only hidden the fact that tvheadend does not work with ffmpeg 2.x.
  Since ffmpeg1 has been removed already I can only rip out the ffmpeg
  option and dependency and disable libav for now.
  
  - While here move option variables before bsd.port.pre.mk to make them
  work.
  
  Reported by:	Torfinn Ingolfsen <tingox at gmail.com>
  Pointyhat to:	wg

Modified:
  head/multimedia/tvheadend/Makefile

Modified: head/multimedia/tvheadend/Makefile
==============================================================================
--- head/multimedia/tvheadend/Makefile	Tue Feb 11 07:43:45 2014	(r343720)
+++ head/multimedia/tvheadend/Makefile	Tue Feb 11 07:54:11 2014	(r343721)
@@ -3,7 +3,7 @@
 
 PORTNAME=	tvheadend
 PORTVERSION=	3.4.0.20130726.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	http://people.freebsd.org/~decke/distfiles/
 DISTNAME=	decke-${PORTNAME}-8a8c1a8
@@ -33,15 +33,20 @@ GROUPS=		${TVHGROUP}
 SUB_LIST+=	TVHUSER="${TVHUSER}" \
 		TVHGROUP="${TVHGROUP}"
 
-OPTIONS_DEFINE=	AVAHI DVBCSA FFMPEG
-OPTIONS_DEFAULT=DVBCSA FFMPEG
+OPTIONS_DEFINE=	AVAHI DVBCSA
+OPTIONS_DEFAULT=DVBCSA
 DVBCSA_DESC=	Replace internal ffdecsa with dvbcsa
 
 CONFIGURE_ENV+=	PLATFORM=freebsd
-CONFIGURE_ARGS+=--disable-dvbscan --disable-zlib
+CONFIGURE_ARGS+=--disable-dvbscan --disable-zlib --disable-libav
 CFLAGS+=	-I${LOCALBASE}/include -Wno-conversion -Wno-int-to-pointer-cast
 LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo -lssl -lz
 
+AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+
+DVBCSA_LIB_DEPENDS=	libdvbcsa.so:${PORTSDIR}/multimedia/libdvbcsa
+DVBCSA_CONFIGURE_ENABLE=	dvbcsa
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 900000
@@ -58,16 +63,6 @@ CFLAGS+=	-Wno-microsoft \
 		-Wno-tautological-constant-out-of-range-compare
 .endif
 
-AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
-
-DVBCSA_LIB_DEPENDS=	libdvbcsa.so:${PORTSDIR}/multimedia/libdvbcsa
-DVBCSA_CONFIGURE_ON=	--enable-dvbcsa
-DVBCSA_CONFIGURE_OFF=	--disable-dvbcsa
-
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-FFMPEG_CONFIGURE_ON=	--enable-libav
-FFMPEG_CONFIGURE_OFF=	--disable-libav
-
 post-patch:
 	@${REINPLACE_CMD} 's|-g||' \
 		${WRKSRC}/Makefile