Date: Sun, 12 May 2013 06:05:03 +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: r317932 - in head/lang: dmd maude metaocaml mlton mpd munger see see-devel Message-ID: <201305120605.r4C653CC059962@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sun May 12 06:05:03 2013 New Revision: 317932 URL: http://svnweb.freebsd.org/changeset/ports/317932 Log: Convert to new options framework Modified: head/lang/dmd/Makefile head/lang/maude/Makefile head/lang/metaocaml/Makefile head/lang/mlton/Makefile head/lang/mpd/Makefile head/lang/munger/Makefile head/lang/see-devel/Makefile head/lang/see/Makefile Modified: head/lang/dmd/Makefile ============================================================================== --- head/lang/dmd/Makefile Sun May 12 05:42:16 2013 (r317931) +++ head/lang/dmd/Makefile Sun May 12 06:05:03 2013 (r317932) @@ -1,9 +1,5 @@ -# New ports collection makefile for: dmd -# Date created: November 15 2010 -# Whom: Ruben <chromium@hybridsource.org> -# +# Created by: Ruben <chromium@hybridsource.org> # $FreeBSD$ -# PORTNAME= dmd PORTVERSION= 1.076 @@ -27,13 +23,14 @@ LICENSE_NAME_DMD= digital mars license LICENSE_FILE_DMD= ${WRKSRC}/../../license.txt LICENSE_PERMS_DMD= no-pkg-mirror auto-accept -OPTIONS= SOURCE "Compile dmd and phobos from source" off +OPTIONS_DEFINE= SOURCE DOCS +SOURCE_DESC= Compile dmd and phobos from source -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> MODULEDIR= ${PREFIX}/include/d/phobos -.if defined(WITH_SOURCE) +.if ${PORT_OPTIONS:MSOURCE} MAKEFILE= posix.mak .else NO_BUILD= yes @@ -46,7 +43,7 @@ MAKE_ARGS+= MODEL=32 .endif post-patch: -.if defined(WITH_SOURCE) +.if ${PORT_OPTIONS:MSOURCE} @${REINPLACE_CMD} -e "s|gcc|${CC}|" \ ${WRKSRC}/../phobos/freebsd.mak \ ${WRKSRC}/../phobos/etc/c/zlib/freebsd.mak \ @@ -88,7 +85,7 @@ do-install: ${MKDIR} ${MODULEDIR}/etc/c ${INSTALL_DATA} ${WRKSRC}/../phobos/etc/c/zlib.d ${MODULEDIR}/etc/c cd ${WRKSRC}/../phobos && ${COPYTREE_SHARE} std ${MODULEDIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR} cd ${WRKDIR}/dmd && ${COPYTREE_SHARE} html ${DOCSDIR} @@ -97,4 +94,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/../phobos/std.ddoc ${DOCSDIR}/phobos .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/lang/maude/Makefile ============================================================================== --- head/lang/maude/Makefile Sun May 12 05:42:16 2013 (r317931) +++ head/lang/maude/Makefile Sun May 12 06:05:03 2013 (r317932) @@ -23,11 +23,14 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --datadir=${DATADIR} FULL_MAUDE_VER= 26b -OPTIONS= FULL_MAUDE "Install full-maude${FULL_MAUDE_VER}" On + +OPTIONS_DEFINE= FULL_MAUDE +OPTIONS_DEFAULT= FULL_MAUDE +FULL_MAUDE_DESC= Install full-maude${FULL_MAUDE_VER} .include <bsd.port.options.mk> -.if defined(WITH_FULL_MAUDE) +.if ${PORT_OPTIONS:MFULL_MAUDE} MASTER_SITES+= http://maude.lcc.uma.es/FullMaude/FM${FULL_MAUDE_VER}/:fm FULL_MAUDE= full-maude${FULL_MAUDE_VER}.maude FULL_MAUDE_DIST= ${FULL_MAUDE}.zip @@ -40,7 +43,7 @@ PLIST_SUB+= FULL_MAUDE_VER="${FULL_MAUDE PLIST_SUB+= FULL_MAUDE="@comment " .endif -.if defined(WITH_FULL_MAUDE) +.if ${PORT_OPTIONS:MFULL_MAUDE} post-extract: ${UNZIP_CMD} ${DISTDIR}/${FULL_MAUDE_DIST} ${FULL_MAUDE} -d ${WRKDIR} .endif @@ -49,7 +52,7 @@ post-patch: @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \ ${WRKSRC}/src/Mixfix/global.hh -.if defined(WITH_FULL_MAUDE) +.if ${PORT_OPTIONS:MFULL_MAUDE} post-install: ${INSTALL_DATA} ${WRKDIR}/${FULL_MAUDE} ${DATADIR} .endif Modified: head/lang/metaocaml/Makefile ============================================================================== --- head/lang/metaocaml/Makefile Sun May 12 05:42:16 2013 (r317931) +++ head/lang/metaocaml/Makefile Sun May 12 06:05:03 2013 (r317932) @@ -1,9 +1,5 @@ -# New ports collection makefile for: metaocaml -# Date created: 16 June 2005 -# Whom: Geoffrey Mainland <mainland@apeiron.net> -# +# Created by: Geoffrey Mainland <mainland@apeiron.net> # $FreeBSD$ -# PORTNAME= metaocaml PORTVERSION= 3.09.a30 @@ -60,8 +56,9 @@ MLINKS= ocamlc.1 ocamlc.opt.1 ocamlopt. camlp4.1 camlp4o.opt.1 camlp4.1 camlp4r.opt.1 \ camlp4.1 ocpp.1 -OPTIONS= X11 "build the X11 graphics library" on \ - LABLTK "build the LablTk library" on +OPTIONS_DEFINE= X11 LABELTK +OPTIONS_DEFAULT= X11 LABELTK +LABLTK_DESC= build the LablTk library PLISTDIR= ${PREFIX}/lib/metaocaml \ ${PREFIX}/share/examples/metaocaml \ @@ -69,12 +66,12 @@ PLISTDIR= ${PREFIX}/lib/metaocaml \ ${PREFIX}/bin/metaocamlc \ ${PREFIX}/bin/metaocamlopt -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> # Have to set this here and can't use ${DATADIR} or MLINKS get screwed up MANPREFIX= ${PREFIX}/share/metaocaml -.if defined(WITH_X11) +.if ${PORT_OPTIONS:MX11} USE_XORG= x11 CONFIGURE_ARGS+=-x11include ${LOCALBASE}/include -x11lib ${LOCALBASE}/lib PLIST_SUB+= X11="" @@ -84,12 +81,12 @@ PLIST_SUB+= X11="@comment " # We would like to use bsd.tcl.mk here, but we can't USE_TCL after including # bsd.port.pre.mk and we can't test WITH_LABLTK before including bsd.port.pre.mk -.if defined(WITH_LABLTK) +.if ${PORT_OPTIONS:MLABLTK} LIB_DEPENDS+= tk84.1:${PORTSDIR}/x11-toolkits/tk84 CONFIGURE_ARGS+=-tkdefs "-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4" CONFIGURE_ARGS+=-tklibs "-L${LOCALBASE}/lib" PLIST_SUB+= LABLTK="" -.if defined(WITHOUT_X11) +.if ! ${PORT_OPTIONS:MX11} CONFIGURE_ARGS+=-tk-no-x11 .endif .else @@ -115,7 +112,7 @@ post-patch: s,-O,,' {} \; post-install: -.if defined(WITH_LABLTK) +.if ${PORT_OPTIONS:MLABLTK} . for d in camltk labltk ${MKDIR} ${EXAMPLESDIR}/${d} ${CP} -R ${WRKSRC}/otherlibs/labltk/examples_${d}/* ${EXAMPLESDIR}/${d} @@ -145,4 +142,4 @@ post-install: echo "@dirrm ${MANPREFIX:S|${PREFIX}/||}" >> ${TMPPLIST} @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/lang/mlton/Makefile ============================================================================== --- head/lang/mlton/Makefile Sun May 12 05:42:16 2013 (r317931) +++ head/lang/mlton/Makefile Sun May 12 06:05:03 2013 (r317932) @@ -24,12 +24,13 @@ LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp RUN_DEPENDS= bash:${PORTSDIR}/shells/bash BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash -OPTIONS= SMLNJ "Bootstrap with SML/NJ (can take >15 hours)" off \ - MINGW32 "Add the mingw32 target (requires wine)" off +OPTIONS_DEFINE= SMLNJ MINGW32 +SMLNJ_DESC= Bootstrap with SML/NJ (can take >15 hours) +MINGW32_DESC= Add the mingw32 target (requires wine) -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= gsed:${PORTSDIR}/textproc/gsed \ htmldoc:${PORTSDIR}/textproc/htmldoc USE_TEX= latex:build @@ -40,11 +41,11 @@ ALL_TARGET= all-no-docs SRC_DIST= ${DISTNAME}-1.src.tgz -.if defined(WITH_SMLNJ) +.if ${PORT_OPTIONS:MSMLNJ} BUILD_DEPENDS+= smlnj-devel>=110.65:${PORTSDIR}/lang/sml-nj-devel BOOT_DIST= MAKE_ENV+= SMLNJ_DEVEL=yes -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} ALL_TARGET= nj-mlton all-no-docs .else ALL_TARGET= bootstrap-nj @@ -54,7 +55,7 @@ BOOT_DIST= ${PORTNAME}-${BOOT_VER}-1.${M MAKE_ENV+= LD_LIBMAP=libgmp.so.7=libgmp.so.10 .endif -.if defined(WITH_MINGW32) +.if ${PORT_OPTIONS:MMINGW32} BUILD_DEPENDS+= wine:${PORTSDIR}/emulators/wine \ mingw32-gcc:${PORTSDIR}/devel/mingw32-gcc \ ${LOCALBASE}/mingw32/lib/libgmp.a:${PORTSDIR}/math/mingw32-libgmp @@ -94,7 +95,7 @@ BOOT_VER= 20070826 post-extract: @${CP} ${FILESDIR}/add-local-cross ${WRKSRC}/bin/ -.if defined(WITH_SMLNJ) +.if ${PORT_OPTIONS:MSMLNJ} @${CP} ${FILESDIR}/upgrade-basis.sml ${WRKSRC}/mlton/ @for f in `ls ${FILESDIR}/ml.* ${FILESDIR}/mlb.*`; do \ ${CP} $$f ${WRKSRC}/mlton/front-end/; \ @@ -131,7 +132,7 @@ post-patch: ${WRKSRC}/doc/guide/Installation.bak post-build: -.if defined(WITH_MINGW32) +.if ${PORT_OPTIONS:MMINGW32} @${ECHO} Adding mingw32 target... ${WRKSRC}/bin/add-local-cross mingw32 x86 mingw .endif @@ -147,10 +148,10 @@ post-install: ${FIND} ${PREFIX}/lib/mlton -type d -exec ${CHMOD} a+rx {} \; ${CHMOD} a+x ${PREFIX}/lib/mlton/mlton-compile ${CHMOD} a+x ${PREFIX}/lib/mlton/platform -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} ${FIND} ${DOCSDIR} -type f -exec ${CHMOD} a+r {} \; ${FIND} ${DOCSDIR} -type d -exec ${CHMOD} a+rx {} \; .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/lang/mpd/Makefile ============================================================================== --- head/lang/mpd/Makefile Sun May 12 05:42:16 2013 (r317931) +++ head/lang/mpd/Makefile Sun May 12 06:05:03 2013 (r317932) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mpd -# Date Created: 2007-02-05 -# Whom: Kai Wang <kaiw27@gmail.com> -# +# Created by: Kai Wang <kaiw27@gmail.com> # $FreeBSD$ -# PORTNAME= mpd PORTVERSION= 1.0.1 @@ -26,7 +22,8 @@ NO_LATEST_LINK= yes USE_GMAKE= yes -OPTIONS= X11 "Enable X11 support" on +OPTIONS_DEFINE= X11 DOCS +OPTIONS_DEFAULT= X11 MAN1= mpd.1 mpdl.1 mpdm.1 mpdprof.1 MAN3= mpdanimator.3 mpdgetopt.3 mpdwin.3 @@ -34,7 +31,7 @@ MAN5= mpdmap.5 mpdtrace.5 .include <bsd.port.pre.mk> -.if defined(WITHOUT_X11) +.if ! ${PORT_OPTIONS:MX11} PLIST_SUB+= X11="@comment " .else PLIST_SUB+= X11="" @@ -47,7 +44,7 @@ post-patch: s%^(MPDSRC =) .*%\1 ${WRKSRC}%; \ s%^((MPD(CMD|LIB)|MAN[135]) =) /usr/local%\1 ${PREFIX}%" \ ${WRKSRC}/Configuration -.if !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MX11} @${REINPLACE_CMD} -Ee 's%^(XINCL =) .*%\1 ${LOCALBASE}/include%' \ ${WRKSRC}/Configuration .else @@ -58,7 +55,7 @@ pre-install: @${MKDIR} ${PREFIX}/lib/mpd post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} @${MKDIR} ${EXAMPLESDIR} Modified: head/lang/munger/Makefile ============================================================================== --- head/lang/munger/Makefile Sun May 12 05:42:16 2013 (r317931) +++ head/lang/munger/Makefile Sun May 12 06:05:03 2013 (r317932) @@ -16,13 +16,14 @@ DATADIR= ${PREFIX}/share/${PORTNAME}-${P MAN1= munger.1 MANCOMPRESSED= yes -OPTIONS= SQL "include SQLite interface" on +OPTIONS_DEFINE= SQLITE +OPTIONS_DEFAULT= SQLITE USE_LDCONFIG= yes -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_SQL) +.if ${PORT_OPTIONS:MSQLITE} USE_SQLITE= 3 MAKE_ARGS+= -DWITH_SQL .endif @@ -31,4 +32,4 @@ MAKE_ARGS+= -DWITH_SQL BROKEN= Does not link on sparc64 .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/lang/see-devel/Makefile ============================================================================== --- head/lang/see-devel/Makefile Sun May 12 05:42:16 2013 (r317931) +++ head/lang/see-devel/Makefile Sun May 12 06:05:03 2013 (r317932) @@ -1,9 +1,5 @@ -# New ports collection makefile for: see-devel -# Date created: 29 Oct 2005 -# Whom: Simun Mikecin <numisemis@yahoo.com> -# +# Created by: Simun Mikecin <numisemis@yahoo.com> # $FreeBSD$ -# PORTNAME= see PORTVERSION= 3.0.1376 @@ -16,10 +12,10 @@ PKGNAMESUFFIX= -devel MAINTAINER= numisemis@yahoo.com COMMENT= Simple ECMAScript Engine (SEE) -OPTIONS= GC "Use Boehm-Weiser garbage collection package" on \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ - SEE_DEBUG "Internal SEE library debugging" off \ - MULTIPLE_THREADS "Enable thread-safety" on +OPTIONS_DEFINE= GC OPTIMIZED_CFLAGS SEE_DEBUG THREADS DOCS +OPTIONS_DEFAULT= GC THREADS +GC_DESC= Use Boehm-Weiser garbage collection package +SEE_DEBUG_DESC= Internal SEE library debugging CONFLICTS= see-[0-9]* @@ -31,25 +27,25 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_MULTIPLE_THREADS) +.if ${PORT_OPTIONS:MMULTIPLE_THREADS} CFLAGS+= -DMULTIPLE_THREADS .endif -.if !defined(WITH_SEE_DEBUG) +.if ! ${PORT_OPTIONS:MSEE_DEBUG} CFLAGS+= -DNDEBUG .endif -.if defined(WITH_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -fomit-frame-pointer .endif -.if defined(WITH_GC) +.if ${PORT_OPTIONS:MGC} LIB_DEPENDS+= gc:${PORTSDIR}/devel/boehm-gc .else CONFIGURE_ARGS+= --without-boehm-gc -.if !defined(WITH_MULTIPLE_THREADS) +.if ! ${PORT_OPTIONS:MTHREADS} PTHREAD_CFLAGS= PTHREAD_LIBS= .endif @@ -59,7 +55,7 @@ post-patch: @${REINPLACE_CMD} -e "s|PACKAGE_BUGREPORT='leonard@users|PACKAGE_BUGREPORT='leonard\\\@users|" \ ${WRKSRC}/configure -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: ${MKDIR} ${DOCSDIR} .for f in doc/USAGE.html AUTHORS NEWS README TODO COPYING @@ -67,4 +63,4 @@ post-install: .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/lang/see/Makefile ============================================================================== --- head/lang/see/Makefile Sun May 12 05:42:16 2013 (r317931) +++ head/lang/see/Makefile Sun May 12 06:05:03 2013 (r317932) @@ -1,9 +1,5 @@ -# New ports collection makefile for: see -# Date created: 29 Oct 2005 -# Whom: Simun Mikecin <numisemis@yahoo.com> -# +# Created by: Simun Mikecin <numisemis@yahoo.com> # $FreeBSD$ -# PORTNAME= see PORTVERSION= 2.0.1131 @@ -15,10 +11,10 @@ MASTER_SITES= http://www.powerband.net.a MAINTAINER= numisemis@yahoo.com COMMENT= Simple ECMAScript Engine (SEE) -OPTIONS= GC "Use Boehm-Weiser garbage collection package" on \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ - SEE_DEBUG "Internal SEE library debugging" off \ - MULTIPLE_THREADS "Enable thread-safety" on +OPTIONS_DEFINE= GC OPTIMIZED_CFLAGS SEE_DEBUG THREADS DOCS +OPTIONS_DEFAULT= GC THREADS +GC_DESC= Use Boehm-Weiser garbage collection package +SEE_DEBUG_DESC= Internal SEE library debugging CONFLICTS= see-devel-[0-9]* @@ -34,23 +30,23 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_L .include <bsd.port.pre.mk> -.if defined(WITH_MULTIPLE_THREADS) +.if ${PORT_OPTIONS:MMULTIPLE_THREADS} CFLAGS+= -DMULTIPLE_THREADS .endif -.if !defined(WITH_SEE_DEBUG) +.if ! ${PORT_OPTIONS:MSEE_DEBUG} CFLAGS+= -DNDEBUG .endif -.if defined(WITH_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -fomit-frame-pointer .endif -.if defined(WITH_GC) +.if ${PORT_OPTIONS:MGC} LIB_DEPENDS+= gc:${PORTSDIR}/devel/boehm-gc .else CONFIGURE_ARGS+= --without-boehm-gc -.if !defined(WITH_MULTIPLE_THREADS) +.if ! ${PORT_OPTIONS:MTHREADS} PTHREAD_CFLAGS= PTHREAD_LIBS= .endif @@ -60,7 +56,7 @@ post-patch: @${REINPLACE_CMD} -e "s|PACKAGE_BUGREPORT='leonard@users|PACKAGE_BUGREPORT='leonard\\\@users|" \ ${WRKSRC}/configure -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: ${MKDIR} ${DOCSDIR} .for f in doc/USAGE.html AUTHORS NEWS README TODO COPYING
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305120605.r4C653CC059962>