svn commit: r319993 - in head/math: atlas cblas crlibm givaro gotoblas isabelle jsmath lapack lapacke levmar
Baptiste Daroussin
bapt at FreeBSD.org
Wed Jun 5 14:11:22 UTC 2013
Author: bapt
Date: Wed Jun 5 14:11:19 2013
New Revision: 319993
URL: http://svnweb.freebsd.org/changeset/ports/319993
Log:
Convert to new options framework
Modified:
head/math/atlas/Makefile
head/math/cblas/Makefile
head/math/crlibm/Makefile
head/math/givaro/Makefile
head/math/gotoblas/Makefile
head/math/isabelle/Makefile
head/math/jsmath/Makefile
head/math/lapack/Makefile
head/math/lapacke/Makefile
head/math/levmar/Makefile
Modified: head/math/atlas/Makefile
==============================================================================
--- head/math/atlas/Makefile Wed Jun 5 13:59:19 2013 (r319992)
+++ head/math/atlas/Makefile Wed Jun 5 14:11:19 2013 (r319993)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: atlas
-# Date created: 12 February 2001
-# Whom: Nakata Maho <maho at FreeBSD.org>
-#
+# Created by: Nakata Maho <maho at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= atlas
PORTVERSION= 3.8.4
@@ -26,11 +22,15 @@ USE_FORTRAN= yes
CONFLICTS= atlas-devel-[0-9]* cblas-[0-9]*
MANUAL_PACKAGE_BUILD= Optimizes for the local machine.
-OPTIONS= ARCHDEF "Use a specified architectural default" off \
- SHARED "Build static PIC archives and shared libraries" on \
- STATIC "Build static (non-PIC) archives" off \
- TSC "If WALL_TIMER is enabled, use the TSC" off \
- WALL_TIMER "Use less robust timing with higher resolution" off
+OPTIONS_DEFINE= ARCHDEF TSC WALL_TIMER
+OPTIONS_DEFAULT= SHARED
+OPTIONS_MULTI= BUILDTYPE
+OPTIONS_MULTI_BUILDTYPE= SHARED STATIC
+ARCHDEF_DESC= Use a specified architectural default
+SHARED_DESC= Build static PIC archives and shared libraries
+STATIC_DESC= Build static (non-PIC) archives
+TSC_DESC= If WALL_TIMER is enabled, use the TSC
+WALL_TIMER_DESC= Use less robust timing with higher resolution
PORTSCOUT= limitw:1,even
WRKSRC= ${WRKDIR}/ATLAS
@@ -63,7 +63,7 @@ PORT${i}= *
. endif
.endfor
-.if defined(WITH_ARCHDEF)
+.if ${PORT_OPTIONS:MARCHDEF}
. if defined(ARCHDEF)
. if ${ARCHDEF} == "NONE"
ARCHDEFFLAG= -Si archdef 0
@@ -73,14 +73,12 @@ IGNORE = : You have set WITH_ARCHDEF, bu
. endif
.endif
-.if defined(WITH_SHARED)
+.if ${PORT_OPTIONS:MSHARED}
USE_LDCONFIG= yes
-.elifndef(WITH_STATIC)
-IGNORE = : You must select at least one of WITH_SHARED and WITH_STATIC
.endif
.for opt in SHARED STATIC
-. if defined(WITH_${opt})
+. if ${PORT_OPTIONS:M${opt}}
PLIST_SUB+= ${opt}=""
. else
PLIST_SUB+= ${opt}="@comment "
@@ -151,7 +149,7 @@ post-configure:
do-build:
.for opt in shared static
-. if defined(WITH_${opt:U})
+. if ${PORT_OPTIONS:M${opt:U}}
@${ECHO_CMD} "Building the LAPACK archives with ${opt} ATLAS flags:"
F77FLAGS="`${MAKE} -f ${WRKSRC}/saved_flags -V F77FLAGS` ${EXTRA_FFLAGS}" ; \
LW=`${MAKE} -C ${PORTSDIR}/math/lapack -V ${${opt:U}_LAPACK_WRKSRC}` ; \
@@ -195,13 +193,13 @@ L2= -Wl,--no-whole-archive -Wl,--as-need
post-build:
.for opt in shared static
-. if defined(WITH_${opt:U})
+. if ${PORT_OPTIONS:M${opt:U}}
@${ECHO_CMD} "Timing ${opt} ATLAS:"
@cd ${WRKSRC}/${opt} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} time ; \
cd ARCHS ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ArchNew tarfile
. endif
.endfor
-.if defined(WITH_SHARED)
+.if ${PORT_OPTIONS:MSHARED}
@${ECHO_CMD} "Building ATLAS shared libraries:"
@F77FLAGS="`${MAKE} -f ${WRKSRC}/saved_flags -V F77FLAGS` ${EXTRA_FFLAGS}" ; \
cd ${WRKSRC}/shared/lib ; \
@@ -219,7 +217,7 @@ SHARED_BLAS= -L${LOCALBASE}/lib -lblas
check regression-test test: build
. for opt in shared static
-. if defined(WITH_${opt:U})
+. if ${PORT_OPTIONS:M${opt:U}}
@${ECHO_CMD} "Testing ${opt} ATLAS:"
@cd ${WRKSRC}/${opt} ; ${SETENV} ${MAKE_ENV} BLAS="${${opt:U}_BLAS}" \
${MAKE} ${MAKE_ARGS} check ptcheck error_report
@@ -229,10 +227,10 @@ check regression-test test: build
do-install:
.for i in libatlas libcblas libf77blas liblapack libptcblas libptf77blas
-. if defined(WITH_STATIC)
+. if ${PORT_OPTIONS:MSTATIC}
@${INSTALL_DATA} ${WRKSRC}/static/lib/${i}.a ${PREFIX}/lib/${i:S|lapack|alapack|}.a
. endif
-. if defined(WITH_SHARED)
+. if ${PORT_OPTIONS:MSHARED}
@${INSTALL_DATA} ${WRKSRC}/shared/lib/${i}.a ${PREFIX}/lib/${i:S|lapack|alapack|}_pic.a
@${INSTALL_DATA} ${WRKSRC}/shared/lib/${i:S|lapack|alapack|}.so.2 ${PREFIX}/lib
@${LN} -sf ${i:S|lapack|alapack|}.so.2 ${PREFIX}/lib/${i:S|lapack|alapack|}.so
@@ -241,7 +239,7 @@ do-install:
@${INSTALL_DATA} ${WRKSRC}/include/cblas.h ${PREFIX}/include
@${INSTALL_DATA} ${WRKSRC}/include/clapack.h ${PREFIX}/include
.for opt in shared static
-. if defined(WITH_${opt:U})
+. if ${PORT_OPTIONS:M${opt:U}}
@${MKDIR} ${PREFIX}/include/atlas/${opt}
@${INSTALL_DATA} ${WRKSRC}/${opt}/include/* ${PREFIX}/include/atlas/${opt}
@cd ${PREFIX} ; \
@@ -256,7 +254,7 @@ do-install:
. endif
.endfor
@${ECHO_CMD} "@dirrm include/atlas" >> ${TMPPLIST}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
.endif
Modified: head/math/cblas/Makefile
==============================================================================
--- head/math/cblas/Makefile Wed Jun 5 13:59:19 2013 (r319992)
+++ head/math/cblas/Makefile Wed Jun 5 14:11:19 2013 (r319993)
@@ -1,20 +1,11 @@
-# ex:ts=8
-# Ports collection makefile for: cblas
-# Date created: 6 January 2012
-# Whom: bf at FreeBSD.org
-#
+# Created by: bf at FreeBSD.org
# $FreeBSD$
-#
PORTNAME= cblas
PORTVERSION= 1.0
CATEGORIES= math
MASTER_SITES= NL/blas/blast-forum/ LOCAL/bf
DISTFILES= cblas.tgz
-.if make(makesum) || !defined(NOPORTDOCS)
-DISTFILES+= blas-report.pdf
-EXTRACT_ONLY= cblas.tgz
-.endif
MAINTAINER= bf at FreeBSD.org
COMMENT= Reference implementation of the C interface to the legacy Fortran BLAS
@@ -25,9 +16,11 @@ USE_FORTRAN= yes
CONFLICTS_INSTALL= atlas-[0-9]* atlas-devel-[0-9]*
-OPTIONS= PROFILE "Build profiling libraries" Off \
- SHARED "Build shared libraries and PIC archives" On \
- STATIC "Build (non-PIC) archives" On
+OPTIONS_DEFINE= PROFILE SHARED STATIC
+OPTIONS_DEFAULT= SHARED STATIC
+PROFILE_DESC= Build profiling libraries
+SHARED_DESC= Build shared libraries and PIC archives
+STATIC_DESC= Build (non-PIC) archives
PLIST_FILES= include/cblas.h include/cblas_f77.h
PLIST_SUB= SVERSION="${SVERSION}"
@@ -41,6 +34,11 @@ WRKSRC_STATIC= ${WRKSRC}
.include <bsd.port.options.mk>
+.if make(makesum) || ${PORT_OPTIONS:MDOCS}
+DISTFILES+= blas-report.pdf
+EXTRACT_ONLY= cblas.tgz
+.endif
+
MANGLING?= -DADD_
CFLAGS+= ${MANGLING}
@@ -53,16 +51,16 @@ PICFLAG?= -fpic
FLAGS_PROFILE?= -pg
FLAGS_SHARED ?= ${PICFLAG}
-.if defined(WITH_SHARED)
+.if ${PORT_OPTIONS:MSHARED}
PLIST_FILES+= lib/libcblas_pic.a lib/libcblas.so lib/libcblas.so.${SVERSION}
TESTS ?= test-shared
USE_LDCONFIG= yes
.endif
-.if defined(WITH_STATIC)
+.if ${PORT_OPTIONS:MSTATIC}
PLIST_FILES+= lib/libcblas.a
TESTS ?= test-static
.endif
-.if defined(WITH_PROFILE)
+.if ${PORT_OPTIONS:MPROFILE}
PLIST_FILES+= lib/libcblas_p.a
TESTS ?= test-profile
.endif
@@ -75,7 +73,7 @@ post-patch:
${WRKSRC}/Makefile.LINUX > ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's@$$(ARCH)@$$(AR)@' ${WRKSRC}/src/Makefile
.for o in PROFILE SHARED
-.if defined(WITH_${o})
+.if ${PORT_OPTIONS:M${o}}
@${CP} -a ${WRKSRC} ${WRKSRC_${o}}
.endif
.endfor
@@ -84,7 +82,7 @@ do-build: build-profile build-shared bui
.for o in PROFILE SHARED STATIC
build-${o:L}: patch
-.if defined(WITH_${o})
+.if ${PORT_OPTIONS:M${o}}
@${PRINTF} "\n\nBuilding ${o:L} libraries:\n\n\n"
@cd ${WRKSRC_${o}}/src; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FLAGS_${o}}" \
${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} all
@@ -93,7 +91,7 @@ build-${o:L}: patch
.endfor
post-build:
-.if defined(WITH_SHARED)
+.if ${PORT_OPTIONS:MSHARED}
cd ${WRKSRC_SHARED}/lib ; ${FC} ${FFLAGS} ${FFLAGS_SHARED} ${LDFLAGS} -shared \
-o libcblas.so.${SVERSION} -Wl,-x -Wl,-soname,libcblas.so.${SVERSION} \
-Wl,--whole-archive libcblas.a -Wl,--no-whole-archive
@@ -108,7 +106,7 @@ check regression-test test: ${TESTS}
.for o in PROFILE SHARED STATIC
test-${o:L}: build-${o:L}
-.if defined(WITH_${o})
+.if ${PORT_OPTIONS:M${o}}
@${PRINTF} "\n\nTesting ${o:L} libraries:\n\n\n"
@cd ${WRKSRC_${o}}/testing; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FLAGS_${o}}" \
${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} all run
@@ -120,15 +118,15 @@ test-${o:L}: build-${o:L}
do-install:
@${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include
-.if defined(WITH_STATIC)
+.if ${PORT_OPTIONS:MSTATIC}
@${INSTALL_DATA} ${WRKSRC}/lib/libcblas.a ${PREFIX}/lib
.endif
-.if defined(WITH_SHARED)
+.if ${PORT_OPTIONS:MSHARED}
@${INSTALL_DATA} ${WRKSRC_SHARED}/lib/libcblas.a ${PREFIX}/lib/libcblas_pic.a
@${INSTALL_DATA} ${WRKSRC_SHARED}/lib/libcblas.so.${SVERSION} ${PREFIX}/lib
@${LN} -sf libcblas.so.${SVERSION} ${PREFIX}/lib/libcblas.so
.endif
-.if defined(WITH_PROFILE)
+.if ${PORT_OPTIONS:MPROFILE}
@${INSTALL_DATA} ${WRKSRC_PROFILE}/lib/libcblas.a ${PREFIX}/lib/libcblas_p.a
.endif
Modified: head/math/crlibm/Makefile
==============================================================================
--- head/math/crlibm/Makefile Wed Jun 5 13:59:19 2013 (r319992)
+++ head/math/crlibm/Makefile Wed Jun 5 14:11:19 2013 (r319993)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: crlibm
-# Date created: 10 January 2012
-# Whom: bf at FreeBSD.org
-#
+# Created by: bf at FreeBSD.org
# $FreeBSD$
-#
PORTNAME= crlibm
DISTVERSION= 1.0beta4
@@ -13,9 +9,6 @@ MASTER_SITES= http://lipforge.ens-lyon.f
LOCAL/bf/crlibm:4
MASTER_SITE_SUBDIR= 162/:1 153/:2 154/:3
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:1,4
-.if make(makesum) || !defined(NOPORTDOCS)
-DISTFILES+= crlibm-1.0beta3.pdf:2,4 tripledoubleprocedures-1.0beta3.pdf:3,4
-.endif
DIST_SUBDIR= crlibm
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@@ -28,9 +21,14 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-OPTIONS= "TEST" "Include all test capabilities (requires MPFR)" "on"
+OPTIONS_DEFINE= TEST
+OPTIONS_DEFAULT= TEST
+TEST_DESC= Include all test capabilities (requires MPFR)
.include <bsd.port.options.mk>
+.if make(makesum) || ${PORT_OPTIONS:MDOCS}
+DISTFILES+= crlibm-1.0beta3.pdf:2,4 tripledoubleprocedures-1.0beta3.pdf:3,4
+.endif
post-patch:
#7-STABLE has log2() in libm after r226457 on 17 Oct 2011, but
@@ -48,7 +46,7 @@ CFLAGS+= -msse2 -mfpmath=sse
CONFIGURE_ARGS+= --enable-sse2
.endif
-.if defined(WITH_TEST)
+.if ${PORT_OPTIONS:MTEST}
CONFIGURE_ARGS+= --enable-mpfr
LIB_DEPENDS+= mpfr.4:${PORTSDIR}/math/mpfr
.else
@@ -59,7 +57,7 @@ check regression-test test: build
@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
${MAKE_ARGS} check
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
PORTDOCS= ${DISTFILES:C|\:.*||:M*.pdf}
post-install:
Modified: head/math/givaro/Makefile
==============================================================================
--- head/math/givaro/Makefile Wed Jun 5 13:59:19 2013 (r319992)
+++ head/math/givaro/Makefile Wed Jun 5 14:11:19 2013 (r319993)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: givaro
-# Date created: 5 Oct 2011
-# Whom: b.f. <bf at FreeBSD.org>
-#
+# Created by: b.f. <bf at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= givaro
PORTVERSION= 3.5.0
@@ -28,7 +24,7 @@ USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
-.if defined(WITH_DOCS) && !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS) && !defined(NOPORTDOCS}
BUILD_DEPENDS += doxygen:${PORTSDIR}/devel/doxygen
CONFIGURE_ARGS+= --enable-doc --with-docdir="${DOCSDIR}"
.elifndef(NOPORTDOCS)
@@ -46,11 +42,11 @@ post-patch:
-e '/^WARN_CFLAGS="-Wall"/d' \
-e '/if test "x$$WARN" = "xyes"/s/$$/ WARN_CFLAGS="-Wall" ;/' \
${WRKSRC}/configure
-.if defined(WITH_DOCS) && !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS) && !defined(NOPORTDOCS}
@${REINPLACE_CMD} -e 's/sed -i/& ""/' ${WRKSRC}/docs/Makefile.in
.endif
-.if defined(WITH_DOCS) && !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS) && !defined(NOPORTDOCS}
post-install:
@${TOUCH} ${DOCSDIR}/givaro-dev-html/.keep-me
Modified: head/math/gotoblas/Makefile
==============================================================================
--- head/math/gotoblas/Makefile Wed Jun 5 13:59:19 2013 (r319992)
+++ head/math/gotoblas/Makefile Wed Jun 5 14:11:19 2013 (r319993)
@@ -1,9 +1,5 @@
-# Ports collection makefile for: gotoblas
-# Date created: 20070203
-# Whom: Sato Hiroki <hrs at FreeBSD.org>
-#
+# Created by: Sato Hiroki <hrs at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= gotoblas
PORTVERSION= 2.${GOTOBLAS2VER}.${LAPACKVER}
@@ -42,15 +38,16 @@ SUB_FILES= pkg-message
SUB_LIST= MAXTHREADS=${MAXTHREADS}
.if defined(PACKAGE_BUILDING)
-DYNAMIC_ARCH_DEFAULT= on
-.else
-DYNAMIC_ARCH_DEFAULT= off
+OPTIONS_DEFAULT_i386= DYNAMIC_ARCH
+OPTIONS_DEFAULT_amd64= DYNAMIC_ARCH
.endif
-OPTIONS= DYNAMIC_ARCH "Support multiple CPU types on i386 and amd64" \
- ${DYNAMIC_ARCH_DEFAULT} \
- INTERFACE64 "Use 8 byte integers on 64-bit architectures" off \
- OPENMP "Use OpenMP for threading" off
+OPTIONS_DEFINE_i386= DYNAMIC_ARCH
+OPTIONS_DEFINE_amd64= DYNAMIC_ARCH
+OPTIONS_DEFINE= INTERFACE64 OPENMP
+DYNAMIC_ARCH_DESC= Support multiple CPU types on i386 and amd64
+INTERFACE64_DESC= Use 8 byte integers on 64-bit architectures
+OPENMP_DESC= Use OpenMP for threading
# QUAD_PRECISION "Support IEEE quad precision (experimental)" off
.include <bsd.port.pre.mk>
@@ -63,23 +60,19 @@ GOTOFLAGS+= BINARY32=1
GOTOFLAGS+= BINARY64=1
.endif
-.if ! ( defined(WITH_DYNAMIC_ARCH) && ( ${ARCH} == "amd64" || ${ARCH} == "i386" ) )
-MANUAL_PACKAGE_BUILD= Optimizes for the build machine.
-.endif
-
-.if defined(WITH_DYNAMIC_ARCH)
+.if ${PORT_OPTIONS:MDYNAMIC_ARCH}
GOTOFLAGS+= DYNAMIC_ARCH=1
.endif
-.if defined(WITH_INTERFACE64)
+.if ${PORT_OPTIONS:MINTERFACE64}
GOTOFLAGS+= INTERFACE64=1
.endif
-.if defined(WITH_OPENMP)
+.if ${PORT_OPTIONS:MOPENMP}
GOTOFLAGS+= USE_OPENMP=1
.endif
-.if defined(WITH_QUAD_PRECISION)
+.if ${PORT_OPTIONS:MQUAD_PRECISION}
BROKEN = WITH_QUAD_PRECISION is broken; please disable this option
GOTOFLAGS+= QUAD_PRECISION=1
.endif
@@ -112,7 +105,7 @@ post-patch:
-e 's+%%_GCC_RUNTIME%%+${_GCC_RUNTIME}+' \
-e 's+$$(CROSS_SUFFIX)+${LOCALBASE}/bin/+' \
${WRKSRC}/Makefile.system
-.if defined(WITH_OPENMP)
+.if ${PORT_OPTIONS:MOPENMP}
${REINPLACE_CMD} -e "s+GOTO_NUM_THREADS+OMP_NUM_THREADS+g" \
${WRKSRC}/test/Makefile \
${WRKSRC}/ctest/Makefile
@@ -128,12 +121,12 @@ do-build:
USE_THREAD=1 ${GMAKE} ${MAKE_ARGS}
${CP} ${WRKSRC}/libgoto2.a ${WRKDIR}/lib/libgoto2p.a
${CP} ${WRKSRC}/libgoto2.so ${WRKDIR}/lib/libgoto2p.so.1
-.if !defined(WITH_DEBUG)
+.if ! ${PORT_OPTIONS:MDEBUG}
${LOCALBASE}/bin/strip -X ${WRKDIR}/lib/*.so.1
.endif
BENCHMARK_MAXTHREADS?= ${MAXTHREADS}
-.if defined(WITH_OPENMP)
+.if ${PORT_OPTIONS:MOPENMP}
BENCHMARK_THREADS_FLAG = OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS}
.else
BENCHMARK_THREADS_FLAG = GOTO_NUM_THREADS=${BENCHMARK_MAXTHREADS}
Modified: head/math/isabelle/Makefile
==============================================================================
--- head/math/isabelle/Makefile Wed Jun 5 13:59:19 2013 (r319992)
+++ head/math/isabelle/Makefile Wed Jun 5 14:11:19 2013 (r319993)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: isabelle
-# Date created: 08 August 2005
-# Whom: Timothy Bourke <timbob at bigpond.com>
-#
+# Created by: Timothy Bourke <timbob at bigpond.com>
# $FreeBSD$
-#
PORTNAME= isabelle
PORTVERSION= 2009.2
@@ -12,31 +8,36 @@ MASTER_SITES= http://isabelle.in.tum.de/
http://www.cl.cam.ac.uk/Research/HVG/Isabelle/dist/ \
http://mirror.cse.unsw.edu.au/pub/isabelle/dist/
DISTNAME= Isabelle2009-2
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
DISTFILES= ${DISTNAME}.tar.gz \
${DISTNAME}_library.tar.gz
.endif
MAINTAINER= beyert at cs.ucr.edu
-COMMENT= A generic proof assistant
+COMMENT= Generic proof assistant
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-OPTIONS= POLYML "Use Poly/ML (fast but broken) instead of SML/NJ" off
-OPTIONS+= RLWRAP "Use rlwrap as line editor" on
-OPTIONS+= LEDIT "Use ledit as line editor" off
-OPTIONS+= HOL_ALGEBRA "Build optional heap: HOL-Algebra" off
-OPTIONS+= HOL_NOMINAL "Build optional heap: HOL-Nominal" off
-OPTIONS+= HOL_NSA "Build optional heap: HOL-NSA" off
-OPTIONS+= HOL_WORD "Build optional heap: HOL-Word" off
-OPTIONS+= HOL_TLA "Build optional heap: TLA" off
-OPTIONS+= HOL_HOL4 "Build optional heap: HOL4" off
-OPTIONS+= EMACS_PKG "Build with Emacs Packages" off
+OPTIONS_DEFINE= POLYML RLWRAP LEDIT HOL_ALGEBRA HOL_NOMINAL HOL_NSA HOL_WORD \
+ HOL_TLA HOL_HOL4 EMACS_PKG
+OPTIONS_DEFAULT= RLWRAP
+POLYML_DESC= Use Poly/ML (fast but broken) instead of SML/NJ
+RLWRAP_DESC= Use rlwrap as line editor
+LEDIT_DESC= Use ledit as line editor
+HOL_ALGEBRA_DESC= Build optional heap: HOL-Algebra
+HOL_NOMINAL_DESC= Build optional heap: HOL-Nominal
+HOL_NSA_DESC= Build optional heap: HOL-NSA
+HOL_WORD_DESC= Build optional heap: HOL-Word
+HOL_TLA_DESC= Build optional heap: TLA
+HOL_HOL4_DESC= Build optional heap: HOL4
+EMACS_PKG_DESC= Build with Emacs Packages
USE_PERL5= yes
-.if defined(WITH_EMACS_PKG)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MEMACS_PKG}
USE_EMACS= yes # for EMACS_SITE_LISPDIR
EMACS_NO_BUILD_DEPENDS=yes
EMACS_NO_RUN_DEPENDS=yes
@@ -51,11 +52,11 @@ DOCFILES= Contents *.pdf *.eps *.ps *.dv
.include <bsd.port.pre.mk>
-.if defined(WITH_RLWRAP)
+.if ${PORT_OPTIONS:MRLWRAP}
RUN_DEPENDS+= rlwrap:${PORTSDIR}/devel/rlwrap
LINE_EDIT= "${PREFIX}/bin/rlwrap"
.else
-.if defined(WITH_LEDIT)
+.if ${PORT_OPTIONS:MLEDIT}
RUN_DEPENDS+= ledit:${PORTSDIR}/sysutils/ledit
LINE_EDIT= "${PREFIX}/bin/ledit"
.else
@@ -63,44 +64,44 @@ LINE_EDIT= ""
.endif
.endif
-.if defined(WITH_HOL_ALGEBRA)
+.if ${PORT_OPTIONS:MHOL_ALGEBRA}
HEAP_HOL_ALGEBRA=""
EXTRA_HOL+=-m HOL-Algebra
.else
HEAP_HOL_ALGEBRA="@comment "
.endif
-.if defined(WITH_HOL_NOMINAL)
+.if ${PORT_OPTIONS:MHOL_NOMINAL}
HEAP_HOL_NOMINAL=""
EXTRA_HOL+=-m HOL-Nominal
.else
HEAP_HOL_NOMINAL="@comment "
.endif
-.if defined(WITH_HOL_NSA)
+.if ${PORT_OPTIONS:MHOL_NSA}
HEAP_HOL_NSA=""
EXTRA_HOL+=-m HOL-NSA
.else
HEAP_HOL_NSA="@comment "
.endif
-.if defined(WITH_HOL_WORD)
+.if ${PORT_OPTIONS:MHOL_WORD}
HEAP_HOL_WORD=""
EXTRA_HOL+=-m HOL-Word
.else
HEAP_HOL_WORD="@comment "
.endif
-.if defined(WITH_HOL_TLA)
+.if ${PORT_OPTIONS:MHOL_TLA}
HEAP_HOL_TLA=""
EXTRA_HOL+=-m TLA
.else
HEAP_HOL_TLA="@comment "
.endif
-.if defined(WITH_HOL_HOL4)
+.if ${PORT_OPTIONS:MHOL_HOL4}
HEAP_HOL_HOL4=""
EXTRA_HOL+=-m HOL4
.else
HEAP_HOL_HOL4="@comment "
.endif
-.if !defined(WITH_POLYML)
+.if ! ${PORT_OPTIONS:MPOLYML}
ML_SYSTEM= smlnj-110
ML_HOME= ${LOCALBASE}/smlnj/bin
ML_OPTIONS= -Ccontrol.poly-eq-warn=false @SMLdebug=/dev/null
@@ -119,7 +120,7 @@ PLIST_SUB+= HEAPSUBDIR=${ML_SYSTEM}_${ML
HEAP_HOL_WORD=${HEAP_HOL_WORD} \
HEAP_HOL_TLA=${HEAP_HOL_TLA} \
HEAP_HOL_HOL4=${HEAP_HOL_HOL4}
-.if !defined(WITH_POLYML)
+.if ! ${PORT_OPTIONS:MPOLYML}
BUILD_DEPENDS+= smlnj-devel>=110.71:${PORTSDIR}/lang/sml-nj-devel
MAKE_ENV+= SMLNJ_DEVEL=yes
.else
@@ -159,7 +160,7 @@ post-install:
${WRKSRC}/bin/isabelle install \
-d ${PREFIX}/share/isabelle \
-p ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
.for file in ${DOCFILES}
${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
Modified: head/math/jsmath/Makefile
==============================================================================
--- head/math/jsmath/Makefile Wed Jun 5 13:59:19 2013 (r319992)
+++ head/math/jsmath/Makefile Wed Jun 5 14:11:19 2013 (r319993)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: jsMath
-# Date created: 2006-02-23
-# Whom: Nicola Vitale <nivit at email.it>
-#
+# Created by: Nicola Vitale <nivit at email.it>
# $FreeBSD$
-#
PORTNAME= jsMath
DISTVERSION= 3.6e
@@ -16,15 +12,17 @@ COMMENT= JavaScript tool for including m
USE_ZIP= yes
NO_BUILD= yes
-OPTIONS= IMAGE_FONTS "Enable image fonts" On \
- SPRITE_FONTS "Enable sprite fonts" Off
+OPTIONS_DEFINE= IMAGE_FONTS SPRITE_FONTS
+OPTIONS_DEFAULT= IMAGE_FONTS
+IMAGE_FONTS_DESC= Image fonts
+SPRITE_FONTS_DESC= Sprite fonts
.include <bsd.port.pre.mk>
-.if defined(WITH_IMAGE_FONTS)
+.if ${PORT_OPTIONS:MIMAGE_FONTS}
RUN_DEPENDS+= ${WWWDIR}/fonts/cm-fonts/alpha/def.js:${PORTSDIR}/math/jsmath-fonts
.endif
-.if defined(WITH_SPRITE_FONTS)
+.if ${PORT_OPTIONS:MSPRITE_FONTS}
RUN_DEPENDS+= ${WWWDIR}/fonts-sprite/cm-fonts/font.js:${PORTSDIR}/math/jsmath-fonts-sprite
.endif
Modified: head/math/lapack/Makefile
==============================================================================
--- head/math/lapack/Makefile Wed Jun 5 13:59:19 2013 (r319992)
+++ head/math/lapack/Makefile Wed Jun 5 14:11:19 2013 (r319993)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: lapack
-# Date created: 2 July 1994
-# Whom: jmz
-#
+# Created by: jmz
# $FreeBSD$
-#
PORTNAME?= lapack
PORTVERSION= 3.4.2
@@ -23,9 +19,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USE_FORTRAN= yes
-OPTIONS= PROFILE "Build profiling libraries" Off \
- SHARED "Build shared libraries and PIC archives" On \
- STATIC "Build (non-PIC) archives" On
+OPTIONS_DEFINE= PROFILE SHARED STATIC
+OPTIONS_DEFAULT= SHARED STATIC
+PROFILE_DESC= Build profiling libraries
+SHARED_DESC= Build shared libraries and PIC archives
+STATIC_DESC= Build (non-PIC) archives
MAKE_ENV= BLASLIB="${BLASLIB}"
MAKE_JOBS_SAFE= yes
@@ -82,17 +80,17 @@ PICFLAG?= -fpic
FFLAGS_PROFILE?= -pg
FFLAGS_SHARED ?= ${PICFLAG}
-.if defined(WITH_PROFILE) && !exists(/usr/lib/libc_p.a)
+.if ${PORT_OPTIONS:MPROFILE) && !exists(/usr/lib/libc_p.a}
IGNORE= you have chosen WITH_PROFILE, but have not installed the\
base system profiling libraries
.endif
-.if defined(WITH_SHARED)
+.if ${PORT_OPTIONS:MSHARED}
USE_LDCONFIG= yes
.endif
.for o in PROFILE SHARED STATIC
-.if defined(WITH_${o})
+.if ${PORT_OPTIONS:M${o}}
PLIST_SUB+= ${o}=""
.else
PLIST_SUB+= ${o}="@comment "
@@ -110,7 +108,7 @@ post-patch:
@${REINPLACE_CMD} -e 's@\./lapack_testing\.py@${S} &@' \
${WRKSRC}/Makefile
.for o in PROFILE SHARED
-.if defined(WITH_${o})
+.if ${PORT_OPTIONS:M${o}}
@${CP} -a ${WRKSRC} ${WRKSRC_${o}}
.endif
.endfor
@@ -119,7 +117,7 @@ do-build: ${MAN_TARGET} build-profile bu
.for o in PROFILE SHARED STATIC
build-${o:L}: patch
-.if defined(WITH_${o})
+.if ${PORT_OPTIONS:M${o}}
${PRINTF} "\n\nBuilding ${o:L} libraries:\n\n\n"
cd ${WRKSRC_${o}}; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FFLAGS_${o}}" \
${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" ${ALL_TARGET}
@@ -135,7 +133,7 @@ build-manpages: patch
.endif
post-build:
-.if defined(WITH_SHARED)
+.if ${PORT_OPTIONS:MSHARED}
.for L in ${LIBS}
cd ${WRKSRC_SHARED} ; ${FC} ${FFLAGS} ${FFLAGS_SHARED} ${LDFLAGS} -shared \
-o lib${P}${L}.so.${SVERSION} -Wl,-x -Wl,-soname,lib${P}${L}.so.${SVERSION} \
@@ -143,11 +141,11 @@ post-build:
.endfor
.endif
-.if defined(WITH_SHARED)
+.if ${PORT_OPTIONS:MSHARED}
TESTS ?= test-shared
-.elif defined(WITH_STATIC)
+.elif ${PORT_OPTIONS:MSTATIC}
TESTS ?= test-static
-.elif defined(WITH_PROFILE)
+.elif ${PORT_OPTIONS:MPROFILE}
TESTS ?= test-profile
.endif
@@ -155,7 +153,7 @@ check regression-test test: ${TESTS}
.for o in PROFILE SHARED STATIC
test-${o:L}: build-${o:L}
-.if defined(WITH_${o})
+.if ${PORT_OPTIONS:M${o}}
@${PRINTF} "\n\nTesting ${o:L} libraries:\n\n\n"
@cd ${WRKSRC_${o}}; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FFLAGS_${o}}" \
${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" ${TEST_TARGET}
@@ -168,15 +166,15 @@ test-${o:L}: build-${o:L}
do-install:
.for L in ${LIBS}
-.if defined(WITH_STATIC)
+.if ${PORT_OPTIONS:MSTATIC}
@${INSTALL_DATA} ${WRKSRC}/lib${L}.a ${PREFIX}/lib/lib${P}${L}.a
.endif
-.if defined(WITH_SHARED)
+.if ${PORT_OPTIONS:MSHARED}
@${INSTALL_DATA} ${WRKSRC_SHARED}/lib${L}.a ${PREFIX}/lib/lib${P}${L}_pic.a
@${INSTALL_DATA} ${WRKSRC_SHARED}/lib${P}${L}.so.${SVERSION} ${PREFIX}/lib
@${LN} -sf lib${P}${L}.so.${SVERSION} ${PREFIX}/lib/lib${P}${L}.so
.endif
-.if defined(WITH_PROFILE)
+.if ${PORT_OPTIONS:MPROFILE}
@${INSTALL_DATA} ${WRKSRC_PROFILE}/lib${L}.a ${PREFIX}/lib/lib${P}${L}_p.a
.endif
.endfor
Modified: head/math/lapacke/Makefile
==============================================================================
--- head/math/lapacke/Makefile Wed Jun 5 13:59:19 2013 (r319992)
+++ head/math/lapacke/Makefile Wed Jun 5 14:11:19 2013 (r319993)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: lapacke
-# Date created: 17 Feb 2011
-# Whom: Eijiro Shibusawa <ej-sib at ice.uec.ac.jp>
-#
+# Created by: Eijiro Shibusawa <ej-sib at ice.uec.ac.jp>
# $FreeBSD$
-#
PORTNAME= lapacke
PORTVERSION= 3.4.0
@@ -24,8 +20,9 @@ USE_LDCONFIG= yes
USE_FORTRAN= yes
MAKE_JOBS_SAFE= yes
-OPTIONS= PROFILE "Build a profiling library" Off \
- XLAPACKE "Install interfaces to XLAPACK" Off
+OPTIONS_DEFINE= PROFILE XLAPACKE
+PROFILE_DESC= Build a profiling library
+XLAPACKE_DESC= Install interfaces to XLAPACK
.include <bsd.port.pre.mk>
@@ -35,7 +32,7 @@ LAPACKE_LIBNAME_TMG= lapacke_tmg
MAKE_ENV+= "SHLIB_MAJOR=${LAPACKE_SVERSION}" \
"LAPACKE_LIBNAME=${LAPACKE_LIBNAME}" \
"LAPACKE_LIBNAME_TMG=${LAPACKE_LIBNAME_TMG}"
-.if defined (WITH_XLAPACKE)
+.if ${PORT_OPTIONS:MXLAPACKE}
XLAPACKE_LIBNAME= xlapacke
MAKE_ENV+= "XLAPACKE_LIBNAME=${XLAPACKE_LIBNAME}"
.endif
@@ -69,13 +66,13 @@ LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/a
BLAS= -lptf77blas
LAPACK= -lalapack -lptcblas
.endif
-.if defined (WITH_XLAPACKE)
+.if ${PORT_OPTIONS:MXLAPACKE}
LIB_DEPENDS+= xlapack.4:${PORTSDIR}/math/xlapack
.endif
LDFLAGS+= -L${LOCALBASE}/lib
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
PORTDOCS= README
.endif
PLIST_FILES= include/lapacke.h \
@@ -86,13 +83,13 @@ PLIST_FILES= include/lapacke.h \
lib/lib${LAPACKE_LIBNAME_TMG}.so \
lib/lib${LAPACKE_LIBNAME}.so.${LAPACKE_SVERSION} \
lib/lib${LAPACKE_LIBNAME_TMG}.so.${LAPACKE_SVERSION}
-.if defined (WITH_XLAPACKE)
+.if ${PORT_OPTIONS:MXLAPACKE}
PLIST_FILES+= lib/lib${XLAPACKE_LIBNAME}.a \
lib/lib${XLAPACKE_LIBNAME}.so \
lib/lib${XLAPACKE_LIBNAME}.so.${LAPACKE_SVERSION}
.endif
-.if defined(WITH_PROFILE)
+.if ${PORT_OPTIONS:MPROFILE}
.if defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE)
IGNORE = you have defined WITH_PROFILE, but have also defined\
WITHOUT_PROFILE, NOPROFILE, or NO_PROFILE
@@ -102,7 +99,7 @@ base system profiling libraries
.endif
PLIST_FILES+= lib/lib${LAPACKE_LIBNAME}_p.a \
lib/lib${LAPACKE_LIBNAME_TMG}_p.a
-.if defined (WITH_XLAPACKE)
+.if ${PORT_OPTIONS:MXLAPACKE}
PLIST_FILES+= lib/lib${XLAPACKE_LIBNAME}_p.a
.endif
.else
@@ -135,7 +132,7 @@ post-patch:
-e 's;%%__XLAPACKE%%;\#;g' \
${WRKSRC}/lib/Makefile
-.if defined (WITH_XLAPACKE)
+.if ${PORT_OPTIONS:MXLAPACKE}
@${MKDIR} ${WRKSRC}/libx
@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/libx/Makefile
@${REINPLACE_CMD} -e 's;%%__XLAPACKE%%;;g' \
@@ -147,7 +144,7 @@ post-patch:
.endif
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
.endif
Modified: head/math/levmar/Makefile
==============================================================================
--- head/math/levmar/Makefile Wed Jun 5 13:59:19 2013 (r319992)
+++ head/math/levmar/Makefile Wed Jun 5 14:11:19 2013 (r319993)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: levmar
-# Date created: 18 May 2010
-# Whom: Eijiro Shibusawa <ej-sib at ice.uec.ac.jp>
-#
+# Created by: Eijiro Shibusawa <ej-sib at ice.uec.ac.jp>
# $FreeBSD$
-#
PORTNAME= levmar
PORTVERSION= 2.5
@@ -13,7 +9,7 @@ MASTER_SITES= http://www.ics.forth.gr/~l
EXTRACT_SUFX= .tgz
MAINTAINER= phd_kimberlite at yahoo.co.jp
-COMMENT= A GPL-licensed library implementing the Levenberg-Marquardt algorithm
+COMMENT= GPL-licensed library implementing the Levenberg-Marquardt algorithm
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
@@ -22,7 +18,8 @@ USE_LDCONFIG= yes
USE_FORTRAN= yes
MAKE_JOBS_SAFE= yes
-OPTIONS= PROFILE "Build a profiling library" Off
+OPTIONS_DEFINE= PROFILE
+PROFILE_DESC= Build a profiling library
.include <bsd.port.pre.mk>
@@ -53,10 +50,10 @@ BLAS= -lptf77blas
LAPACK= -lalapack -lptcblas
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
PORTDOCS= README.txt
.endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
PORTEXAMPLES= lmdemo.c Makefile.demo
.endif
PLIST_FILES= include/levmar.h \
@@ -64,7 +61,7 @@ PLIST_FILES= include/levmar.h \
lib/liblevmar.so \
lib/liblevmar.so.2
-.if defined(WITH_PROFILE)
+.if ${PORT_OPTIONS:MPROFILE}
.if defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE)
IGNORE = you have defined WITH_PROFILE, but have also defined\
WITHOUT_PROFILE, NOPROFILE, or NO_PROFILE
@@ -89,11 +86,11 @@ post-extract:
${WRKSRC}/Makefile.demo
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
.endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} ${EXAMPLESDIR}
@(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR})
.endif
More information about the svn-ports-all
mailing list