From owner-svn-ports-head@FreeBSD.ORG Sat May 11 12:58:42 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2A6DF82F; Sat, 11 May 2013 12:58:42 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0C9767A4; Sat, 11 May 2013 12:58:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4BCwf4m087800; Sat, 11 May 2013 12:58:41 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4BCwfLs087795; Sat, 11 May 2013 12:58:41 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201305111258.r4BCwfLs087795@svn.freebsd.org> From: Baptiste Daroussin Date: Sat, 11 May 2013 12:58:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317872 - in head/multimedia: cuse4bsd-kmod fxtv libbluray libvpx pwcbsd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 May 2013 12:58:42 -0000 Author: bapt Date: Sat May 11 12:58:40 2013 New Revision: 317872 URL: http://svnweb.freebsd.org/changeset/ports/317872 Log: Convert to new options framework While here remove test for unsupported versions Modified: head/multimedia/cuse4bsd-kmod/Makefile head/multimedia/fxtv/Makefile head/multimedia/libbluray/Makefile head/multimedia/libvpx/Makefile head/multimedia/pwcbsd/Makefile Modified: head/multimedia/cuse4bsd-kmod/Makefile ============================================================================== --- head/multimedia/cuse4bsd-kmod/Makefile Sat May 11 12:48:38 2013 (r317871) +++ head/multimedia/cuse4bsd-kmod/Makefile Sat May 11 12:58:40 2013 (r317872) @@ -26,17 +26,13 @@ PLIST_SUB= KMODNAME="${KMODNAME}" \ INCLUDEDIR="${INCLUDEDIR}" \ MANDIR="${MANDIR}" -OPTIONS= DEBUG "Build with debugging support" Off +OPTIONS_DEFINE= DEBUG -.include - -.if ${OSVERSION} < 800000 -IGNORE= requires FreeBSD 8.0-RELEASE or later -.endif +.include MAKE_ARGS+=" PTHREAD_LIBS=${PTHREAD_LIBS}" -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} MAKE_ARGS+=" HAVE_DEBUG=YES" .endif @@ -45,4 +41,4 @@ do-install: ${INSTALL_KLD} ${WRKSRC}/${KMODNAME}.ko ${KMODDIR} kldxref ${KMODDIR} -.include +.include Modified: head/multimedia/fxtv/Makefile ============================================================================== --- head/multimedia/fxtv/Makefile Sat May 11 12:48:38 2013 (r317871) +++ head/multimedia/fxtv/Makefile Sat May 11 12:58:40 2013 (r317872) @@ -1,9 +1,5 @@ -# New ports collection makefile for: fxtv -# Date created: Thu Nov 4 19:54:04 EST 1999 -# Whom: Randall Hopper -# +# Created by: Randall Hopper # $FreeBSD$ -# PORTNAME= fxtv PORTVERSION= 1.03 @@ -27,13 +23,14 @@ MAN1= fxtv.1 ONLY_FOR_ARCHS= alpha i386 ia64 amd64 -OPTIONS= EXTRA "Extra programs required to record/playback/save" off +OPTIONS_DEFINE= EXTRA +EXTRA_DESC= Extra programs required to record/playback/save -.include +.include # This program does not actually require the programs below unless you # use audio/video recording and/or playback and save to a non-raw format. -.if defined(WITH_EXTRA) +.if ${PORT_OPTIONS:MEXTRA} RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox \ mpg123:${PORTSDIR}/audio/mpg123 \ mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode \ @@ -43,4 +40,4 @@ RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox pre-install: ${CP} ${WRKSRC}/fxtv.1 ${WRKSRC}/fxtv.man -.include +.include Modified: head/multimedia/libbluray/Makefile ============================================================================== --- head/multimedia/libbluray/Makefile Sat May 11 12:48:38 2013 (r317871) +++ head/multimedia/libbluray/Makefile Sat May 11 12:58:40 2013 (r317872) @@ -1,9 +1,5 @@ -# New ports collection makefile for: libbluray -# Date created: 19 February 2011 -# Whom: kamikaze@bsdforen.de -# +# Created by: kamikaze@bsdforen.de # $FreeBSD$ -# PORTNAME= libbluray PORTVERSION= 0.2.2 @@ -32,11 +28,12 @@ MAKE_JOBS_SAFE= yes MAKE_ARGS+= pkgconfigdir="${PREFIX}/libdata/pkgconfig" \ CFLAGS=${CFLAGS:Q} -OPTIONS= JAVA "Enable Blu-Ray Java support" off +OPTIONS_DEFINE= JAVA +JAVA_DESC+ Enable Blu-Ray Java support .include -.if defined(WITH_JAVA) +.if ${PORT_OPTIONS:MJAVA} BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant CATEGORIES+= java USE_JAVA= 1.6+ Modified: head/multimedia/libvpx/Makefile ============================================================================== --- head/multimedia/libvpx/Makefile Sat May 11 12:48:38 2013 (r317871) +++ head/multimedia/libvpx/Makefile Sat May 11 12:58:40 2013 (r317872) @@ -1,9 +1,5 @@ -# New ports collection makefile for: libvpx -# Date created: 2010-05-21 -# Whom: Ashish SHUKLA -# +# Created by: Ashish SHUKLA # $FreeBSD$ -# PORTNAME= libvpx PORTVERSION= 1.1.0 @@ -28,11 +24,11 @@ MAKE_JOBS_SAFE=yes LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE -OPTIONS= DEBUG "Enable debugging" OFF \ - POSTPROC "Enable postprocessing" ON \ - RUNTIME "Enable runtime CPU detection" ON \ - THREADS "Enable multithread" ON \ - SHARED "Enable shared-library support" ON +OPTIONS_DEFINE= DEBUG POSTPROC RUNTIME THREADS SHARED +OPTIONS_DEFAULT= POSTPROC RUNTIME THREADS SHARED +POSTPROC_DESC= Enable postprocessing +RUNTIME_DESC= Enable runtime CPU detection +SHARED_DESC= Enable shared-library support ALL_TARGET= CONFIGURE_ARGS+= --enable-pic --disable-install-srcs --enable-vp8 --disable-install-docs @@ -40,31 +36,29 @@ MAKE_ARGS+= DIST_DIR=${PREFIX} verbose=y .include -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .endif -.if defined(WITH_POSTPROC) +.if ${PORT_OPTIONS:MPOSTPROC} CONFIGURE_ARGS+= --enable-postproc .endif -.if defined(WITH_RUNTIME) +.if ${PORT_OPTIONS:MRUNTIME} CONFIGURE_ARGS+= --enable-runtime-cpu-detect .endif -.if defined(WITHOUT_THREADS) +.if ! ${PORT_OPTIONS:MTHREADS} CONFIGURE_ARGS+= --disable-multithread .endif -.if defined(WITH_SHARED) +.if ${PORT_OPTIONS:MSHARED} CONFIGURE_ARGS+= --enable-shared PLIST_SUB+= SHARED="" .else PLIST_SUB+= SHARED="@comment " .endif -.include - .if ${ARCH} == "amd64" CONFIGURE_ARGS+= --target=x86_64-linux-gcc .elif ${ARCH} == "i386" @@ -84,12 +78,7 @@ post-patch: ${WRKSRC}/build/make/configure.sh @${GREP} -Rl '^#!/bin/bash' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \ -e 's,#!/bin/bash,#!/usr/bin/env bash,g' -.if ${OSVERSION} < 700000 - @${GREP} -Rl 'LIBVPX_SO.*extralibs' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \ - -e 's/\(LIBVPX_SO.*extralibs[[:space:]]*+=[[:space:]]*\)/\1-lc /g' -.else @${GREP} -Rl -- '-l\?pthread' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -E \ -e 's/-l?pthread/${PTHREAD_LIBS}/g' -.endif -.include +.include Modified: head/multimedia/pwcbsd/Makefile ============================================================================== --- head/multimedia/pwcbsd/Makefile Sat May 11 12:48:38 2013 (r317871) +++ head/multimedia/pwcbsd/Makefile Sat May 11 12:58:40 2013 (r317872) @@ -1,9 +1,5 @@ -# New ports collection makefile for: pwcbsd -# Date created: 17 Feb 2006 -# Whom: Raaf -# +# Created by: Raaf # $FreeBSD$ -# PORTNAME= pwcbsd PORTVERSION= 1.4.1 @@ -24,33 +20,29 @@ MAN4= pwc.4 WRKSRC= ${WRKDIR}/${PORTNAME} NO_PACKAGE= should be recompiled for a particular FreeBSD kernel -OPTIONS= PROGRAMS "Build the programs" on \ - MMAP "Enable mmap support (MAY CRASH YOUR SYSTEM)" off +OPTIONS_DEFINE= PROGRAMS MMAP +OPTIONS_DEFAULT= PROGRAMS +PROGRAMS_DESC= Build the programs +MMAP_DESC= Enable mmap support (MAY CRASH YOUR SYSTEM) -.include +.include -.if (${OSVERSION} > 800063) && (${OSVERSION} < 800094) -BROKEN= Please update to a newer version of FreeBSD 8 -.endif - -.if ${OSVERSION} >= 800094 EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.kld \ ${FILESDIR}/extra-patch-pwc-ctrl.c \ ${FILESDIR}/extra-patch-pwc-v4l.c \ ${FILESDIR}/extra-patch-pwc.c \ ${FILESDIR}/extra-patch-pwc.h -.endif .if !exists(${SRC_BASE}/sys/Makefile) IGNORE= requires kernel source files .endif -.if defined(WITH_MMAP) +.if ${PORT_OPTIONS:MMMAP} ALL_TARGET= mmap .else ALL_TARGET= all .endif -.if !defined(WITHOUT_PROGRAMS) +.if ${PORT_OPTIONS:MPROGRAMS} ALL_TARGET+= pwcview PROGRAMS= pwcview LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg @@ -62,16 +54,16 @@ PLIST_SUB+= PROGRAMS="@comment " .endif post-patch: -.if !defined(WITHOUT_PROGRAMS) +.if ${PORT_OPTIONS:MPROGRAMS} @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile .endif post-install: ${INSTALL_MAN} ${MAN4:S|^|${WRKSRC}/|} ${PREFIX}/man/man4 -.if !defined(WITHOUT_PROGRAMS) +.if ${PORT_OPTIONS:MPROGRAMS} ${INSTALL_PROGRAM} ${PROGRAMS:S|^|${WRKSRC}/|} ${PREFIX}/bin ${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/|} ${PREFIX}/man/man1 .endif @${CAT} ${PKGMESSAGE} -.include +.include