From owner-svn-ports-all@FreeBSD.ORG Sun Oct 7 07:46:05 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 81FC51065670; Sun, 7 Oct 2012 07:46:05 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6A7CC8FC1A; Sun, 7 Oct 2012 07:46:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q977k5CF051060; Sun, 7 Oct 2012 07:46:05 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q977k5rk051052; Sun, 7 Oct 2012 07:46:05 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201210070746.q977k5rk051052@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 7 Oct 2012 07:46:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r305437 - in head: ftp/bareftp multimedia/mplayerxp x11-wm/waimea x11-wm/waimea-devel X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Oct 2012 07:46:05 -0000 Author: bapt Date: Sun Oct 7 07:46:04 2012 New Revision: 305437 URL: http://svn.freebsd.org/changeset/ports/305437 Log: Convert to new options framework PR: ports/172414 Submitted by: Chris Petrik (maintainer) Modified: head/ftp/bareftp/Makefile head/multimedia/mplayerxp/Makefile head/x11-wm/waimea-devel/Makefile head/x11-wm/waimea/Makefile Modified: head/ftp/bareftp/Makefile ============================================================================== --- head/ftp/bareftp/Makefile Sun Oct 7 07:45:08 2012 (r305436) +++ head/ftp/bareftp/Makefile Sun Oct 7 07:46:04 2012 (r305437) @@ -25,16 +25,17 @@ MAKE_JOBS_SAFE= yes MAN1= bareftp.1 -OPTIONS= KEYRING "Support for Gnome Keyring" on +OPTIONS_DEFINE= GNOMEKEYRING +OPTIONS_DEFAULT= GNOMEKEYRING .include -.if defined(WITHOUT_KEYRING) -CONFIGURE_ARGS+= --without-gnomekeyring -.else +.if ${PORT_OPTIONS:MGNOMEKEYRING} KEYRING_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-keyring-sharp-1.0.pc BUILD_DEPENDS+= ${KEYRING_DETECT}:${PORTSDIR}/security/gnome-keyring-sharp RUN_DEPENDS+= ${KEYRING_DETECT}:${PORTSDIR}/security/gnome-keyring-sharp +.else +CONFIGURE_ARGS+= --without-gnomekeyring .endif # TODO Modified: head/multimedia/mplayerxp/Makefile ============================================================================== --- head/multimedia/mplayerxp/Makefile Sun Oct 7 07:45:08 2012 (r305436) +++ head/multimedia/mplayerxp/Makefile Sun Oct 7 07:46:04 2012 (r305437) @@ -15,14 +15,13 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphic vcdinfo.2:${PORTSDIR}/multimedia/vcdimager RUN_DEPENDS= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fonts -OPTIONS= DVDNAV "Enable libdvdnav support" off \ - DVDPLAY "Enable libdvdplay support" off \ - CDPARANOIA "Enable CDDA support" off \ - OCFLAGS "Use optimized compiler flags" off \ - SDL "Enable SDL video output" off \ - TERMCAP "Enable termcap key support" off \ - WIN32 "Enable win32 codec set" on +OPTIONS_DEFINE= DVDNAV DVDPLAY CDPARANOIA OPTIMIZED_CFLAGS SDL TERMCAP WIN32 +DVDNAV_DESC= Enable libdvdnav support +DVDPLAY_DESC= Enable libdvdplay support +TERMCAP_DESC= Enable termcap key support +WIN32_DESC= Enable win32 codec set +OPTIONS_DEFAULT= WIN32 ONLY_FOR_ARCHS= i386 USE_BZIP2= yes @@ -63,7 +62,7 @@ CFLAGS+= -fomit-frame-pointer ## # cdda support -.if defined(WITH_CDPARANOIA) +.if ${PORT_OPTIONS:MCDPARANOIA} LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia CONFIGURE_ARGS+= --enable-cdparanoia @@ -71,7 +70,7 @@ CONFIGURE_ARGS+= --enable-cdparanoia CONFIGURE_ARGS+= --disable-cdparanoia .endif # dvd support -.if defined(WITH_DVDNAV) || defined(WITH_DVDPLAY) +.if ${PORT_OPTIONS:MDVDNAV} || ${PORT_OPTIONS:MDVDPLAY} LIB_DEPENDS+= dvdread.4:${PORTSDIR}/multimedia/libdvdread CONFIGURE_ARGS+= --enable-libdvdread @@ -79,7 +78,7 @@ CONFIGURE_ARGS+= --enable-libdvdread CONFIGURE_ARGS+= --disable-libdvdread .endif # xine libdvdnav -.if defined(WITH_DVDNAV) +.if ${PORT_OPTIONS:MDVDNAV} LIB_DEPENDS+= dvdnav.4:${PORTSDIR}/multimedia/libdvdnav CONFIGURE_ARGS+= --enable-libdvdnav @@ -87,7 +86,7 @@ CONFIGURE_ARGS+= --enable-libdvdnav CONFIGURE_ARGS+= --disable-libdvdnav .endif # ogle's libdvdplay -.if defined(WITH_DVDPLAY) +.if ${PORT_OPTIONS:MDVDPLAY} LIB_DEPENDS+= dvdplay.0:${PORTSDIR}/multimedia/libdvdplay CONFIGURE_ARGS+= --enable-libdvdplay @@ -95,13 +94,13 @@ CONFIGURE_ARGS+= --enable-libdvdplay CONFIGURE_ARGS+= --disable-libdvdplay .endif # compilation optimizations -.if defined(WITH_OCFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -ffast-math .else MAKE_ARGS+= OPTFLAGS="${CFLAGS}" SHCFLAGS="${CFLAGS} -PIC" .endif # sdl -.if defined(WITH_SDL) +.if ${PORT_OPTIONS:MSDL} USE_SDL= image sdl CONFIGURE_ARGS+= --enable-sdl --enable-sdl-image .else @@ -109,13 +108,13 @@ CONFIGURE_ARGS+= --disable-sdl --disable .endif # termcap key support # mplayerxp does not clean up after itself yet -.if defined(WITH_TERMCAP) +.if ${PORT_OPTIONS:MTERMCAP} CONFIGURE_ARGS+= --enable-termcap .else CONFIGURE_ARGS+= --disable-termcap .endif # win32 binary dll codecs -.if !defined(WITHOUT_WIN32) +.if ${PORT_OPTIONS:MWIN32} RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT} CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs Modified: head/x11-wm/waimea-devel/Makefile ============================================================================== --- head/x11-wm/waimea-devel/Makefile Sun Oct 7 07:45:08 2012 (r305436) +++ head/x11-wm/waimea-devel/Makefile Sun Oct 7 07:46:04 2012 (r305437) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Waimea -# Date created: 03 Mar 2005 -# Whom: Alexey Dokuchaev -# +# Created by: Alexey Dokuchaev # $FreeBSD$ -# PORTNAME= waimea PORTVERSION= 0.5.1 @@ -32,19 +28,18 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= PNG "Enable PNG support" On \ - SVG "Enable SVG support" On \ - THREAD "Enable threading support" Off +OPTIONS_DEFINE= PNG SVG THREADS +OPTIONS_DEFAULT= PNG SVG -.include +.include -.if defined(WITH_PNG) +.if ${PORT_OPTIONS:MPNG} LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png .else CONFIGURE_ARGS+= --disable-png .endif -.if defined(WITH_SVG) +.if ${PORT_OPTIONS:MSVG} LIB_DEPENDS+= svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo .else CONFIGURE_ARGS+= --disable-svg @@ -52,7 +47,7 @@ MAKE_ARGS= CPPFLAGS="-I${LOCALBASE}/incl LDFLAGS="-L${LOCALBASE}/lib" .endif -.if defined(WITH_THREAD) +.if ${PORT_OPTIONS:MTHREADS} CONFIGURE_ARGS+= --enable-thread .endif @@ -63,4 +58,4 @@ post-extract: @${LN} -fs ${AUTOMAKE_DIR}/${f} ${WRKSRC}/config/${f} .endfor -.include +.include Modified: head/x11-wm/waimea/Makefile ============================================================================== --- head/x11-wm/waimea/Makefile Sun Oct 7 07:45:08 2012 (r305436) +++ head/x11-wm/waimea/Makefile Sun Oct 7 07:46:04 2012 (r305437) @@ -1,9 +1,5 @@ -# New ports collection makefile for: waimea -# Date created: 27 May 2002 -# Whom: Alexey Dokuchaev -# +# Created by: Alexey Dokuchaev # $FreeBSD$ -# PORTNAME= waimea PORTVERSION= 0.4.0 @@ -27,17 +23,19 @@ GNU_CONFIGURE= yes MAN1= waimea.1 -OPTIONS= PIXMAP "Build with pixmap textures support" on \ - DITHER "Enable ordered pseudocolor dithering" off +OPTIONS_DEFINE= PIXMAP DITHER +OPTIONS_DEFAULT= PIXMAP +PIXMAP_DESC= Build with pixmap textures support +DITHER_DESC= =Enable ordered pseudocolor dithering -.include +.include -.if !defined(WITHOUT_PIXMAP) +.if ${PORT_OPTIONS:MPIXMAP} USE_EFL+= imlib2 .endif -.if defined(WITH_DITHER) +.if ${PORT_OPTIONS:MDITHER} CONFIGURE_ARGS+= --enable-ordered-pseudo .endif -.include +.include