From owner-svn-ports-head@FreeBSD.ORG Sun Apr 28 22:08:24 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 EBB2E284; Sun, 28 Apr 2013 22:08:24 +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 CBB0A16C9; Sun, 28 Apr 2013 22:08:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3SM8Odd092445; Sun, 28 Apr 2013 22:08:24 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3SM8MCw092429; Sun, 28 Apr 2013 22:08:22 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201304282208.r3SM8MCw092429@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 28 Apr 2013 22:08:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316757 - in head/science: InsightToolkit dlpoly-classic gramps hdf5-18 liblinear libsvm mbdyn netcdf netcdf4 omnetpp paraview xmds 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: Sun, 28 Apr 2013 22:08:25 -0000 Author: bapt Date: Sun Apr 28 22:08:22 2013 New Revision: 316757 URL: http://svnweb.freebsd.org/changeset/ports/316757 Log: Convert science to new options framework Modified: head/science/InsightToolkit/Makefile head/science/dlpoly-classic/Makefile head/science/gramps/Makefile head/science/hdf5-18/Makefile head/science/liblinear/Makefile head/science/libsvm/Makefile head/science/mbdyn/Makefile head/science/netcdf/Makefile head/science/netcdf4/Makefile head/science/omnetpp/Makefile head/science/paraview/Makefile head/science/xmds/Makefile Modified: head/science/InsightToolkit/Makefile ============================================================================== --- head/science/InsightToolkit/Makefile Sun Apr 28 21:57:02 2013 (r316756) +++ head/science/InsightToolkit/Makefile Sun Apr 28 22:08:22 2013 (r316757) @@ -1,9 +1,5 @@ -# New ports collection Makefile for: Insight Toolkit -# Date created: 10 Aug 2006 -# Whom: bacon@smithers.neuro.mcw.edu -# +# Created by: bacon@smithers.neuro.mcw.edu # $FreeBSD$ -# PORTNAME= InsightToolkit PORTVERSION= 2.8.1 @@ -14,8 +10,9 @@ MASTER_SITES= SF/itk/itk/2.8 MAINTAINER= jwbacon@tds.net COMMENT= Insight Toolkit -OPTIONS= EXAMPLES "Build examples (very time consuming)" off \ - TESTING "Build testing programs (very time consuming)" off +OPTIONS_DEFINE= EXAMPLES TESTING +#OPTIONS= EXAMPLES "Build examples (very time consuming)" off \ +# TESTING "Build testing programs (very time consuming)" off USE_LDCONFIG= ${PREFIX}/lib/InsightToolkit NO_PACKAGE= License does not allow redistribution of binaries @@ -27,11 +24,11 @@ SUB_FILES= pkg-message .include -.if !defined(WITH_EXAMPLES) +.if ! ${PORT_OPTIONS:MEXAMPLES} CMAKE_ARGS+= "-DBUILD_EXAMPLES:BOOL=OFF" .endif -.if !defined(WITH_TESTING) +.if ! ${PORT_OPTIONS:MTESTING} CMAKE_ARGS+= "-DBUILD_TESTING:BOOL=OFF" .endif Modified: head/science/dlpoly-classic/Makefile ============================================================================== --- head/science/dlpoly-classic/Makefile Sun Apr 28 21:57:02 2013 (r316756) +++ head/science/dlpoly-classic/Makefile Sun Apr 28 22:08:22 2013 (r316757) @@ -1,11 +1,5 @@ -############################################################################ -# New ports collection Makefile for: dlpoly-classic -# Date created: 21 Jan 2010 -# Whom: Jason Bacon -# +# Created by: Jason Bacon # $FreeBSD$ -# -############################################################################ PORTNAME= dlpoly PORTVERSION= 1.8 @@ -20,7 +14,9 @@ COMMENT= Molecular dynamics simulation p BUILD_DEPENDS= ${LOCALBASE}/mpi/openmpi/bin/mpif90:${PORTSDIR}/net/openmpi RUN_DEPENDS= ${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi -OPTIONS= GUI "Install Java GUI" on +OPTIONS_DEFINE= GUI DOCS EXAMPLES +OPTIONS_DEFAULT= GUI +GUI_DESC= Install Java GUI USE_GMAKE= yes USE_FORTRAN= yes @@ -33,7 +29,7 @@ MPIF90= ${LOCALBASE}/mpi/openmpi/bin/mp .include -.if defined(WITH_GUI) +.if ${PORT_OPTIONS:MGUI} USE_JAVA= yes PLIST_FILES+= bin/dlpoly-gui \ ${DATADIR_REL}/GUI.jar @@ -61,16 +57,16 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/execute/dlpoly-classic ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/execute/dlpoly-classic-mpi ${PREFIX}/bin -.ifndef(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/manual/* ${DOCSDIR} .endif -.ifndef(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${EXAMPLESDIR} ${CP} -R ${WRKSRC}/execute ${EXAMPLESDIR} ${RM} ${EXAMPLESDIR}/execute/dlpoly* .endif -.if defined(WITH_GUI) +.if ${PORT_OPTIONS:MGUI} ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/java/GUI.jar ${DATADIR} ${INSTALL_SCRIPT} ${WRKDIR}/dlpoly-gui ${PREFIX}/bin Modified: head/science/gramps/Makefile ============================================================================== --- head/science/gramps/Makefile Sun Apr 28 21:57:02 2013 (r316756) +++ head/science/gramps/Makefile Sun Apr 28 22:08:22 2013 (r316757) @@ -31,27 +31,28 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER MAN1= gramps.1 MANLANG= "" cs fr nl pl sv -OPTIONS= ENCHANT "Spellchecking support" off \ - PYWEBKITGTK "Use webkit backend for Geographic view" on \ - GRAPHVIZ "Use graphviz for graphs creating" on \ - EXIV "Managing exiv metadata support" on +OPTIONS_DEFINE= ENCHANT PYWEBKITGTK GRAPHVIZ EXIV +OPTIONS_DEFAULT= PYWEBKITGTK GRAPHVIZ EXIV +ENCHANT_DESC= Spellchecking support +PYWEBKITGTK_DESC= Use webkit backend for Geographic view +EXIV_DESC= Managing exiv metadata support -.include +.include -.if defined(WITH_ENCHANT) +.if ${PORT_OPTIONS:MENCHANT} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enchant>=0:${PORTSDIR}/textproc/py-enchant .endif -.if defined(WITH_PYWEBKITGTK) +.if ${PORT_OPTIONS:MPYWEBKITGTK} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:${PORTSDIR}/www/py-webkitgtk .endif -.if defined(WITH_GRAPHVIZ) +.if ${PORT_OPTIONS:MGRAPHVIZ} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}graphviz>-0:${PORTSDIR}/graphics/py-graphviz .endif -.if defined(WITH_EXIV) +.if ${PORT_OPTIONS:MEXIV} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}exiv2>=0.1.3:${PORTSDIR}/graphics/py-exiv2 .endif post-install: @${CAT} ${PKGMESSAGE} -.include +.include Modified: head/science/hdf5-18/Makefile ============================================================================== --- head/science/hdf5-18/Makefile Sun Apr 28 21:57:02 2013 (r316756) +++ head/science/hdf5-18/Makefile Sun Apr 28 22:08:22 2013 (r316757) @@ -1,9 +1,5 @@ -# New ports collection makefile for: hdf5-18 -# Date created: Nov 20, 2008 -# Whom: Wen Heping -# +# Created by: Wen Heping # $FreeBSD$ -# PORTNAME= hdf5 PORTVERSION= 1.8.9 @@ -29,17 +25,17 @@ CONFIGURE_ARGS= --enable-cxx \ --with-pthread=/usr \ --with-zlib=/usr -OPTIONS= DEBUG "Debug" off \ - FORTRAN "Fortran support" off \ - SZIP "SZIP support" off +OPTIONS_DEFINE= DEBUG FORTRAN SZIP EXAMPLES +FORTRAN_DESC= Fortran support +SZIP_DESC= SZIP support .include -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug=all --disable-production .endif -.if defined(WITH_FORTRAN) +.if ${PORT_OPTIONS:MFORTRAN} USE_FORTRAN= yes CONFIGURE_ENV+= F9X=${FC} CONFIGURE_ARGS+=--enable-fortran @@ -48,7 +44,7 @@ PLIST_SUB+= FORTRAN="" PLIST_SUB+= FORTRAN="@comment " .endif -.if defined(WITH_SZIP) +.if ${PORT_OPTIONS:MSZIP} LIB_DEPENDS+= sz:${PORTSDIR}/science/szip CONFIGURE_ARGS+=--with-szlib=${LOCALBASE} .endif @@ -66,7 +62,7 @@ post-patch: -e 's|(INSTALL)|(INSTALL_DATA)|' \ `${FIND} ${WRKSRC} -regex '.*/examples/Makefile.in'` @${REINPLACE_CMD} -e 's|\[ -a|\[ -f|g' `${FIND} ${WRKSRC} -name \*.sh\*` -.if defined(NOPORTEXAMPLES) +.if ! ${PORT_OPTIONS:MEXAMPLES} @${REINPLACE_CMD} -e '/^install:/ s|install-examples||' ${WRKSRC}/Makefile.in .endif Modified: head/science/liblinear/Makefile ============================================================================== --- head/science/liblinear/Makefile Sun Apr 28 21:57:02 2013 (r316756) +++ head/science/liblinear/Makefile Sun Apr 28 22:08:22 2013 (r316757) @@ -1,9 +1,5 @@ -# New ports collection Makefile for: liblr -# Date created: May 14 2007 -# Whom: Rong-En Fan -# +# Created by: Rong-En Fan # $FreeBSD$ -# PORTNAME= liblinear PORTVERSION= 1.80 @@ -18,21 +14,22 @@ COMMENT= A library for Large Linear Clas LICENSE= BSD LICENSE_FILE= ${WRKSRC}/COPYRIGHT -OPTIONS= OCFLAGS "Use optimized CFLAGS" On +OPTIONS_DEFINE= OPTIMIZED_CFLAGS +OPTIONS_DEFAULT= OPTIMIZED_CFLAGS USE_ZIP= yes TXT_DOCS= COPYRIGHT README -.if !defined(NOPORTDOCS) -PORTDOCS= ${TXT_DOCS} -.endif - PLIST_FILES= bin/train bin/predict .include -.if !defined(WITHOUT_OCFLAGS) +.if ${PORT_OPTIONS:MDOCS} +PORTDOCS= ${TXT_DOCS} +.endif + +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} # same as LIBLINEAR itself CFLAGS= -Wall -O3 .endif @@ -42,7 +39,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/predict ${PREFIX}/bin post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} for f in ${TXT_DOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \ Modified: head/science/libsvm/Makefile ============================================================================== --- head/science/libsvm/Makefile Sun Apr 28 21:57:02 2013 (r316756) +++ head/science/libsvm/Makefile Sun Apr 28 22:08:22 2013 (r316757) @@ -1,9 +1,5 @@ -# New ports collection Makefile for: libsvm -# Date created: Oct 28 2001 -# Whom: Chia-Hsing Yu -# +# Created by: Chia-Hsing Yu # $FreeBSD$ -# PORTNAME= libsvm PORTVERSION= 3.10 @@ -19,7 +15,8 @@ COMMENT= A library for Support Vector Ma LICENSE= BSD LICENSE_FILE= ${WRKSRC}/COPYRIGHT -OPTIONS= OCFLAGS "Use optimized CFLAGS" On +OPTIONS_DEFINE= OPTIMIZED_CFLAGS DOCS +OPTIONS_DEFAULT= OPTIMIZED_CFLAGS USE_ZIP= yes @@ -47,13 +44,13 @@ SUB_LIST= DATADIR=${DATADIR} .endif -.if !defined(NOPORTDOCS) +.include + +.if ${PORT_OPTIONS:MDOCS} PORTDOCS= ${TXT_DOCS} .endif -.include - -.if !defined(WITHOUT_OCFLAGS) +.if ${PORT_OPTIONS:MOCFLAGS} # same as LIBSVM itself CFLAGS= -Wall -Wconversion -O3 .endif @@ -86,7 +83,7 @@ do-install: .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} for f in ${TXT_DOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \ Modified: head/science/mbdyn/Makefile ============================================================================== --- head/science/mbdyn/Makefile Sun Apr 28 21:57:02 2013 (r316756) +++ head/science/mbdyn/Makefile Sun Apr 28 22:08:22 2013 (r316757) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mbdyn -# Date created: 2005-01-30 -# Whom: Kay Lehmann -# +# Created by: Kay Lehmann # $FreeBSD$ -# PORTNAME= mbdyn PORTVERSION= 1.4.0 @@ -26,11 +22,12 @@ CPPFLAGS+= -fpermissive -I${LOCALBASE}/i LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --program-prefix='' -OPTIONS= MPI "Enable mpich-support" off \ - METIS "Enable metis-support" off \ - CHACO "Enable chaco-support" off \ - GINAC "Enable GiNaC-support (not implemented yet)" off \ - TCL "Enable tcl-support (not implemented yet)" off +OPTIONS_DEFINE= MPI METIS CHACO GINAC TCL +MPI_DESC= Enable mpich-support +METIS_DESC= Enable metis-support +CHACO_DESC= Enable chaco-support +GINAC_DESC= Enable GiNaC-support (not implemented yet) +TCL_DESC= Enable tcl-support (not implemented yet) .include @@ -55,18 +52,18 @@ CONFIGURE_ARGS+= --with-blas=atlas LAPACK_LIBS= -lalapack .endif -.if defined(WITH_MPI) +.if ${PORT_OPTIONS:MMPI} LIB_DEPENDS+= mpich:${PORTSDIR}/net/mpich2 CONFIGURE_ARGS+= --with-mpi=yes --enable-schur CPPFLAGS+= -I${LOCALBASE}/include -. if !defined(WITH_METIS) +. if ! ${PORT_OPTIONS:MMETIS} WITH_CHACO= yes . endif .else CONFIGURE_ARGS+= --with-mpi=no .endif -.if defined(WITH_METIS) +.if ${PORT_OPTIONS:MMETIS} LIB_DEPENDS+= metis.1:${PORTSDIR}/math/metis4 CONFIGURE_ARGS+= --with-metis=yes CPPFLAGS+= -I${LOCALBASE}/include/metis @@ -74,14 +71,14 @@ CPPFLAGS+= -I${LOCALBASE}/include/metis CONFIGURE_ARGS+= --with-metis=no .endif -.if defined(WITH_CHACO) +.if ${PORT_OPTIONS:MCHACO} BUILD_DEPENDS+= ${LOCALBASE}/lib/libchaco.a:${PORTSDIR}/math/chaco CONFIGURE_ARGS+= --with-chaco=yes .else CONFIGURE_ARGS+= --with-chaco=no .endif -.if defined(WITH_GINAC) +.if ${PORT_OPTIONS:MGINAC} LIB_DEPENDS+= metis.1:${PORTSDIR}/math/metis4 \ ginac:${PORTSDIR}/math/GiNaC CONFIGURE_ARGS+= --with-ginac=yes @@ -90,7 +87,7 @@ CPPFLAGS+= -I${LOCALBASE}/include/metis CONFIGURE_ARGS+= --with-ginac=no .endif -.if defined(WITH_TCL) +.if ${PORT_OPTIONS:MTCL} IGNORE= you enabled Tcl-support, which is not implemented yet LIB_DEPENDS+= tcl84:${PORTSDIR}/lang/tcl84 CONFIGURE_ARGS+= --with-tcl=yes Modified: head/science/netcdf/Makefile ============================================================================== --- head/science/netcdf/Makefile Sun Apr 28 21:57:02 2013 (r316756) +++ head/science/netcdf/Makefile Sun Apr 28 22:08:22 2013 (r316757) @@ -1,9 +1,5 @@ -# New ports collection makefile for: netcdf -# Date created: 29 July 1999 -# Whom: Thomas Gellekum -# +# Created by: Thomas Gellekum # $FreeBSD$ -# PORTNAME= netcdf PORTVERSION= 3.6.3 @@ -29,17 +25,18 @@ INFO= netcdf netcdf-c netcdf-cxx netcdf MAN1= ncdump.1 ncgen.1 MAN3= netcdf.3 -OPTIONS= FORTRAN "Build library for Fortran" off +OPTIONS_DEFINE= FORTRAN DOCS +FORTRAN_DESC= Build library for Fortran -.if !defined(NOPORTDOCS) +.include + +.if ${PORT_OPTIONS:MDOCS} CONFIGURE_ARGS+=--enable-docs-install .else CONFIGURE_ARGS+=--disable-docs-install .endif -.include - -.if defined(WITH_FORTRAN) +.if ${PORT_OPTIONS:MFORTRAN} CPPFLAGS+= -DpgiFortran CONFLICTS+= netcdf-3.* MAN3+= netcdf_f77.3 netcdf_f90.3 @@ -59,7 +56,7 @@ post-patch: @${REINPLACE_CMD} -e \ '271 s/\(info_docs\).*/html_docs\)/' \ ${WRKSRC}/man4/Makefile.in -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e '790 s/install-docDATA //' \ ${WRKSRC}/man/Makefile.in .endif Modified: head/science/netcdf4/Makefile ============================================================================== --- head/science/netcdf4/Makefile Sun Apr 28 21:57:02 2013 (r316756) +++ head/science/netcdf4/Makefile Sun Apr 28 22:08:22 2013 (r316757) @@ -1,9 +1,5 @@ -# New ports collection makefile for: netcdf4 -# Date created: 2008-11-11 -# Whom: Sunpoet Po-Chuan Hsieh -# +# Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ -# PORTNAME= netcdf PORTVERSION= 4.1.3 @@ -20,9 +16,10 @@ CONFLICTS= hdf-4.* netcdf-3.* LATEST_LINK?= netcdf4 PORTSCOUT= limit:^4\. -OPTIONS= DAP "Build DAP client and remote testing" off \ - FORTRAN "Build library for Fortran" off \ - SZIP "SZIP support (required if HDF5 was built with SZIP)" off +OPTIONS_DEFINE= DAP FORTRAN SZIP +DAP_DESC= Build DAP client and remote testing +FORTRAN_DESC= Build library for Fortran +SZIP_DESC= SZIP support (required if HDF5 was built with SZIP) CONFIGURE_ARGS= --enable-cxx --enable-cxx-4 --enable-netcdf-4 --enable-shared \ --with-hdf5=${LOCALBASE} --with-zlib=/usr @@ -41,7 +38,7 @@ MAN3= netcdf.3 .include -.if defined(WITH_DAP) +.if ${PORT_OPTIONS:MDAP} CONFIGURE_ARGS+=--enable-dap --with-curl=${LOCALBASE} \ --with-curl-config=${LOCALBASE}/bin/curl-config LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl @@ -49,7 +46,7 @@ LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/cur CONFIGURE_ARGS+=--disable-dap .endif -.if defined(WITH_FORTRAN) +.if ${PORT_OPTIONS:MFORTRAN} CPPFLAGS+= -DpgiFortran CONFLICTS+= netcdf-4.* MAN3+= netcdf_f77.3 netcdf_f90.3 @@ -62,7 +59,7 @@ CONFLICTS+= netcdf-ftn-4.* PLIST_SUB+= FORTRAN="@comment " .endif -.if defined(WITH_SZIP) +.if ${PORT_OPTIONS:MSZIP} CONFIGURE_ARGS+=--with-szlib=${LOCALBASE} LIB_DEPENDS+= sz.2:${PORTSDIR}/science/szip .endif @@ -74,7 +71,7 @@ post-configure: .endfor post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR}/ cd ${WRKSRC}/man4 && ${INSTALL_DATA} *.html *.pdf *.txt ${DOCSDIR}/ .endif Modified: head/science/omnetpp/Makefile ============================================================================== --- head/science/omnetpp/Makefile Sun Apr 28 21:57:02 2013 (r316756) +++ head/science/omnetpp/Makefile Sun Apr 28 22:08:22 2013 (r316757) @@ -1,9 +1,5 @@ -# New ports collection makefile for: omnetpp -# Date created: 29 October 2004 -# Whom: bkoenig -# +# Created by: bkoenig # $FreeBSD$ -# PORTNAME= omnetpp PORTVERSION= 3.3 @@ -40,21 +36,23 @@ PLIST= ${WRKDIR}/pkg-plist INCLDIR= ${PREFIX}/include/${PORTNAME} INCLDIR_REL= ${INCLDIR:S,^${PREFIX}/,,} -OPTIONS= MAGICK "Install ImageMagick for EPS-JPG conversion" ON \ - GRAPHVIZ "Install Graphviz for generating diagrams" ON \ - DOXYGEN "Install Doxygen to create the API reference" ON +OPTIONS_DEFINE= MAGICK GRAPHVIZ DOXYGEN DOCS +OPTIONS_DEFAULT= MAGICK GRAPHVIZ DOXYGEN +MAGICK_DESC= Install ImageMagick for EPS-JPG conversion +GRAPHVIZ_DESC= Install Graphviz for generating diagrams +DOXYGEN_DESC= Install Doxygen to create the API reference .include -.if defined(WITH_MAGICK) +.if ${PORT_OPTIONS:MMAGICK} depend+= convert:${PORTSDIR}/graphics/ImageMagick .endif -.if defined(WITH_GRAPHVIZ) +.if ${PORT_OPTIONS:MGRAPHVIZ} depend+= dot:${PORTSDIR}/graphics/graphviz .endif -.if defined(WITH_DOXYGEN) +.if ${PORT_OPTIONS:MDOXYGEN} depend+= doxygen:${PORTSDIR}/devel/doxygen .endif @@ -86,7 +84,7 @@ pre-install: ${FIND} -s bitmaps -type f | ${SED} "s,^,%%DATADIR%%/," >> ${PLIST}; \ ${FIND} -s -d bitmaps -type d | ${SED} "s,^,@dirrm %%DATADIR%%/," >> ${PLIST} \ ) -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @(cd ${WRKSRC}; \ ${FIND} -s doc/ -type f | ${SED} "s,^doc/,%%DOCSDIR%%/," >> ${PLIST}; \ ${FIND} -s -d doc/ -type d | ${SED} "s,^doc/,@dirrm %%DOCSDIR%%/," >> ${PLIST} \ @@ -127,7 +125,7 @@ do-install: ${FIND} . -type d -exec ${MKDIR} ${DATADIR}/bitmaps/{} \; ;\ ${FIND} . -type f | ${XARGS} -I% ${INSTALL_DATA} % ${DATADIR}/bitmaps/% \ ) -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @(cd ${WRKSRC}/doc;\ ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; ;\ ${FIND} . -type f | ${XARGS} -I% ${INSTALL_DATA} % ${DOCSDIR}/% \ Modified: head/science/paraview/Makefile ============================================================================== --- head/science/paraview/Makefile Sun Apr 28 21:57:02 2013 (r316756) +++ head/science/paraview/Makefile Sun Apr 28 22:08:22 2013 (r316757) @@ -51,8 +51,9 @@ CMAKE_ARGS+= -DPARAVIEW_USE_SYSTEM_HDF5= # -DPARAVIEW_ENABLE_PYTHON:BOOL=ON # -DVTK_PYTHON_SETUP_ARGS:STRING='--prefix="${PREFIX}"' \ -OPTIONS= OSMESA "Use Mesa for off-screen rendering" Off \ - GL2PS "Install support conversion OpenGL to PostScript" On +OPTIONS_DEFINE= OSMESA GL2PS DOCS +OSMESA_DESC= Use Mesa for off-screen rendering +GL2PS_DESC= Install support conversion OpenGL to PostScript # VTKMPEG2 "Install patented MPEG2 encoder module" Off \ VERMAJORMINOR= ${PORTVERSION:R} @@ -60,20 +61,20 @@ VERMAJORMINOR= ${PORTVERSION:R} .include # Simple solution to avoid lots of patching to support NOPORTDOCS -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} CMAKE_ARGS+= -DPV_INSTALL_DOC_DIR=${DOCSDIR} .else CMAKE_ARGS+= -DPV_INSTALL_DOC_DIR=${WRKDIR} .endif -.if defined(WITH_OSMESA) +.if ${PORT_OPTIONS:MOSMESA} LIB_DEPENDS+= OSMesa32.7:${PORTSDIR}/graphics/libosmesa CMAKE_ARGS+= -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ -DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \ -DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa32.so .endif -.if defined(WITH_GL2PS) +.if ${PORT_OPTIONS:MGL2PS} LIB_DEPENDS+= gl2ps.1:${PORTSDIR}/print/gl2ps CMAKE_ARGS+= -DVTK_USE_GL2PS:BOOL=ON PLIST_SUB+= GL2PS="" Modified: head/science/xmds/Makefile ============================================================================== --- head/science/xmds/Makefile Sun Apr 28 21:57:02 2013 (r316756) +++ head/science/xmds/Makefile Sun Apr 28 22:08:22 2013 (r316757) @@ -1,9 +1,5 @@ -# New ports collection makefile for: xmds -# Date created: 2006-07-17 -# Whom: EelVex -# +# Created by: EelVex # $FreeBSD$ -# PORTNAME= xmds PORTVERSION= 1.6 @@ -16,13 +12,14 @@ COMMENT= XMDS is a code generator that i MAN1= loadxsil.1 xmds.1 xsil2graphics.1 -OPTIONS= FFTW3 "Use fftw3 instead of fftw2" Off +OPTIONS_DEFINE= FFTW3 +FFTW3_DESC= Use fftw3 instead of fftw2 GNU_CONFIGURE= yes -.include +.include -.if defined(WITH_FFTW3) +.if ${PORT_OPTIONS:MFFTW3} BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 CONFIGURE_ARGS= --enable-fftw3 --with-fftw3-path=${LOCALBASE} .else @@ -30,4 +27,4 @@ BUILD_DEPENDS= ${LOCALBASE}/include/fftw CONFIGURE_ARGS= --with-fftw-path=${LOCALBASE} .endif -.include +.include