1 files changed, 55 insertions, 79 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index f8a91448a794..3d9a29ac051e 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.7.13
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -26,35 +26,16 @@ USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 WANT_SDL=	yes
 
-OPTIONS=	AACPLUS "Enable aac via libaacplus" off \
-		ALSA	"Enable alsa input/output device" off \
-		AMR_NB	"AMR Narrow Band audio encoder (opencore)" off \
-		AMR_WB	"AMR Wide Band audio decoder (opencore)" off \
-		CELT	"Enable CELT/Opus decoding via libcelt" off \
-		DIRAC	"Dirac codec via libdirac" off \
-		FAAC	"FAAC mp4/aac audio encoder" off \
-		FFSERVER "Build and install ffserver" on \
-		FREETYPE "Text on top of video frames (freetype2)" on \
-		FREI0R	"Frei0r wrapper filter" on \
-		GSM	"GSM audio codec" off \
-		LAME	"LAME MP3 encoder" off \
-		OPENCV  "OpenCV video filtering support" on \
-		OPENJPEG	"JPEG 2000 decoder" off \
-		OPTIMIZED_CFLAGS "Additional optimizations" off \
-		RTMP	"RTMP[E] support via librtmp" off \
-		SCHROEDINGER	"Dirac codec via libschroedinger" on \
-		SDL	"SDL support (build ffplay)" off \
-		SPEEX	"Speex audio decoder" off \
-		THEORA	"Theora encoder (implies OGG)" on \
-		VAAPI	"GPU acceleration support (libva)" off \
-		VDPAU	"Nvidia vdpau support" off \
-		VO_AACENC "AAC audio encoder (vo-aacenc)" off \
-		VO_AMRWBENC "AMR Wide Band audio encoder (vo-amrwbenc)" off \
-		VORBIS	"Vorbis encoder via libvorbis (implies OGG)" on \
-		VP8	"VP8 codec via libvpx" on \
-		X11GRAB	"Enable x11 grabbing" off \
-		X264	"H.264 encoder" on \
-		XVID	"Xvid encoder via xvidcore" on
+OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
+		FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \
+		OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \
+		VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID
+
+OPTIONS_DEFAULT=	FFSERVER FREETYPE FREI0R OPENCV SCHROEDINGER THEORA \
+		VORBIS VPX X264 XVID
+
+FFSERVER_DESC=	Build and install ffserver
+X11GRAB_DESC=	Enable x11 grabbing
 
 COMPAT_HEADERS=libavcodec/avcodec.h \
 	libavcodec/opt.h \
@@ -86,11 +67,11 @@ COMPAT_HEADERS=libavcodec/avcodec.h \
 .include <bsd.port.options.mk>
 
 # PORTDOCS
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 USE_PERL5_BUILD=	yes
 BUILD_DEPENDS+=		${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html
 MAN1+=		ffmpeg.1 ffprobe.1
-. if !defined(WITHOUT_FFSERVER)
+.if ${PORT_OPTIONS:MFFSERVER}
 MAN1+=		ffserver.1
 . endif
 .else
@@ -98,12 +79,12 @@ CONFIGURE_ARGS+=	--disable-doc
 .endif
 
 # rtmp
-.if defined(WITH_RTMP)
+.if ${PORT_OPTIONS:MRTMP}
 USE_OPENSSL=	yes
 .endif
 
 # x11grab
-.if defined(WITH_X11GRAB)
+.if ${PORT_OPTIONS:MX11GRAB}
 USE_XORG=	x11 xext xfixes
 CONFIGURE_ARGS+=	--enable-x11grab
 .endif
@@ -135,19 +116,19 @@ DOC_FILES=	CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
 DOC_DOCFILES=	APIchanges RELEASE_NOTES TODO *.txt *.html
 PORTDOCS=	*
 
-.if !defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--disable-debug
-.else
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--disable-stripping
+.else
+CONFIGURE_ARGS+=	--disable-debug
 .endif
 
-.if !defined(WITHOUT_FFSERVER)
+.if ${PORT_OPTIONS:MFFSERVER}
 USE_RC_SUBR=	ffserver
 .endif
 
 # sse hardware vector support
 .if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64")
-WITH_BUILTIN_VECTOR=	yes
+_BUILTIN_VECTOR=	yes
 .else
 CONFIGURE_ARGS+=	--disable-sse
 .endif
@@ -155,21 +136,21 @@ CONFIGURE_ARGS+=	--disable-sse
 # mmx support
 .if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == ""
 CONFIGURE_ARGS+=	--disable-mmx
-WITHOUT_BUILTIN_VECTOR=	yes
+_NO_BUILTIN_VECTOR=	yes
 .endif
 
 # builtin vector, requires mmx and sse
-.if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
+.if !defined(_NO_BUILTIN_VECTOR) && defined(_BUILTIN_VECTOR)
 CFLAGS+=	-msse
 .endif
 
 # optimizations
-.if defined(WITH_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
 .endif
 
 #aacplus
-.if defined(WITH_AACPLUS)
+.if ${PORT_OPTIONS:MAACPLUS}
 FFMPEG_NONFREE=	yes
 LIB_DEPENDS+=	aacplus.2:${PORTSDIR}/audio/libaacplus
 CONFIGURE_ARGS+=	--enable-libaacplus
@@ -178,7 +159,7 @@ CONFIGURE_ARGS+=	--disable-libaacplus
 .endif
 
 #alsa
-.if defined(WITH_ALSA)
+.if ${PORT_OPTIONS:MALSA}
 LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
 .else
 CONFIGURE_ARGS+=	--disable-indev=alsa \
@@ -186,7 +167,7 @@ CONFIGURE_ARGS+=	--disable-indev=alsa \
 .endif
 
 # Opencore AMR NB
-.if defined(WITH_AMR_NB)
+.if ${PORT_OPTIONS:MAMR_NB}
 FFMPEG_LICENSE_GPL3=	yes
 LIB_DEPENDS+=	opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr
 CONFIGURE_ARGS+=	--enable-libopencore-amrnb
@@ -195,7 +176,7 @@ CONFIGURE_ARGS+=	--disable-libopencore-amrnb
 .endif
 
 # Opencore AMR WB
-.if defined(WITH_AMR_WB)
+.if ${PORT_OPTIONS:MAMR_WB}
 FFMPEG_LICENSE_GPL3=	yes
 LIB_DEPENDS+=	opencore-amrwb.0:${PORTSDIR}/audio/opencore-amr
 CONFIGURE_ARGS+=	--enable-libopencore-amrwb
@@ -204,7 +185,7 @@ CONFIGURE_ARGS+=	--disable-libopencore-amrwb
 .endif
 
 # celt
-.if defined(WITH_CELT)
+.if ${PORT_OPTIONS:MCELT}
 LIB_DEPENDS+=	celt0.2:${PORTSDIR}/audio/celt
 CONFIGURE_ARGS+=	--enable-libcelt
 .else
@@ -212,7 +193,7 @@ CONFIGURE_ARGS+=	--disable-libcelt
 .endif
 
 # dirac
-.if defined(WITH_DIRAC)
+.if ${PORT_OPTIONS:MDIRAC}
 LIB_DEPENDS+=	dirac_encoder.1:${PORTSDIR}/multimedia/dirac
 CONFIGURE_ARGS+=	--enable-libdirac
 .else
@@ -220,7 +201,7 @@ CONFIGURE_ARGS+=	--disable-libdirac
 .endif
 
 # faac
-.if defined(WITH_FAAC)
+.if ${PORT_OPTIONS:MFAAC}
 FFMPEG_NONFREE=	yes
 LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
 CONFIGURE_ARGS+=	--enable-libfaac
@@ -229,7 +210,7 @@ CONFIGURE_ARGS+=	--disable-libfaac
 .endif
 
 # ffserver
-.if !defined(WITHOUT_FFSERVER)
+.if ${PORT_OPTIONS:MFFSERVER}
 PLIST_SUB+=	FFSERVER=""
 .else
 PLIST_SUB+=	FFSERVER="@comment "
@@ -237,7 +218,7 @@ CONFIGURE_ARGS+=	--disable-ffserver
 .endif
 
 # freetype
-.if !defined(WITHOUT_FREETYPE)
+.if ${PORT_OPTIONS:MFREETYPE}
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 CONFIGURE_ARGS+=	--enable-libfreetype
 .else
@@ -245,7 +226,7 @@ CONFIGURE_ARGS+=	--disable-libfreetype
 .endif
 
 # frei0r
-.if !defined(WITHOUT_FREI0R)
+.if ${PORT_OPTIONS:MFREI0R}
 BUILD_DEPENDS+=	${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
 CONFIGURE_ARGS+=	--enable-frei0r
 .else
@@ -253,7 +234,7 @@ CONFIGURE_ARGS+=	--disable-frei0r
 .endif
 
 # gsm
-.if defined(WITH_GSM)
+.if ${PORT_OPTIONS:MGSM}
 LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
 CONFIGURE_ARGS+=	--enable-libgsm
 .else
@@ -261,7 +242,7 @@ CONFIGURE_ARGS+=	--disable-libgsm
 .endif
 
 # mp3
-.if defined(WITH_LAME)
+.if ${PORT_OPTIONS:MLAME}
 LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
 CONFIGURE_ARGS+=	--enable-libmp3lame
 .else
@@ -269,7 +250,7 @@ CONFIGURE_ARGS+=	--disable-libmp3lame
 .endif
 
 # opencv
-.if !defined(WITHOUT_OPENCV)
+.if ${PORT_OPTIONS:MOPENCV}
 LIB_DEPENDS+=	opencv_imgproc.2:${PORTSDIR}/graphics/opencv-core
 CONFIGURE_ARGS+=	--enable-libopencv
 .else
@@ -277,7 +258,7 @@ CONFIGURE_ARGS+=	--disable-libopencv
 .endif
 
 # openjpeg
-.if defined(WITH_OPENJPEG)
+.if ${PORT_OPTIONS:MOPENJPEG}
 LIB_DEPENDS+=	openjpeg.2:${PORTSDIR}/graphics/openjpeg
 CONFIGURE_ARGS+=	--enable-libopenjpeg
 .else
@@ -285,7 +266,7 @@ CONFIGURE_ARGS+=	--disable-libopenjpeg
 .endif
 
 # rtmp
-.if defined(WITH_RTMP)
+.if ${PORT_OPTIONS:MRTMP}
 LIB_DEPENDS+=	rtmp.0:${PORTSDIR}/multimedia/rtmpdump
 CONFIGURE_ARGS+=	--enable-librtmp
 . if ${OPENSSLBASE} != "/usr"
@@ -297,7 +278,7 @@ CONFIGURE_ARGS+=	--disable-librtmp
 .endif
 
 # schroedinger
-.if !defined(WITHOUT_SCHROEDINGER)
+.if ${PORT_OPTIONS:MSCHROEDINGER}
 LIB_DEPENDS+=	schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger
 CONFIGURE_ARGS+=	--enable-libschroedinger
 .else
@@ -305,10 +286,10 @@ CONFIGURE_ARGS+=	--disable-libschroedinger
 .endif
 
 # sdl
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL+=	sdl
 PLIST_FILES+=	bin/ffplay
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 MAN1+=	ffplay.1
 .endif
 .else
@@ -316,7 +297,7 @@ CONFIGURE_ARGS+=	--disable-ffplay
 .endif
 
 # speex
-.if defined(WITH_SPEEX)
+.if ${PORT_OPTIONS:MSPEEX}
 LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
 CONFIGURE_ARGS+=	--enable-libspeex
 .else
@@ -324,7 +305,7 @@ CONFIGURE_ARGS+=	--disable-libspeex
 .endif
 
 # theora
-.if !defined(WITHOUT_THEORA)
+.if ${PORT_OPTIONS:MTHEORA}
 LIB_DEPENDS+=	theora.0:${PORTSDIR}/multimedia/libtheora
 CONFIGURE_ARGS+=	--enable-libtheora
 .else
@@ -332,7 +313,7 @@ CONFIGURE_ARGS+=	--disable-libtheora
 .endif
 
 # vaapi
-.if !defined(WITHOUT_VAAPI)
+.if ${PORT_OPTIONS:MVAAPI}
 FFMPEG_LICENSE_GPL3=	yes
 LIB_DEPENDS+=	va.1:${PORTSDIR}/multimedia/libva
 CONFIGURE_ARGS+=	--enable-vaapi
@@ -341,7 +322,7 @@ CONFIGURE_ARGS+=	--disable-vaapi
 .endif
 
 # vdpau
-.if !defined(WITHOUT_VDPAU)
+.if ${PORT_OPTIONS:MVDPAU}
 BUILD_DEPENDS+=	${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau
 CONFIGURE_ARGS+=	--enable-vdpau
 .else
@@ -349,7 +330,7 @@ CONFIGURE_ARGS+=	--disable-vdpau
 .endif
 
 # vo-aacenc
-.if defined(WITH_VO_AACENC)
+.if ${PORT_OPTIONS:MVO_AACENC}
 FFMPEG_LICENSE_GPL3=	yes
 LIB_DEPENDS+=	vo-aacenc.0:${PORTSDIR}/audio/vo-aacenc
 CONFIGURE_ARGS+=	--enable-libvo-aacenc
@@ -358,7 +339,7 @@ CONFIGURE_ARGS+=	--disable-libvo-aacenc
 .endif
 
 # vo-amrwbenc
-.if defined(WITH_VO_AMRWBENC)
+.if ${PORT_OPTIONS:MVO_AMRWBENC}
 FFMPEG_LICENSE_GPL3=	yes
 LIB_DEPENDS+=	vo-amrwbenc.0:${PORTSDIR}/audio/vo-amrwbenc
 CONFIGURE_ARGS+=	--enable-libvo-amrwbenc
@@ -367,7 +348,7 @@ CONFIGURE_ARGS+=	--disable-libvo-amrwbenc
 .endif
 
 # vorbis
-.if !defined(WITHOUT_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	vorbisenc.2:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=	--enable-libvorbis
 FFMPEG_CFLAGS+=		-I${LOCALBASE}/include/vorbis
@@ -376,7 +357,7 @@ CONFIGURE_ARGS+=	--disable-libvorbis
 .endif
 
 # vp8
-.if !defined(WITHOUT_VP8)
+.if ${PORT_OPTIONS:MVPX}
 LIB_DEPENDS+=	vpx.1:${PORTSDIR}/multimedia/libvpx
 CONFIGURE_ARGS+=	--enable-libvpx
 .else
@@ -384,7 +365,7 @@ CONFIGURE_ARGS+=	--disable-libvpx
 .endif
 
 # x264
-.if !defined(WITHOUT_X264)
+.if ${PORT_OPTIONS:MX264}
 LIB_DEPENDS+=	x264.123:${PORTSDIR}/multimedia/x264
 CONFIGURE_ARGS+=	--enable-libx264
 .else
@@ -392,7 +373,7 @@ CONFIGURE_ARGS+=	--disable-libx264
 .endif
 
 # xvid
-.if !defined(WITHOUT_XVID)
+.if ${PORT_OPTIONS:MXVID}
 LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
 CONFIGURE_ARGS+=	--enable-libxvid
 .else
@@ -420,11 +401,6 @@ LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPLv2.1
 . endif
 .endif
 
-pre-configure:
-.if defined(WITHOUT_OGG) && (!defined(WITHOUT_VORBIS) || !defined(WITHOUT_THEORA))
-	@${ECHO_MSG}	WITH_VORBIS or WITH_THEORA defined, libogg will be built
-.endif
-
 post-patch:
 # {C,LD}FLAGS safeness
 	@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
@@ -442,7 +418,7 @@ post-patch:
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \
 		${WRKSRC}/doc/texi2pod.pl
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MDSL}
 	@${REINPLACE_CMD} -E \
 		-e 's|sdl-config|${SDL_CONFIG}|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@@ -452,20 +428,20 @@ post-patch:
 .endif
 
 post-configure:
-.if defined(WITHOUT_THEORA)
+.if empty(PORT_OPTIONS:MTHEORA)
 	@${REINPLACE_CMD} -E \
 		-e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \
 		${WRKSRC}/config.mak
 .endif
 
 post-install:
-.if !defined(WITHOUT_FFSERVER)
+.if ${PORT_OPTIONS:MFFSERVER}
 	${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${PREFIX}/etc/ffserver.conf-dist
 	if [ ! -f ${PREFIX}/etc/ffserver.conf ]; then \
 		${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${PREFIX}/etc; \
 	fi
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for FILE in ${DOC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}