Date: Sat, 11 May 2013 11:14:10 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317863 - in head/multimedia: xawtv xvid Message-ID: <201305111114.r4BBEAE0052107@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sat May 11 11:14:10 2013 New Revision: 317863 URL: http://svnweb.freebsd.org/changeset/ports/317863 Log: Convert to new options framework Modified: head/multimedia/xawtv/Makefile head/multimedia/xvid/Makefile Modified: head/multimedia/xawtv/Makefile ============================================================================== --- head/multimedia/xawtv/Makefile Sat May 11 10:59:52 2013 (r317862) +++ head/multimedia/xawtv/Makefile Sat May 11 11:14:10 2013 (r317863) @@ -1,9 +1,5 @@ -# New ports collection makefile for: xawtv -# Date created: 03 March 2001 -# Whom: George Reid <greid@ukug.uk.freebsd.org> -# +# Created by: George Reid <greid@ukug.uk.freebsd.org> # $FreeBSD$ -# PORTNAME= xawtv PORTVERSION= 3.95 @@ -21,11 +17,11 @@ RUN_DEPENDS= iconv:${PORTSDIR}/converter LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg -OPTIONS= AA "Enable AA support" on \ - DV "Enable reading/writing raw dv files" off \ - QUICKTIME "Enable quicktime support" off \ - ZVBI "Enable libzvbi support" off \ - MMX "Enable mmx support (only for i386)" off +OPTIONS_DEFINE= AA DV QUICKTIME ZVBI +OPTIONS_DEFINE_i386= MMX +OPTIONS_DEFAULT= AA +AA_DESC= Enable AA support +ZVBI_DESC= Enable libzvbi support USE_MOTIF= yes GNU_CONFIGURE= yes @@ -49,16 +45,16 @@ MAN8= v4l-conf.8 .include <bsd.port.pre.mk> -.if defined(WITHOUT_AA) -CONFIGURE_ARGS+=--disable-aa -PLIST_SUB+= AA="@comment " -.else +.if ${PORT_OPTIONS:MAA} CONFIGURE_ARGS+=--enable-aa LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib PLIST_SUB+= AA="" +.else +CONFIGURE_ARGS+=--disable-aa +PLIST_SUB+= AA="@comment " .endif -.if defined(WITH_ZVBI) +.if ${PORT_OPTIONS:MZVBI} LIB_DEPENDS+= zvbi.13:${PORTSDIR}/devel/libzvbi CONFIGURE_ARGS+=--enable-zvbi PLIST_SUB+= ZVBI="" ZVBI5="" @@ -67,7 +63,7 @@ CONFIGURE_ARGS+=--enable-zvbi=no PLIST_SUB+= ZVBI="@comment " ZVBI5="@comment " .endif -.if defined(WITH_DV) +.if ${PORT_OPTIONS:MDV} LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv CONFIGURE_ARGS+=--enable-dv PLIST_SUB+= DV= @@ -76,16 +72,12 @@ CONFIGURE_ARGS+=--enable-dv=no PLIST_SUB+= DV="@comment " .endif -.if defined(WITH_MMX) -.if ${ARCH} == i386 +.if ${PORT_OPTIONS:MMMX} CONFIGURE_ARGS+=--enable-mmx CFLAGS+= -DMMX=1 -.else -BROKEN= MMX support only works on i386, and you are running ${ARCH} -.endif .endif -.if defined(WITH_QUICKTIME) +.if ${PORT_OPTIONS:MQUICKTIME} CONFIGURE_ARGS+=--enable-quicktime LIB_DEPENDS+= quicktime.0:${PORTSDIR}/multimedia/libquicktime PLIST_SUB+= QT= Modified: head/multimedia/xvid/Makefile ============================================================================== --- head/multimedia/xvid/Makefile Sat May 11 10:59:52 2013 (r317862) +++ head/multimedia/xvid/Makefile Sat May 11 11:14:10 2013 (r317863) @@ -1,9 +1,5 @@ -# New ports collection makefile for: xvid -# Date created: 04 April 2002 -# Whom: Michael Nottebrock <michaelnottebrock@gmx.net> et al -# +# Created by: Michael Nottebrock <michaelnottebrock@gmx.net> et al # $FreeBSD$ -# PORTNAME= xvid PORTVERSION= 1.3.2 @@ -29,7 +25,7 @@ PLIST_FILES= include/xvid.h \ WRKSRC= ${WRKDIR}/xvidcore/build/generic -OPTIONS= OPTIMIZED_CFLAGS "Use XviD's default optimizations" off +OPTIONS_DEFINE= OPTIMIZED_CFLAGS .include <bsd.port.pre.mk> @@ -40,7 +36,7 @@ CONFIGURE_TARGET= x86_64-portbld-freebsd BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm .endif -.if defined(WITH_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS= # let xvid's build system decide about those .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305111114.r4BBEAE0052107>