From owner-svn-ports-head@FreeBSD.ORG Thu Jun 6 15:59:25 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D30932C6; Thu, 6 Jun 2013 15:59:25 +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 B59CA1B33; Thu, 6 Jun 2013 15:59:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r56FxP2j004494; Thu, 6 Jun 2013 15:59:25 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r56FxPfu004492; Thu, 6 Jun 2013 15:59:25 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201306061559.r56FxPfu004492@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 6 Jun 2013 15:59:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320111 - in head/graphics: evas-loader-generic vips 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: Thu, 06 Jun 2013 15:59:25 -0000 Author: bapt Date: Thu Jun 6 15:59:25 2013 New Revision: 320111 URL: http://svnweb.freebsd.org/changeset/ports/320111 Log: Convert to new options framework Modified: head/graphics/evas-loader-generic/Makefile head/graphics/vips/Makefile Modified: head/graphics/evas-loader-generic/Makefile ============================================================================== --- head/graphics/evas-loader-generic/Makefile Thu Jun 6 15:59:14 2013 (r320110) +++ head/graphics/evas-loader-generic/Makefile Thu Jun 6 15:59:25 2013 (r320111) @@ -16,8 +16,13 @@ LICENSE= BSD EVAS_GENERIC_LOADERS= gst pdf ps raw svg xcf +#bmake compatibility +.MAKE.FreeBSD_UL= yes + .for NODE in ${EVAS_GENERIC_LOADERS} -OPTIONS+= ${NODE:U} "Install ${NODE} evas generic loader" on +OPTIONS_DEFINE+= ${NODE:U} +OPTIONS_DEFAULT+= ${NODE:U} +${NODE:U}_DESC= Install ${NODE} evas generic loader .endfor DIST_SUBDIR= e17 @@ -36,7 +41,7 @@ CONFIGURE_ARGS+= --enable-image-loader-g .include .for NODE in ${EVAS_GENERIC_LOADERS} -. if !defined(WITHOUT_${NODE:U}) +. if ${PORT_OPTIONS:M${NODE:U}} RUN_DEPENDS+= ${LOCALBASE}/lib/evas/utils/evas_image_loader.${NODE}:${PORTSDIR}/graphics/evas_generic_loaders-${NODE} . endif .endfor Modified: head/graphics/vips/Makefile ============================================================================== --- head/graphics/vips/Makefile Thu Jun 6 15:59:14 2013 (r320110) +++ head/graphics/vips/Makefile Thu Jun 6 15:59:25 2013 (r320111) @@ -10,8 +10,10 @@ MASTER_SITES= http://www.vips.ecs.soton. MAINTAINER= mi@aldan.algebra.com COMMENT= Free image processing system -OPTIONS+= LIBOIL "Use liboil for CPU-optimized primitives" on -OPTIONS+= PYTHON "Create Python bindings" ${PYPRESENT} +OPTIONS_DEFINE= LIBOIL PYTHON +OPTIONS_DEFAULT= LIBOIL +LIBOIL_DESC= Use leiboil for CPU-optimized primitives +PYTHON_DESC= Create Python bindings BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 \ @@ -26,6 +28,9 @@ LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw lcms:${PORTSDIR}/graphics/lcms PYPRESENT!= which python > /dev/null && echo on || echo off +.if ${PYPRESENT} == on +OPTIONS_DEFAULT+= PYTHON +.endif USE_GMAKE= yes USES= gettext USE_PERL5_BUILD=yes @@ -39,8 +44,9 @@ post-configure: ${REINPLACE_CMD} -Ee 's,^(G?MSGFMT = *)$$,\1${LOCALBASE}/bin/msgfmt,g' \ ${WRKSRC}/po/Makefile +.include # Don't extract doc/ subdirectory - the simplest way: -.ifdef NOPORTDOCS +.if ${PORT_OPTIONS:MDOCS} EXTRACT_AFTER_ARGS= --exclude doc EXTRA_PATCHES= ${FILESDIR}/nodoc-patch .endif @@ -56,8 +62,7 @@ CONFIGURE_ARGS+=--with-$p-libraries=${LO .include "Makefile.man" -.include -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes PLIST_SUB+= PY="" .else @@ -71,7 +76,7 @@ PLIST_SUB+= PY="@comment " BROKEN= Does not compile on sparc64-9 .endif -.if defined(WITH_LIBOIL) +.if ${PORT_OPTIONS:MLIBOIL} LIB_DEPENDS+= oil:${PORTSDIR}/devel/liboil .else CONFIGURE_ARGS+= --without-liboil