Date: Mon, 6 May 2013 08:31:30 +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: r317482 - in head/graphics: bugle cuneiform frei0r frei0r-plugins gimp-help gle-graphics grads gts hugin hugin-devel imlib2 imlib2_loaders iulib libmng ocropus Message-ID: <201305060831.r468VUMf097912@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon May 6 08:31:29 2013 New Revision: 317482 URL: http://svnweb.freebsd.org/changeset/ports/317482 Log: Convert to new options framework Modified: head/graphics/bugle/Makefile head/graphics/cuneiform/Makefile head/graphics/frei0r-plugins/Makefile head/graphics/frei0r/Makefile head/graphics/gimp-help/Makefile head/graphics/gle-graphics/Makefile head/graphics/grads/Makefile head/graphics/gts/Makefile head/graphics/hugin-devel/Makefile head/graphics/hugin/Makefile head/graphics/imlib2/Makefile head/graphics/imlib2_loaders/Makefile head/graphics/iulib/Makefile head/graphics/libmng/Makefile head/graphics/ocropus/Makefile Modified: head/graphics/bugle/Makefile ============================================================================== --- head/graphics/bugle/Makefile Mon May 6 08:24:42 2013 (r317481) +++ head/graphics/bugle/Makefile Mon May 6 08:31:29 2013 (r317482) @@ -1,9 +1,5 @@ -# New ports collection makefile for: bugle -# Date created: Jun 8, 2004 -# Whom: Erik Greenwald <erik@smluc.org> -# +# Created by: Erik Greenwald <erik@smluc.org> # $FreeBSD$ -# PORTNAME= bugle PORTVERSION= 0.0.20091026 @@ -14,9 +10,8 @@ MASTER_SITES= SF MAINTAINER= erik@bz.bzflag.bz COMMENT= A debugging library for OpenGL -OPTIONS= AVCODEC "With avcodec support (ffmpeg)" off -OPTIONS+= GUI "With GTK support (GtkGlExt)" off -OPTIONS+= THREADS "With threading support" off +OPTIONS_DEFINE= AVCODEC GUI THREADS +AVCODEC_DESC= LAVC codec support GNU_CONFIGURE= yes USE_GL= gl @@ -40,27 +35,23 @@ MAN7= bugle-camera.7 bugle-checks.7 bugl bugle-stats_nv.7 bugle-stats_primitives.7 bugle-trace.7 \ bugle-unwindstack.7 bugle-wireframe.7 -OPTIONS= AVCODEC "Use lavc from multimedia/ffmpeg" off -OPTIONS+= GUI "Use gktglext" off -OPTIONS+= THREADS "Use pthreads" off +.include <bsd.port.options.mk> -.include <bsd.port.pre.mk> - -.if defined(WITH_AVCODEC) +.if ${PORT_OPTIONS:MAVCODEC} CONFIGURE_ARGS+=--with-lavc LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg .else CONFIGURE_ARGS+=--without-lavc .endif -.if defined(WITH_GUI) +.if ${PORT_OPTIONS:MGUI} LIB_DEPENDS+= gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext CONFIGURE_ARGS+=--with-gtk --with-gtkglext .else CONFIGURE_ARGS+=--without-gtk --without-gtkglext .endif -.if defined(WITH_THREADS) +.if ${PORT_OPTIONS:MTHREADS} CONFIGURE_ARGS+=--with-threads=pthreads .else CONFIGURE_ARGS+=--with-threads=single @@ -80,4 +71,4 @@ post-install: @-${RMDIR} ${PREFIX}/lib/pkgconfig @${RM} -rf ${PREFIX}/share/doc/bugle -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/cuneiform/Makefile ============================================================================== --- head/graphics/cuneiform/Makefile Mon May 6 08:24:42 2013 (r317481) +++ head/graphics/cuneiform/Makefile Mon May 6 08:31:29 2013 (r317482) @@ -1,9 +1,5 @@ -# New ports collection makefile for: cuneiform -# Date created: 2008/08/23 -# Whom: samm -# +# Created by: samm # $FreeBSD$ -# PORTNAME= cuneiform PORTVERSION= 1.1.0 @@ -24,16 +20,11 @@ USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include -OPTIONS= IMAGEMAGICK "Enable support of different graphic formats" off +OPTIONS_DEFINE= IMAGEMAGICK -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if ${OSVERSION} < 700000 -LIB_DEPENDS= dlmalloc.2:${PORTSDIR}/devel/libdlmalloc -CMAKE_ARGS= -DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib -ldlmalloc" -.endif - -.if defined(WITH_IMAGEMAGICK) +.if ${PORT_OPTIONS:MIMAGEMAGICK} LIB_DEPENDS+= MagickWand:${PORTSDIR}/graphics/ImageMagick .endif @@ -43,14 +34,9 @@ post-extract: post-patch: ${MV} ${WRKSRC}/cuneiform_src/Kern/hhh/tigerh/h/strings.h \ ${WRKSRC}/cuneiform_src/Kern/hhh/tigerh/h/cf_strings.h -.if !defined(WITH_IMAGEMAGICK) +.if ! ${PORT_OPTIONS:MIMAGEMAGICK} @${REINPLACE_CMD} -e '/pkg_check_modules.*ImageMagick/ d' \ ${WRKSRC}/cuneiform_src/Kern/CMakeLists.txt .endif -.if ${OSVERSION} < 700000 - @${REINPLACE_CMD} -e 's|malloc_np.h|dlmalloc/malloc.h|' \ - ${WRKSRC}/cuneiform_src/Kern/cfcompat/cfcompat.c \ - ${WRKSRC}/cuneiform_src/Kern/rbal/src/statsearchbl.cpp -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/frei0r-plugins/Makefile ============================================================================== --- head/graphics/frei0r-plugins/Makefile Mon May 6 08:24:42 2013 (r317481) +++ head/graphics/frei0r-plugins/Makefile Mon May 6 08:31:29 2013 (r317482) @@ -1,9 +1,4 @@ -# New ports collection makefile for: frei0r-plugins -# Date created: 29 June 2011 -# Whom: Alberto Villa <avilla@FreeBSD.org> -# # $FreeBSD$ -# PORTREVISION= 0 PKGNAMESUFFIX= -plugins @@ -24,18 +19,20 @@ PLIST= ${WRKDIR}/PLIST BUILDING_FREI0R_METAPORT= yes -OPTIONS= GAVL "Install gavl plugins" on \ - OPENCV "Install OpenCV plugins" on +OPTIONS_DEFINE= GAVL OPENCV +OPTIONS_DEFAULT= GAVL OPENCV +GAVL_DESC= Install gavl plugins +OPENCV_DESC= Install OpenCV plugins .include "${MASTERDIR}/Makefile" .include <bsd.port.options.mk> -.if !defined(WITHOUT_GAVL) +.if ${PORT_OPTIONS:MGAVL} RUN_DEPENDS+= ${LOCALBASE}/lib/frei0r-1/rgbparade.so:${PORTSDIR}/graphics/frei0r-plugins-gavl .endif -.if !defined(WITHOUT_OPENCV) +.if ${PORT_OPTIONS:MOPENCV} RUN_DEPENDS+= ${LOCALBASE}/lib/frei0r-1/facedetect.so:${PORTSDIR}/graphics/frei0r-plugins-opencv .endif Modified: head/graphics/frei0r/Makefile ============================================================================== --- head/graphics/frei0r/Makefile Mon May 6 08:24:42 2013 (r317481) +++ head/graphics/frei0r/Makefile Mon May 6 08:31:29 2013 (r317482) @@ -1,9 +1,5 @@ -# New ports collection makefile for: frei0r -# Date created: 17 November 2006 -# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# +# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> # $FreeBSD$ -# PORTNAME= frei0r PORTVERSION= 1.3 @@ -47,12 +43,14 @@ FREI0R_PLUGINS= rgbparade scale0tilt vec PORTDOCS= * -OPTIONS= APIDOC "Install full documentation (requires doxygen)" off \ - MMX "Enable MMX CPU instructions" off +OPTIONS_DEFINE= APIDOC +OPTIONS_DEFINE_amd64= MMX +APIDOC_DESC= Install full documentation (requires doxygen) +MMX_DESC= MMX CPU instructions .include <bsd.port.options.mk> -. if !defined(NOPORTDOCS) && defined(WITH_APIDOC) +. if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MAPIDOC} BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen . endif @@ -70,12 +68,6 @@ PLIST_FILES+= lib/frei0r-1/${FILE}.so PLIST_FILES+= "@dirrmtry lib/frei0r-1" .endif -.include <bsd.port.pre.mk> - -.if !defined(WITH_MMX) && ${ARCH} != "amd64" -CONFIGURE_ARGS+=--disable-cpuflags -.endif - post-patch: .if !defined(BUILDING_FREI0R_GAVL) @${REINPLACE_CMD} -e 's/HAVE_GAVL=true/HAVE_GAVL=false/g' \ @@ -86,10 +78,10 @@ post-patch: ${WRKSRC}/configure .endif .if !defined(FREI0R_PLUGINS) -. if !defined(NOPORTDOCS) && defined(WITH_APIDOC) +. if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MAPIDOC} @${REINPLACE_CMD} -e '/^SUBDIRS/s|include|include doc|' ${WRKSRC}/Makefile.in . endif -. if defined(NOPORTDOCS) +. if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e '/^install-data-am/s| install-docsDATA||' \ ${WRKSRC}/Makefile.in . endif @@ -110,6 +102,6 @@ pre-build: @${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in \ ${WRKSRC}/configure ${WRKSRC}/config.h.in -.include <bsd.port.post.mk> +.include <bsd.port.mk> .endif # !defined(BUILDING_FREI0R_METAPORT) Modified: head/graphics/gimp-help/Makefile ============================================================================== --- head/graphics/gimp-help/Makefile Mon May 6 08:24:42 2013 (r317481) +++ head/graphics/gimp-help/Makefile Mon May 6 08:31:29 2013 (r317482) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gimp-help -# Date created: 28 May, 2005 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# PORTNAME= gimp-help PORTVERSION= 2.6.1 @@ -18,6 +14,8 @@ COMMENT= The meta port for GIMP User Man LICENSE= GFDL +.MAKE.FreeBSD_UL= yes + NO_BUILD= yes LANG_ALL= de en es fr it ja ko nl nn pl ru sv zh_CN @@ -49,17 +47,20 @@ zh_CN_NAME= Chinese Simplified ${lang}_DETECT?= ${LOCALBASE}/share/gimp/help/${lang}/index.html ${lang}_PORT?= misc/gimp-help-${lang} ${lang}_NAME?= ${lang} +${lang:U}_DESC= ${${lang}_NAME} .endfor -OPTIONS= ALL "All translations" on +OPTIONS_DEFINE= ALL +OPTIONS_DEFAULT= ALL +ALL_DESC= All translations .for lang in ${LANG_ALL} -OPTIONS+= ${lang:U} "${${lang}_NAME}" off +OPTIONS_DEFINE+= ${lang:U} .endfor .include <bsd.port.options.mk> .for lang in ${LANG_ALL} -.if defined(WITH_ALL) || defined(WITH_${lang:U}) +.if ${PORT_OPTIONS:MALL} || ${PORT_OPTIONS:M${lang:U}} RUN_DEPENDS+= ${${lang}_DETECT}:${PORTSDIR}/${${lang}_PORT} .endif .endfor Modified: head/graphics/gle-graphics/Makefile ============================================================================== --- head/graphics/gle-graphics/Makefile Mon May 6 08:24:42 2013 (r317481) +++ head/graphics/gle-graphics/Makefile Mon May 6 08:31:29 2013 (r317482) @@ -1,9 +1,5 @@ -# New ports collection makefile for: glx -# Date created: 2006-11-10 -# Whom: Nicola Vitale <nivit@email.it> -# +# Created by: Nicola Vitale <nivit@email.it> # $FreeBSD$ -# PORTNAME= gle-graphics PORTVERSION= 4.0.12 @@ -17,9 +13,10 @@ COMMENT= A graphics language that produc RUN_DEPENDS= gv:${PORTSDIR}/print/gv -OPTIONS= BITMAP_IMAGES "Support for including bitmap images" On \ - LATEX_GS "Use LaTeX & GhostScript" On \ - X_WINDOWS "Use X Windows System" On +OPTIONS_DEFINE= BITMAP_IMAGES LATEX_GS X11 +OPTIONS_DEFAULT= BITMAP_IMAGES LATEX_GS X11 +BITMAP_IMAGES_DESC= Support for including bitmap images +LATEX_GS_DESC= Use LaTeX & GhostScript WRKSRC= ${WRKDIR}/gle4 @@ -36,9 +33,9 @@ USE_ZIP= yes post-patch: cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' ${REINPLACE_FILES} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_BITMAP_IMAGES) +.if ${PORT_OPTIONS:MBITMAP_IMAGES} LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ tiffxx.4:${PORTSDIR}/graphics/tiff @@ -47,14 +44,14 @@ CONFIGURE_ARGS+= --with-jpeg=${LOCALBAS CONFIGURE_ARGS+= --with-jpeg=no --with-png=no -with-tiff=no .endif -.if !defined(WITHOUT_LATEX_GS) +.if ${PORT_OPTIONS:MLATEX_GS} USE_GHOSTSCRIPT_RUN= yes USE_TEX= tetex .endif -.if !defined(WITHOUT_X_WINDOWS) +.if ${PORT_OPTIONS:MX11} CONFIGURE_ARGS+= --with-x USE_XORG= x11 .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/grads/Makefile ============================================================================== --- head/graphics/grads/Makefile Mon May 6 08:24:42 2013 (r317481) +++ head/graphics/grads/Makefile Mon May 6 08:31:29 2013 (r317482) @@ -1,9 +1,5 @@ -# New ports collection makefile for: GrADS -# Date created: 25 October 2002 -# Whom: Greg Lewis <glewis@FreeBSD.org> -# +# Created by: Greg Lewis <glewis@FreeBSD.org> # $FreeBSD$ -# PORTNAME= grads PORTVERSION= 1.9b4 @@ -32,30 +28,32 @@ CONFIGURE_ARGS+= --enable-dyn-supplibs \ --with-gui \ --with-x -OPTIONS= HDF "Build hdf-support (only hdf OR netcdf is supported)" on \ - NETCDF "Build netcdf-support" off +OPTIONS_DEFINE= HDF NETCDF DOCS EXAMPLES +OPTIONS_DEFAULT= HDF +HDF_DESC= Build hdf-support (only hdf OR netcdf is supported) +NETCDF_DESC= Build netcdf-support .if !defined(NOPORTDATA) PORTDATA= * .endif -.if !defined(NOPORTDOCS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} PORTDOCS= * .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} PORTEXAMPLES= * .endif -.include <bsd.port.pre.mk> - -.if defined(WITH_HDF) +.if ${PORT_OPTIONS:MHDF} LIB_DEPENDS+= mfhdf.3:${PORTSDIR}/science/hdf CONFIGURE_ARGS+= --with-hdf PLIST_SUB+= NETCDF="@comment " HDF="" .endif -.if defined(WITH_NETCDF) +.if ${PORT_OPTIONS:MNETCDF} LIB_DEPENDS+= netcdf:${PORTSDIR}/science/netcdf4 CONFIGURE_ARGS+= --with-nc PLIST_SUB+= NETCDF="" HDF="@comment " @@ -74,13 +72,13 @@ post-install: ${MKDIR} "${DATADIR}" cd ${WRKSRC}/data && ${COPYTREE_SHARE} . "${DATADIR}" .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} "${EXAMPLESDIR}" cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . "${EXAMPLESDIR}" .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} "${DOCSDIR}" cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . "${DOCSDIR}" .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/gts/Makefile ============================================================================== --- head/graphics/gts/Makefile Mon May 6 08:24:42 2013 (r317481) +++ head/graphics/gts/Makefile Mon May 6 08:31:29 2013 (r317482) @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: gts -# Date created: Jun 23, 2002 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= gts PORTVERSION= 0.7.6 @@ -19,14 +14,15 @@ USE_GNOME= glib20 pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes -OPTIONS= NETPBM "Build with libnetpbm support" off +OPTIONS_DEFINE= NETPBM +NETPBM_DESC= Build with libnetpbm support CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_NETPBM) +.if ${PORT_OPTIONS:MNETPBM} LIB_DEPENDS+= netpbm.1:${PORTSDIR}/graphics/netpbm PLIST_SUB= NETPBM="" .else @@ -34,7 +30,7 @@ PLIST_SUB= NETPBM="@comment " .endif post-extract: -.if !defined(WITH_NETPBM) +.if ! ${PORT_OPTIONS:MNETPBM} @${REINPLACE_CMD} -e 's|netpbm="true"|netpbm="false"|' \ ${WRKSRC}/configure .endif @@ -43,4 +39,4 @@ post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|-release \$$(LT_RELEASE)||g ; s|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/hugin-devel/Makefile ============================================================================== --- head/graphics/hugin-devel/Makefile Mon May 6 08:24:42 2013 (r317481) +++ head/graphics/hugin-devel/Makefile Mon May 6 08:31:29 2013 (r317482) @@ -33,8 +33,10 @@ CONFLICTS_INSTALL= hugin-201[0-2]* MAKE_JOBS_SAFE= yes USE_BZIP2= yes -OPTIONS= PANOMATIC "Install graphics/panomatic" on \ - AUTOPANOSIFTC "Install graphics/autopano-sift-c" on +OPTIONS_DEFINE= PANOMATIC AUTOPANOSIFTC +OPTIONS_DEFAULT= PANOMATIC AUTOPANOSIFTC +PANOMATIC_DESC= Install graphics/panomatic +AUTOPANOSIFTC_DESC= Install graphics/autopano-sift-c USES= cmake gettext @@ -93,14 +95,14 @@ post-configure: ${WRKSRC}/src/hugin1/stitch_project/CMakeFiles/hugin_stitch_project.dir/flags.make \ ${WRKSRC}/src/hugin1/stitch_project/CMakeFiles/hugin_stitch_project.dir/link.txt -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_PANOMATIC) +.if ${PORT_OPTIONS:MPANOMATIC} RUN_DEPENDS+= panomatic:${PORTSDIR}/graphics/panomatic .endif -.if defined(WITH_AUTOPANOSIFTC) +.if ${PORT_OPTIONS:MAUTOPANOSIFTC} RUN_DEPENDS+= autopano:${PORTSDIR}/graphics/autopano-sift-c .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/hugin/Makefile ============================================================================== --- head/graphics/hugin/Makefile Mon May 6 08:24:42 2013 (r317481) +++ head/graphics/hugin/Makefile Mon May 6 08:31:29 2013 (r317482) @@ -28,8 +28,10 @@ RUN_DEPENDS= enblend>=3.1.r20080615:${PO USE_BZIP2= yes -OPTIONS= PANOMATIC "Install graphics/panomatic" on \ - AUTOPANOSIFTC "Install graphics/autopano-sift-c" on +OPTIONS_DEFINE= PANOMATIC AUTOPANOSIFTC +OPTIONS_DEFAULT= PANOMATIC AUTOPANOSIFTC +PANOMATIC_DESC= Install graphics/panomatic +AUTOPANOSIFTC_DESC= Install graphics/autopano-sift-c USES= cmake gettext @@ -91,14 +93,14 @@ post-configure: ${WRKSRC}/src/hugin1/stitch_project/CMakeFiles/hugin_stitch_project.dir/flags.make \ ${WRKSRC}/src/hugin1/stitch_project/CMakeFiles/hugin_stitch_project.dir/link.txt -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_PANOMATIC) +.if ${PORT_OPTIONS:MPANOMATIC} RUN_DEPENDS+= panomatic:${PORTSDIR}/graphics/panomatic .endif -.if defined(WITH_AUTOPANOSIFTC) +.if ${PORT_OPTIONS:MAUTOPANOSIFTC} RUN_DEPENDS+= autopano:${PORTSDIR}/graphics/autopano-sift-c .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/imlib2/Makefile ============================================================================== --- head/graphics/imlib2/Makefile Mon May 6 08:24:42 2013 (r317481) +++ head/graphics/imlib2/Makefile Mon May 6 08:31:29 2013 (r317482) @@ -1,9 +1,5 @@ -# New ports collection makefile for: imlib2 -# Date created: 16 Oct 2000 -# Whom: Jeremy Norris <ishmael27@home.com> -# +# Created by: Jeremy Norris <ishmael27@home.com> # $FreeBSD$ -# PORTNAME= imlib2 PORTVERSION= 1.4.5 @@ -26,14 +22,10 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes -OPTIONS= JPEG "Enable jpeg image support" on \ - PNG "Enable png image support" on \ - TIFF "Enable tiff image support" on \ - GIF "Enable GIF image support" on \ - ID3 "Enable IDv3 tags support" on \ - X11 "Enable X11 support" on +OPTIONS_DEFINE= JPEG PNG TIFF GIF ID3 X11 +OPTIONS_DEFAULT= JPEG PNG TIFF GIF ID3 X11 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${ARCH} == "i386" && !empty(MACHINE_CPU:Mmmx) CONFIGURE_ARGS+= --enable-mmx @@ -47,7 +39,7 @@ CONFIGURE_ARGS+= --enable-amd64 CONFIGURE_ARGS+= --disable-amd64 .endif -.if defined(WITHOUT_X11) +.if ! ${PORT_OPTIONS:MX11} CONFIGURE_ARGS+= --without-x PKGNAMESUFFIX+= -nox11 PLIST_SUB= X11="@comment " @@ -56,7 +48,7 @@ USE_XORG= x11 sm xext PLIST_SUB= X11="" .endif -.if !defined(WITHOUT_JPEG) +.if ${PORT_OPTIONS:MJPEG} LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg PLIST_SUB+= JPEG="" .else @@ -64,7 +56,7 @@ CONFIGURE_ARGS+= --without-jpeg PLIST_SUB+= JPEG="@comment " .endif -.if !defined(WITHOUT_PNG) +.if ${PORT_OPTIONS:MPNG} LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png PLIST_SUB+= PNG="" .else @@ -72,7 +64,7 @@ CONFIGURE_ARGS+= --without-png PLIST_SUB+= PNG="@comment " .endif -.if !defined(WITHOUT_TIFF) +.if ${PORT_OPTIONS:MTIFF} LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff PLIST_SUB+= TIFF="" .else @@ -80,7 +72,7 @@ CONFIGURE_ARGS+= --without-tiff PLIST_SUB+= TIFF="@comment " .endif -.if !defined(WITHOUT_GIF) +.if ${PORT_OPTIONS:MGIF} LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib PLIST_SUB+= GIF="" .else @@ -88,7 +80,7 @@ CONFIGURE_ARGS+= --without-gif PLIST_SUB+= GIF="@comment " .endif -.if !defined(WITHOUT_ID3) +.if ${PORT_OPTIONS:MID3} LIB_DEPENDS+= id3tag.0:${PORTSDIR}/audio/libid3tag PLIST_SUB+= ID3="" .else @@ -96,4 +88,4 @@ CONFIGURE_ARGS+= --without-id3 PLIST_SUB+= ID3="@comment " .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/imlib2_loaders/Makefile ============================================================================== --- head/graphics/imlib2_loaders/Makefile Mon May 6 08:24:42 2013 (r317481) +++ head/graphics/imlib2_loaders/Makefile Mon May 6 08:31:29 2013 (r317482) @@ -1,9 +1,5 @@ -# New ports collection makefile for: imlib2_loaders -# Date created: 7 Oct 2001 -# Whom: Jeremy Norris <ishmael27@home.com> -# +# Created by: Jeremy Norris <ishmael27@home.com> # $FreeBSD$ -# PORTNAME= imlib2_loaders PORTVERSION= 1.4.5 @@ -21,13 +17,15 @@ USE_BZIP2= yes USES= pathfix USE_EFL= imlib2 libtool_hack -OPTIONS= EDB "Enable edb loader" on \ - EET "Enable eet loader" on \ - XCF "Enable XCF loader" on +OPTIONS_DEFINE= EDB EET XCF +OPTIONS_DEFAULT= EDB EET XCF +EDB_DESC= Enable edb loader +EET_DESC= Enable eet loader +XCF_DESC= Enable XCF loader -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_EDB) +.if ${PORT_OPTIONS:MEDB} USE_EFL+= edb PLIST_SUB+= EDB="" .else @@ -35,7 +33,7 @@ CONFIGURE_ARGS+= --disable-edb PLIST_SUB+= EDB="@comment " .endif -.if !defined(WITHOUT_EET) +.if ${PORT_OPTIONS:MEET} USE_EFL+= eet PLIST_SUB+= EET="" .else @@ -43,11 +41,11 @@ CONFIGURE_ARGS+= --disable-eet PLIST_SUB+= EET="@comment " .endif -.if !defined(WITHOUT_XCF) +.if ${PORT_OPTIONS:MXCF} PLIST_SUB+= XCF="" .else CONFIGURE_ARGS+= --disable-xcf PLIST_SUB+= XCF="@comment " .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/iulib/Makefile ============================================================================== --- head/graphics/iulib/Makefile Mon May 6 08:24:42 2013 (r317481) +++ head/graphics/iulib/Makefile Mon May 6 08:31:29 2013 (r317482) @@ -1,9 +1,5 @@ -# New ports collection makefile for: iulib -# Date created: 2009-05-20 -# Whom: Hiroto Kagotani <hiroto.kagotani@gmail.com> -# +# Created by: Hiroto Kagotani <hiroto.kagotani@gmail.com> # $FreeBSD$ -# PORTNAME= iulib PORTVERSION= 0.4 @@ -19,8 +15,9 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/ jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff -OPTIONS= SDL "Enable SDL for graphical debugging" off \ - VIDIO "Enable Video Input/Output (using ffmpeg)" off +OPTIONS_DEFINE= SDL VIDIO +SDL_DESC= Enable SDL for graphical debugging +VIDIO_DESC= Enable Video Input/Output (using ffmpeg) MAKE_JOBS_SAFE= yes USE_GCC= any @@ -32,22 +29,22 @@ USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITH_SDL) -CONFIGURE_ARGS+=--without-SDL -PLIST_SUB+= SDL="@comment " -.else +.if ${PORT_OPTIONS:MSDL} USE_SDL= sdl gfx PLIST_SUB+= SDL="" +.else +CONFIGURE_ARGS+=--without-SDL +PLIST_SUB+= SDL="@comment " .endif -.if defined(WITH_VIDIO) +.if ${PORT_OPTIONS:MVIDIO} LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg .endif post-patch: -.if !defined(WITH_VIDIO) +.if ! ${PORT_OPTIONS:MVIDIO} @${REINPLACE_CMD} -e 's/novidio, 0/novidio, 1/' ${WRKSRC}/configure.ac .endif @${REINPLACE_CMD} -e 's/nov4l2, 0/nov4l2, 1/' ${WRKSRC}/configure.ac @@ -59,4 +56,4 @@ pre-configure: run-autotools: run-autotools-aclocal run-autotools-automake run-autotools-autoconf -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/libmng/Makefile ============================================================================== --- head/graphics/libmng/Makefile Mon May 6 08:24:42 2013 (r317481) +++ head/graphics/libmng/Makefile Mon May 6 08:31:29 2013 (r317482) @@ -1,9 +1,5 @@ -# New ports collection makefile for: libmng -# Date created: Nov 2, 2000 -# Whom: Mikhail Teterin <mi@aldan.algebra.com> -# +# Created by: Mikhail Teterin <mi@aldan.algebra.com> # $FreeBSD$ -# PORTNAME= libmng PORTVERSION= 1.0.10 @@ -19,10 +15,10 @@ COMMENT= Multiple-image Network Graphics LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ lcms:${PORTSDIR}/graphics/lcms -OPTIONS= MNG_OPTIMIZE "Use vendor's new optimization flags" off +OPTIONS_DEFINE= MNG_OPTIMIZE +MNG_OPTIMIZE_DESC= Use vendor's new optimization flags MAKEFILE= ${FILESDIR}/Makefile.bsd -MAKE_ARGS+= WITH_MNG_OPTIMIZE=${WITH_MNG_OPTIMIZE} MAKE_JOBS_SAFE= yes #USE_BZIP2= yes # Please, uncomment on next upgrade @@ -31,6 +27,13 @@ USE_LDCONFIG= yes MAN3= libmng.3 MAN5= mng.5 jng.5 +.include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MMNG_OPTIMIZE} +MAKE_ARGS+= WITH_MNG_OPTIMIZE=true +.else +MAKE_ARGS+= WITH_MNG_OPTIMIZE=off +.endof + post-install: cd ${WRKSRC}/doc/man && ${INSTALL_MAN} ${MAN3} ${PREFIX}/man/man3 \ && ${INSTALL_MAN} ${MAN5} ${PREFIX}/man/man5 Modified: head/graphics/ocropus/Makefile ============================================================================== --- head/graphics/ocropus/Makefile Mon May 6 08:24:42 2013 (r317481) +++ head/graphics/ocropus/Makefile Mon May 6 08:31:29 2013 (r317482) @@ -1,9 +1,5 @@ -# New ports collection makefile for: OCRopus -# Date created: 2009-05-20 -# Whom: Hiroto Kagotani <hiroto.kagotani@gmail.com> -# +# Created by: Hiroto Kagotani <hiroto.kagotani@gmail.com> # $FreeBSD$ -# PORTNAME= ocropus PORTVERSION= 0.4 @@ -22,8 +18,9 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/ WRKSRC= ${WRKDIR}/ocropus-0.4/ocropus -OPTIONS= SDL "Enable SDL for graphical debugging" off \ - LEPTONICA "Enable Leptonica image analysis" off +OPTIONS_DEFINE= SDL LEPTONICA +SDL_DESC= Enable SDL for graphical debugging +LEPTONICA_DESC= Enable Leptonica image analysis MAKE_JOBS_UNSAFE= yes USE_PYTHON_BUILD= yes @@ -33,18 +30,18 @@ CONFIGURE_ARGS= --without-fst --without- CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITH_SDL) -CONFIGURE_ARGS+=--without-SDL -.else +.if ${PORT_OPTIONS:MSDL} USE_SDL= sdl +.else +CONFIGURE_ARGS+=--without-SDL .endif -.if !defined(WITH_LEPTONICA) -CONFIGURE_ARGS+=--without-leptonica -.else +.if ${PORT_OPTIONS:MLEPTONICA} LIB_DEPENDS+= lept:${PORTSDIR}/graphics/leptonica +.else +CONFIGURE_ARGS+=--without-leptonica .endif pre-configure: @@ -59,4 +56,4 @@ run-autotools-autoconf: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|'\ ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305060831.r468VUMf097912>