Date: Thu, 6 Jun 2013 15:59:25 +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: r320111 - in head/graphics: evas-loader-generic vips Message-ID: <201306061559.r56FxPfu004492@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk> .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 <bsd.port.options.mk> # 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 <bsd.port.options.mk> -.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306061559.r56FxPfu004492>