svn commit: r319846 - in head/www: habari hastymail2-devel havp ikiwiki interchange lifetype mahara mambo mod_vhs moodle moodle22 node06 ocaml-net ocsigen ojs2 oops p5-FCGI-Spawn p5-Task-Plack
Baptiste Daroussin
bapt at FreeBSD.org
Tue Jun 4 10:02:03 UTC 2013
Author: bapt
Date: Tue Jun 4 10:01:59 2013
New Revision: 319846
URL: http://svnweb.freebsd.org/changeset/ports/319846
Log:
Convert to new options framework
Modified:
head/www/habari/Makefile
head/www/hastymail2-devel/Makefile
head/www/havp/Makefile
head/www/ikiwiki/Makefile
head/www/interchange/Makefile
head/www/lifetype/Makefile
head/www/mahara/Makefile
head/www/mambo/Makefile
head/www/mod_vhs/Makefile
head/www/moodle/Makefile
head/www/moodle22/Makefile
head/www/node06/Makefile
head/www/ocaml-net/Makefile
head/www/ocsigen/Makefile
head/www/ojs2/Makefile
head/www/oops/Makefile
head/www/p5-FCGI-Spawn/Makefile
head/www/p5-Task-Plack/Makefile
Modified: head/www/habari/Makefile
==============================================================================
--- head/www/habari/Makefile Tue Jun 4 10:00:12 2013 (r319845)
+++ head/www/habari/Makefile Tue Jun 4 10:01:59 2013 (r319846)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: habari
-# Date created: Mar 30 2008
-# Whom: Ayumi M <ayu at commun.jp>
-#
+# Created by: Ayumi M <ayu at commun.jp>
# $FreeBSD$
-#
PORTNAME= habari
PORTVERSION= 0.8
@@ -19,28 +15,25 @@ USE_PHP= ctype filter hash json mbstring
WANT_PHP_WEB= yes
NO_BUILD= yes
-OPTIONS= MYSQL "Use MySQL" on \
- PGSQL "Use PostgreSQL" off \
- SQLITE "Use SQLite" off
+OPTIONS_MULTI= DB
+OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE
+OPTIONS_DEFAULT= MYSQL
+OPTIONS_DEFINE= DOCS
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_PHP+= pdo_mysql
.endif
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PHP+= pdo_pgsql
.endif
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
USE_PHP+= pdo_sqlite
.endif
-.if defined(WITHOUT_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE)
-IGNORE= please choose the type of database
-.endif
-
post-patch:
.for f in doc/index.html system/classes/theme.php.orig user/cache/.gitignore
${RM} ${WRKSRC}/${f}
@@ -52,7 +45,7 @@ do-install:
.for f in system user
@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${WWWDIR})
.endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
.for f in LICENSE NOTICE README.md doc/MIT.txt
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
@@ -60,4 +53,4 @@ do-install:
@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} manual ${DOCSDIR})
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/www/hastymail2-devel/Makefile
==============================================================================
--- head/www/hastymail2-devel/Makefile Tue Jun 4 10:00:12 2013 (r319845)
+++ head/www/hastymail2-devel/Makefile Tue Jun 4 10:01:59 2013 (r319846)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: hastymail
-# Date created: 2006-11-04
-# Whom: Bartlomiej Rutkowski <r at robakdesign.com>
-#
+# Created by: Bartlomiej Rutkowski <r at robakdesign.com>
# $FreeBSD$
-#
PORTNAME= hastymail2
PORTVERSION= 1.1.${HASTYMAIL_REV:S/.//g}
@@ -34,27 +30,26 @@ CONFLICTS= hastymail2-1.[0-9]*
HASTYMAIL_REV= 2011.08.22
-OPTIONS= PGSQL "Use PostgreSQL" off \
- MYSQL "Use MySQL" off \
- DB "Use older pear DB (instead of MDB2)" off
+OPTIONS_DEFINE= PGSQL MYSQL DB
+DB_DESC= Use older pear DB (instead of MDB2)
.include <bsd.port.pre.mk>
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
-.if !defined(WITH_DB)
+.if ! ${PORT_OPTIONS:MDB}
RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:${PORTSDIR}/databases/pear-MDB2_Driver_mysql
.endif
.endif
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL= yes
-.if !defined(WITH_DB)
+.if ! ${PORT_OPTIONS:MDB}
RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:${PORTSDIR}/databases/pear-MDB2_Driver_pgsql
.endif
.endif
-.if defined(WITH_DB) && (defined(WITH_MYSQL) || defined(WITH_PGSQL))
+.if ${PORT_OPTIONS:MDB} && (${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL}}
RUN_DEPENDS+= ${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
.endif
@@ -84,4 +79,4 @@ do-install:
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/www/havp/Makefile
==============================================================================
--- head/www/havp/Makefile Tue Jun 4 10:00:12 2013 (r319845)
+++ head/www/havp/Makefile Tue Jun 4 10:01:59 2013 (r319846)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: havp
-# Date created: 17 June 2006
-# Whom: Elisey Savateev <b3k at mail.ru>
-#
+# Created by: Elisey Savateev <b3k at mail.ru>
# $FreeBSD$
-#
PORTNAME= havp
PORTVERSION= 0.91
@@ -32,25 +28,27 @@ PLIST_SUB+= LOG_DIR=${LOG_DIR} TMP_DIR=$
SUB_FILES= pkg-install pkg-deinstall
SUB_LIST= LOG_DIR=${LOG_DIR} TMP_DIR=${TMP_DIR} RUN_DIR=${RUN_DIR}
-OPTIONS= SSL "Enable SSL proxying (not scanned, only forwarded!)" on \
- CLAMAV "Enable libclamav support" on \
- TROPHIE "Enable Trend Micro (Trophie) support" off
+OPTIONS_DEFINE= SSL CLAMAV TROPHIE
+OPTIONS_DEFAULT= SSL CLAMAV
+SSL_DESC= SSL proxying (not scanned, only forwarded!)
+CLAMAV_DESC= libclamav support
+TROPHIE_DESC= Trend Micro (Trophie) support
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_SSL)
+.if ${PORT_OPTIONS:MSSL}
CONFIGURE_ARGS+= --enable-ssl-tunnel
.else
CONFIGURE_ARGS+= --disable-ssl-tunnel
.endif
-.if defined(WITH_CLAMAV)
+.if ${PORT_OPTIONS:MCLAMAV}
CONFIGURE_ARGS+= --enable-clamav
.else
CONFIGURE_ARGS+= --disable-clamav
.endif
-.if defined(WITH_TROPHIE)
+.if ${PORT_OPTIONS:MTROPHIE}
CONFIGURE_ARGS+= --enable-trophie
.else
CONFIGURE_ARGS+= --disable-trophie
@@ -68,4 +66,4 @@ post-install:
@${CP} ${WRKSRC}/etc/havp/whitelist ${EXAMPLESDIR}/whitelist.sample
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/www/ikiwiki/Makefile
==============================================================================
--- head/www/ikiwiki/Makefile Tue Jun 4 10:00:12 2013 (r319845)
+++ head/www/ikiwiki/Makefile Tue Jun 4 10:01:59 2013 (r319846)
@@ -1,7 +1,4 @@
-# New ports collection makefile for: ikiwiki
-# Date created: 21 Apr 2007
-# Whom: Henrik Brix Andersen <henrik at brixandersen.dk>
-#
+# Created by: Henrik Brix Andersen <henrik at brixandersen.dk>
# $FreeBSD$
PORTNAME= ikiwiki
@@ -40,18 +37,20 @@ PERL_CONFIGURE= yes
USE_GMAKE= yes
USES= gettext
-OPTIONS= PO4A "Install translated underlays" On \
- SEARCH "Install search backend" On \
- W3M "Install w3m CGI wrapper" Off
+OPTIONS_DEFINE= PO4A SEARCH W3M
+OPTIONS_DEFAULT= PO4A SEARCH
+PO4A_DESC= Install translated underlays
+SEARCH_DESC= Install search backend
+W3M_DESC= Install w3m CGI wrapper
MAN1= ikiwiki.1 ikiwiki-calendar.1 ikiwiki-makerepo.1 ikiwiki-transition.1 ikiwiki-update-wikilist.1
MAN8= ikiwiki-mass-rebuild.8
PORTDOCS= CHANGELOG NEWS README
PORTEXAMPLES= *
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_PO4A)
+.if ${PORT_OPTIONS:MPO4A}
PLIST_SUB+= PO4A=""
RUN_DEPENDS+= po4a>=0.39:${PORTSDIR}/textproc/po4a
BUILD_DEPENDS+= po4a>=0.39:${PORTSDIR}/textproc/po4a
@@ -59,13 +58,13 @@ BUILD_DEPENDS+= po4a>=0.39:${PORTSDIR}/t
PLIST_SUB+= PO4A="@comment "
.endif
-.if defined(WITH_SEARCH)
+.if ${PORT_OPTIONS:MSEARCH}
RUN_DEPENDS+= p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
p5-Search-Xapian>=0:${PORTSDIR}/databases/p5-Search-Xapian \
${LOCALBASE}/www/xapian-omega/cgi-bin/omega:${PORTSDIR}/www/xapian-omega
.endif
-.if defined(WITH_W3M)
+.if ${PORT_OPTIONS:MW3M}
MAKE_ENV+= W3M_CGI_BIN=${PREFIX}/libexec/w3m/cgi-bin
PLIST_SUB+= W3M=""
.else
@@ -104,18 +103,18 @@ post-patch:
-e "s|/etc/highlight|${LOCALBASE}/etc/highlight|" \
-e "s|/usr/share/highlight|${LOCALBASE}/share/highlight|" \
${WRKSRC}/IkiWiki/Plugin/highlight.pm
-.ifndef(WITH_PO4A)
+.if ! ${PORT_OPTIONS:MPO4A}
@${REINPLACE_CMD} -i '' \
-e 's|^\(TRANSLATED_UNDERLAYS=\).*|\1|' \
${WRKSRC}/po/Makefile
.endif
-.ifndef(WITH_W3M)
+.if ! ${PORT_OPTIONS:MW3M}
@${REINPLACE_CMD} -i '' \
-e '/w3m/d' \
-e '/W3M/d' \
${WRKSRC}/Makefile.PL
.endif
-.if defined(NOPORTEXAMPLES)
+.if ! ${PORT_OPTIONS:MEXAMPLES}
@${REINPLACE_CMD} -i '' \
-e 's|\(install -d ${EXAMPLESDIR}\)|#\1|' \
-e 's|\(cp -aL doc/examples\)|#\1|' \
@@ -127,15 +126,15 @@ post-install:
${MKDIR} ${PREFIX}/etc/ikiwiki
${INSTALL_DATA} ${WRKSRC}/auto.setup ${PREFIX}/etc/ikiwiki
${INSTALL_DATA} ${WRKSRC}/auto-blog.setup ${PREFIX}/etc/ikiwiki
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${DOCSDIR}
.endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/ikiwiki.setup ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/wikilist ${EXAMPLESDIR}
.endif
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/www/interchange/Makefile
==============================================================================
--- head/www/interchange/Makefile Tue Jun 4 10:00:12 2013 (r319845)
+++ head/www/interchange/Makefile Tue Jun 4 10:01:59 2013 (r319846)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: interchange
-# Date created: 2 July 2002
-# Whom: Seth Kingsley <sethk at meowfishies.com>
-#
+# Created by: Seth Kingsley <sethk at meowfishies.com>
# $FreeBSD$
-#
PORTNAME= interchange
PORTVERSION= 5.6.1
@@ -24,18 +20,18 @@ BUILD_DEPENDS:= ${RUN_DEPENDS}
USE_BZIP2= yes
PERL_CONFIGURE= yes
-OPTIONS= MYSQL "Add MySQL support" on \
- PGSQL "Add PostgreSQL support" off
+OPTIONS_DEFINE= MYSQL PGSQL
+OPTIONS_DEFAULT= MYSQL
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
USE_RC_SUBR= interchange
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
.endif
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
.endif
@@ -117,4 +113,4 @@ post-install:
.endfor
@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/www/lifetype/Makefile
==============================================================================
--- head/www/lifetype/Makefile Tue Jun 4 10:00:12 2013 (r319845)
+++ head/www/lifetype/Makefile Tue Jun 4 10:01:59 2013 (r319846)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: lifetype
-# Date created: Wed Jan 11 09:37:54 CST 2006
-# Whom: clsung
-#
+# Created by: clsung
# $FreeBSD$
-#
PORTNAME= lifetype
PORTVERSION= 1.2.11
@@ -30,21 +26,21 @@ USE_ZIP= YES
WANT_PHP_WEB= YES
WWWDOCROOT?= www
-OPTIONS= BIG5 "With Big5 chinese template fix" off \
- GD "With GD Support" on \
- IMAGICK "With ImageMagick Support" off
-
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE= BIG5 GD IMAGEMAGICK
+OPTIONS_DEFAULT= GD
+BIG5_DESC= Big5 chinese template fix
+#
+.include <bsd.port.options.mk>
-.if !defined(WITHOUT_GD)
+.if ${PORT_OPTIONS:MGD}
RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/gd.so:${PORTSDIR}/${gd_DEPENDS}
.endif
-.if defined(WITH_IMAGICK)
+.if ${PORT_OPTIONS:MIMAGEMAGICK}
RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:${PORTSDIR}/${imagick_DEPENDS}
.endif
-.if defined(WITHOUT_GD) && !defined(WITH_IMAGICK)
+.if ! ${PORT_OPTIONS:MGD} && ! ${PORT_OPTIONS:MIMAGEMAGICK}
pre-patch:
@${ECHO_CMD} "Without GD or ImageMagick support. No thumbnails will be generated at all."
.endif
@@ -54,7 +50,7 @@ post-extract:
cd ${WRKSRC}/${x} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${CONTRIBE_VERSION}__all_${x}${EXTRACT_SUFX}
.endfor
-.if defined(WITH_BIG5)
+.if ${PORT_OPTIONS:MBIG5}
post-patch:
${FIND} ${WRKSRC}/templates -name "*.template" | \
@@ -79,4 +75,4 @@ post-install:
@${SED} -e 's|%%PLOGURL%%|${PLOGURL}|' pkg-message > ${PKGMESSAGE}
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/www/mahara/Makefile
==============================================================================
--- head/www/mahara/Makefile Tue Jun 4 10:00:12 2013 (r319845)
+++ head/www/mahara/Makefile Tue Jun 4 10:01:59 2013 (r319846)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mahara
-# Date created: 21 Feb, 2009
-# Whom: Wen Heping <wenheping at gmail.com>
-#
+# Created by: Wen Heping <wenheping at gmail.com>
# $FreeBSD$
-#
PORTNAME= mahara
PORTVERSION= 1.1.8
@@ -17,16 +13,16 @@ USE_BZIP2= yes
USE_PHP= session json curl xml xmlrpc openssl simplexml
FETCH_ARGS= -pRr
-OPTIONS= MYSQL "Add support for a MySQL database server" On \
- PGSQL "Add support for a PostgreSQL database server" Off
+OPTIONS_DEFINE= MYSQL PGSQL
+OPTIONS_DEFAULT= MYSQL
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_PHP+= mysql
.endif
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PHP+= pgsql
.endif
@@ -60,4 +56,4 @@ do-install:
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/www/mambo/Makefile
==============================================================================
--- head/www/mambo/Makefile Tue Jun 4 10:00:12 2013 (r319845)
+++ head/www/mambo/Makefile Tue Jun 4 10:01:59 2013 (r319846)
@@ -1,7 +1,4 @@
-# New ports collection makefile for: www/mambo
-# Date created: Mon Apr 18, 2005
-# Whom: Francisco Cabrita <include at npf.pt.freebsd.org>
-#
+# Created by: Francisco Cabrita <include at npf.pt.freebsd.org>
# $FreeBSD$
PORTNAME= mambo
@@ -16,25 +13,25 @@ COMMENT= A dynamic web content managemen
NO_BUILD= yes
SUB_FILES+= pkg-message
-OPTIONS= MYSQLI "MySQL 4.1+ back-end (use mysqli PHP extension)" on
-OPTIONS+= MYSQL "MySQL back-end (use mysql PHP extension)" off
+OPTIONS_DEFAULT= MYSQLI
+OPTIONS_MULTI= DB
+DB_DESC= database back-end
+OPTIONS_MULTI_DB= MYSQLI MYSQL
+MYSQLI_DESC= MySQL 4.1+ back-end (use mysqli PHP extension)
+MYSQL_DESC= MySQL back-end (use mysql PHP extension)
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
USE_PHP= session zlib gd pdf xml pcre
-.if !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_PHP+= mysql
.endif
-.if defined(WITH_MYSQLI)
+.if ${PORT_OPTIONS:MMYSQLI}
USE_PHP+= mysqli
.endif
-.if defined(WITHOUT_MYSQL) && !defined(WITH_MYSQLI)
-IGNORE= needs at least one database back-end
-.endif
-
do-extract:
@${MKDIR} ${WRKSRC}
@if ! (cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${DISTFILES} ${EXTRACT_AFTER_ARGS});\
@@ -57,4 +54,4 @@ do-install:
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/www/mod_vhs/Makefile
==============================================================================
--- head/www/mod_vhs/Makefile Tue Jun 4 10:00:12 2013 (r319845)
+++ head/www/mod_vhs/Makefile Tue Jun 4 10:01:59 2013 (r319846)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_vhs
-# Date created: Sun Jul 25 2004
-# Whom: Xavier Beaudouin <kiwi at oav.net>
-#
+# Created by: Xavier Beaudouin <kiwi at oav.net>
# $FreeBSD$
-#
PORTNAME= mod_vhs
PORTVERSION= 1.1.0
@@ -36,40 +32,42 @@ AP_EXTRAS+= -DHAVE_MOD_PHP_SUPPORT
PORTDOCS= ChangeLog AUTHORS README README.logs README.mod_suphp WARNING \
README.phpopt THANKS WARNING WARNING.THREADS README.LDAP
-OPTIONS= LDAP "Enable mod_ldap support" on \
- DBD "Enable mod_dbd support" off \
- ITK "Enable mpm-itk support (needs a specific apache)" off \
- VDEBUG "Enable debug version (very verbose !)" off
+OPTIONS_DEFINE= LDAP DBD ITK VDEBUG DOCS
+OPTIONS_DEFAULT= LDAP
+LDAP_DESC= mod_ldap support
+DBD_DESC= mod_dbd support
+ITK_DESC= mpm-itk support (needs a specific apache)
+VDEBUG_DESC= debug version (very verbose !)
.include <bsd.port.options.mk>
### mod_vhs options
-.if defined(WITH_LDAP)
-.if defined(WITHOUT_DBD)
+.if ${PORT_OPTIONS:MLDAP}
+.if ! ${PORT_OPTIONS:MDBD}
AP_EXTRAS+= -DHAVE_LDAP_SUPPORT
.else
.error You cannot use LDAP and DBD at the same time.
.endif
.endif
-.if defined(WITH_DBD)
-.if defined(WITHOUT_LDAP)
+.if ${PORT_OPTIONS:MDBD}
+.if ! ${PORT_OPTIONS:MLDAP}
AP_EXTRAS+= -DHAVE_MOD_DBD_SUPPORT
.else
.error You cannot use LDAP and DBD at the same time.
.endif
.endif
-.if defined(WITH_ITK)
+.if ${PORT_OPTIONS:MITK}
AP_EXTRAS+= -DHAVE_MPM_ITK_SUPPORT
.endif
-.if defined(WITH_VDEBUG)
+.if ${PORT_OPTIONS:MVDEBUG}
AP_EXTRAS+= -DVH_DEBUG
.endif
post-install:
-.if !defined (NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}/
.for f in ${PORTDOCS}
@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
Modified: head/www/moodle/Makefile
==============================================================================
--- head/www/moodle/Makefile Tue Jun 4 10:00:12 2013 (r319845)
+++ head/www/moodle/Makefile Tue Jun 4 10:01:59 2013 (r319846)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: moodle
-# Date created: 30 September 2005
-# Whom: Javier Martin Rueda <jmrueda at diatel.upm.es>
-#
+# Created by: Javier Martin Rueda <jmrueda at diatel.upm.es>
# $FreeBSD$
-#
PORTNAME= moodle
PORTVERSION= 1.9.19
@@ -19,17 +15,14 @@ CONFLICTS= moodle-2.*.*
USE_PHP= session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype
WRKSRC= ${WRKDIR}/moodle
-OPTIONS= MYSQL "Add support for a MySQL database server" Off \
- PGSQL "Add support for a PostgreSQL database server" Off \
- MSSQL "Add support for a MS SQL Server" Off \
- ZLIB "Add zip/unzip functionality" On \
- NETWORK "Add Moodle Network functionality" Off \
- LDAP "Add LDAP authentication functionality" Off \
- MIMETEX "Add mimeTeX filter functionality" Off
+OPTIONS_DEFINE= MYSQL PGSQL MSSQL ZLIB NETWORK LDAP MIMETEX
+OPTIONS_DEFAULT= ZLIB
+NETWORK_DESC= Moodle Network functionality
+MIMETEX_DESC= mimeTeX filter functionality
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_MSSQL)
+.if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MMSSQL}
pre-fetch:
@${ECHO_MSG} "
@${ECHO_MSG} "You didn't activate support for any database server!"
@@ -43,31 +36,31 @@ pre-fetch:
@sleep 5
.endif
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_PHP+= mysql
.endif
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PHP+= pgsql
.endif
-.if defined(WITH_MSSQL)
+.if ${PORT_OPTIONS:MMSSQL}
USE_PHP+= mssql
.endif
-.if !defined(WITHOUT_ZLIB)
+.if ${PORT_OPTIONS:MZLIB}
USE_PHP+= zlib
.endif
-.if defined(WITH_NETWORK)
+.if ${PORT_OPTIONS:MNETWORK}
USE_PHP+= openssl
.endif
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
USE_PHP+= ldap
.endif
-.if !defined(WITHOUT_MIMETEX)
+.if ${PORT_OPTIONS:MMIMETEX}
RUN_DEPENDS+= ${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:${PORTSDIR}/www/mimetex
.endif
@@ -96,11 +89,11 @@ do-install:
>> ${TMPPLIST}
${CHMOD} 755 ${PREFIX}/${MOODLEDATADIR}
@${ECHO_CMD} '@exec ${CHMOD} 755 ${PREFIX}/${MOODLEDATADIR}' >> ${TMPPLIST}
-.if !defined(WITHOUT_MIMETEX)
+.if ${PORT_OPTIONS:MMIMETEX}
${LN} -sf ${PREFIX}/www/cgi-bin/mimetex.cgi ${PREFIX}/${MOODLEDIR}/filter/tex/mimetex.freebsd
.endif
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/www/moodle22/Makefile
==============================================================================
--- head/www/moodle22/Makefile Tue Jun 4 10:00:12 2013 (r319845)
+++ head/www/moodle22/Makefile Tue Jun 4 10:01:59 2013 (r319846)
@@ -23,31 +23,29 @@ USE_PHP= session gd pcre mbstring iconv
soap openssl simplexml spl dom json zip zlib
WRKSRC= ${WRKDIR}/moodle
-OPTIONS= MYSQL "Add support for a MySQL database server" On \
- PGSQL "Add support for a PostgreSQL database server" Off \
- MSSQL "Add support for a MS SQL Server" Off \
- LDAP "Add LDAP authentication functionality" Off \
- MIMETEX "Add mimeTeX filter functionality" Off
+OPTIONS_DEFINE= MYSQL PGSQL MSSQL LDAP MIMETEX
+OPTIONS_DEFAULT= MYSQL
+MIMETEX_DESC= mimeTeX filter functionality
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_PHP+= mysqli
.endif
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PHP+= pgsql
.endif
-.if defined(WITH_MSSQL)
+.if ${PORT_OPTIONS:MMSSQL}
USE_PHP+= mssql
.endif
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
USE_PHP+= ldap
.endif
-.if defined(WITH_MIMETEX)
+.if ${PORT_OPTIONS:MMIMETEX}
RUN_DEPENDS+= ${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:${PORTSDIR}/www/mimetex
.endif
@@ -79,11 +77,11 @@ do-install:
>> ${TMPPLIST}
${CHMOD} 755 ${PREFIX}/${MOODLEDATADIR}
@${ECHO_CMD} '@exec ${CHMOD} 755 ${PREFIX}/${MOODLEDATADIR}' >> ${TMPPLIST}
-.if !defined(WITHOUT_MIMETEX)
+.if ${PORT_OPTIONS:MMIMETEX}
${LN} -sf ${PREFIX}/www/mimetex/cgi-bin/mimetex.cgi ${PREFIX}/${MOODLEDIR}/filter/tex/mimetex.freebsd
.endif
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/www/node06/Makefile
==============================================================================
--- head/www/node06/Makefile Tue Jun 4 10:00:12 2013 (r319845)
+++ head/www/node06/Makefile Tue Jun 4 10:01:59 2013 (r319846)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: node
-# Date created: 2010-04-12
-# Whom: Jin-Sih Lin <linpct at gmail.com>
-#
+# Created by: Jin-Sih Lin <linpct at gmail.com>
# $FreeBSD$
-#
PORTNAME= node
PORTVERSION= 0.6.21
@@ -16,7 +12,8 @@ COMMENT= V8 JavaScript for client and se
LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
-OPTIONS= SHARED_V8 "Build with lang/v8" off
+OPTIONS_DEFINE= SHARED_V8
+SHARED_V8_DESC= Build with lang/v8
CONFLICTS= node-0.[0-57-9]* node-devel-0.[0-9]*
@@ -41,7 +38,7 @@ WAF_ARGS= --jobs=${MAKE_JOBS_NUMBER}
.include <bsd.port.options.mk>
-.if defined(WITH_SHARED_V8)
+.if ${PORT_OPTIONS:MSHARED_V8}
CONFIGURE_ARGS+=--shared-v8 \
--shared-v8-includes=${LOCALBASE}/include \
--shared-v8-libpath=${LOCALBASE}/lib \
Modified: head/www/ocaml-net/Makefile
==============================================================================
--- head/www/ocaml-net/Makefile Tue Jun 4 10:00:12 2013 (r319845)
+++ head/www/ocaml-net/Makefile Tue Jun 4 10:01:59 2013 (r319846)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ocaml-net
-# Date created: 01 March 2003
-# Whom: Stephane Legrand <stephane at freebsd.org>
-#
+# Created by: Stephane Legrand <stephane at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= net
PORTVERSION= 3.5.1
@@ -45,35 +41,35 @@ OCAML_PKGDIRS= netsys netshm equeue shel
netcgi2-plex netcamlbox netmulticore rpc-auth-local
OCAML_LDLIBS= ${OCAML_PKGDIRS:S/^/${OCAML_SITELIBDIR}\//}
-OPTIONS= SSL "Enable SSL support" ON \
- NETHTTPD "Enable the integrated HTTP daemon" OFF \
- AUTH_DH "Enable Diffie-Hellman authorization support" OFF \
- GTK2 "Enable GTK2 support" OFF \
- APACHE "Enable Apache mod connector (experimental)" OFF \
- ZIP "Enable compression support" OFF \
- SCRAM "Enable SCRAM support" OFF
+OPTIONS_DEFINE= SSL NETHTTPD AUTH_DH GTK2 APACHE ZIP SCRAM EXAMPLES DOCS
+OPTIONS_DEFAULT= SSL
+AUTH_DH_DESC= Diffie-Hellman authorization support
+NETHTTPD_DESC= Integrated HTTP daemon
+SCRAM_DESC= SCRAM support
+ZIP_DESC= Compression support
+APACHE_DESC= Apache mod connector (experimental)
CONFIGURE_ARGS+= -disable-gtk
.include <bsd.port.options.mk>
-.if defined(WITHOUT_SSL)
-CONFIGURE_ARGS+= -disable-ssl
-.else
+.if ${PORT_OPTIONS:MSSL}
CONFIGURE_ARGS+= -enable-ssl
BUILD_DEPENDS+= ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl
RUN_DEPENDS+= ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl
OCAML_PKGDIRS+= equeue-ssl rpc-ssl
+.else
+CONFIGURE_ARGS+= -disable-ssl
.endif
-.if defined(WITH_NETHTTPD)
+.if ${PORT_OPTIONS:MNETHTTPD}
CONFIGURE_ARGS+= -with-nethttpd
OCAML_PKGDIRS+= nethttpd nethttpd-for-netcgi2
.else
CONFIGURE_ARGS+= -without-nethttpd
.endif
-.if defined(WITH_AUTH_DH)
+.if ${PORT_OPTIONS:MAUTH_DH}
CONFIGURE_ARGS+= -with-rpc-auth-dh
BUILD_DEPENDS+= ${SA_DIR}/cryptgps/cryptgps.a:${PORTSDIR}/security/ocaml-cryptgps
RUN_DEPENDS+= ${SA_DIR}/cryptgps/cryptgps.a:${PORTSDIR}/security/ocaml-cryptgps
@@ -82,7 +78,7 @@ OCAML_PKGDIRS+= rpc-auth-dh
CONFIGURE_ARGS+= -without-rpc-auth-dh
.endif
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
CONFIGURE_ARGS+= -enable-gtk2
BUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
@@ -91,7 +87,7 @@ OCAML_PKGDIRS+= equeue-gtk2
CONFIGURE_ARGS+= -disable-gtk2
.endif
-.if defined(WITH_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
USE_APACHE= 22+
CONFIGURE_ARGS+= -enable-apache -apxs ${APXS} -apache ${HTTPD}
OCAML_PKGDIRS+= netcgi_apache
@@ -99,7 +95,7 @@ OCAML_PKGDIRS+= netcgi_apache
CONFIGURE_ARGS+= -disable-apache
.endif
-.if defined(WITH_ZIP)
+.if ${PORT_OPTIONS:MZIP}
CONFIGURE_ARGS+= -enable-zip
BUILD_DEPENDS+= ${SA_DIR}/zip/zip.a:${PORTSDIR}/archivers/ocaml-zip
RUN_DEPENDS+= ${SA_DIR}/zip/zip.a:${PORTSDIR}/archivers/ocaml-zip
@@ -108,7 +104,7 @@ OCAML_PKGDIRS+= netzip
CONFIGURE_ARGS+= -disable-zip
.endif
-.if defined(WITH_SCRAM)
+.if ${PORT_OPTIONS:MSCRAM}
CONFIGURE_ARGS+= -enable-crypto
BUILD_DEPENDS+= ${SA_DIR}/cryptokit/cryptokit.a:${PORTSDIR}/security/ocaml-cryptokit
RUN_DEPENDS+= ${SA_DIR}/cryptokit/cryptokit.a:${PORTSDIR}/security/ocaml-cryptokit
@@ -126,11 +122,11 @@ post-patch:
${WRKSRC}/src/netzip/Makefile
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}/
@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/)
.endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} ${EXAMPLESDIR}/
@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/)
.endif
Modified: head/www/ocsigen/Makefile
==============================================================================
--- head/www/ocsigen/Makefile Tue Jun 4 10:00:12 2013 (r319845)
+++ head/www/ocsigen/Makefile Tue Jun 4 10:01:59 2013 (r319846)
@@ -1,7 +1,4 @@
-# New ports collection makefile for: ocsigen
-# Date created: March 14, 2007
-# Whom: Jaap Boender <jaapb at kerguelen.org>
-#
+# Created by: Jaap Boender <jaapb at kerguelen.org>
# $FreeBSD$
PORTNAME= ocsigen
@@ -29,8 +26,9 @@ USE_OCAML_LDCONFIG= yes
SA_DIR= ${PREFIX}/${OCAML_SITELIBDIR}
-OPTIONS= SQLITE "Use sqlite as a database backend" OFF \
- CAMLZIP "Use camlzip for compression" ON
+OPTIONS_DEFINE= SQLITE CAMLZIP
+OPTIONS_DEFAULT= CAMLZIP
+CAMLZIP_DESC= Use camlzip for compression
USE_GMAKE= yes
HAS_CONFIGURE= yes
@@ -50,16 +48,17 @@ CONFIGURE_ARGS= --name ${PORTNAME} \
ALL_TARGET= depend all
INSTALL_TARGET= installnodoc
-.if !defined(NOPORTDOCS)
-INSTALL_TARGET+= docinstall
-PORTDOCS= *
-.endif
MAN1= ocsigen.1
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MDOCS}
+INSTALL_TARGET+= docinstall
+PORTDOCS= *
+.endif
+
+.if ${PORT_OPTIONS:MSQLITE}
BUILD_DEPENDS+= ${SA_DIR}/sqlite3/sqlite3.a:${PORTSDIR}/databases/ocaml-sqlite3
RUN_DEPENDS+= ${SA_DIR}/sqlite3/sqlite3.a:${PORTSDIR}/databases/ocaml-sqlite3
CONFIGURE_ARGS+= --enable-sqlite
@@ -68,13 +67,13 @@ PLIST_FILES+= lib/ocsigen/extensions/ocs
CONFIGURE_ARGS+= --disable-sqlite
.endif
-.if defined(WITHOUT_CAMLZIP)
-CONFIGURE_ARGS+= --disable-camlzip
-.else
+.if ${PORT_OPTIONS:MCAMLZIP}
CONFIGURE_ARGS+= --enable-camlzip
BUILD_DEPENDS+= ocaml-zip>=1.03_2:${PORTSDIR}/archivers/ocaml-zip
RUN_DEPENDS+= ocaml-zip>=1.03_2:${PORTSDIR}/archivers/ocaml-zip
PLIST_FILES+= lib/ocsigen/extensions/deflatemod.cmo
+.else
+CONFIGURE_ARGS+= --disable-camlzip
.endif
post-install:
@@ -83,4 +82,4 @@ post-install:
${PREFIX}/etc/${PORTNAME}/ocsigen.conf; \
fi
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/www/ojs2/Makefile
==============================================================================
--- head/www/ojs2/Makefile Tue Jun 4 10:00:12 2013 (r319845)
+++ head/www/ojs2/Makefile Tue Jun 4 10:01:59 2013 (r319846)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ojs
-# Date created: 4 March 2006
-# Whom: Filipe Rocha <filiperocha at gmail.com>
-#
+# Created by: Filipe Rocha <filiperocha at gmail.com>
# $FreeBSD$
-#
PORTNAME= ojs2
PORTVERSION= 2.2.1
@@ -24,11 +20,12 @@ USE_PHP= mbstring session
DEFAULT_PHP_VER=5
WANT_PHP_WEB= yes
-OPTIONS= MYSQL "Use a MySQL database" on \
- PGSQL "Use a PostgreSQL database" off \
- LDAP "Use LDAP authentication" off \
- CURL "Use cURL" on \
- MEMCACHE "Use memcached cache system" off\
+OPTIONS_DEFINE= LDAP CURL MEMCACHE DOCS
+OPTIONS_MULTI= DB
+OPTIONS_MULTI_DB= MYSQL PGSQL
+OPTIONS_DEFAULT= MYSQL LDAP
+MEMCACHE_DESC= memcached cache system
+DB_DESC= DB backend
pre-install::
@${ECHO_MSG} "======================================================================"
@@ -39,36 +36,33 @@ pre-install::
@${ECHO_MSG} "Hit Control-C now"
@${ECHO_MSG} "======================================================================"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITHOUT_MYSQL) && !defined(WITH_PGSQL)
-IGNORE= needs at least least one DB backend; please rerun 'make config'
-.endif
-.ifndef(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_PHP+= mysql
.endif
-.ifdef(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PHP+= pgsql
.endif
-.ifdef(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
USE_PHP+= ldap
.endif
-.ifdef(WITH_CURL)
+.if ${PORT_OPTIONS:MCURL}
USE_PHP+= curl
.endif
-.ifdef(WITH_MEMCACHE)
+.if ${PORT_OPTIONS:MMEMCACHE}
USE_PHP+= memcache
.endif
NONDOCS= cache/fc-locale-list.php classes config.inc.php \
dbscripts help includes index.php js lib locale pages \
plugins public registry rt styles templates tools
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
DOCS= docs
.endif
@@ -92,11 +86,11 @@ do-install:
@${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \
${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@cd ${WRKSRC}/${DOCS} && ${COPYTREE_SHARE} . ${DOCSDIR}
.endif
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/www/oops/Makefile
==============================================================================
--- head/www/oops/Makefile Tue Jun 4 10:00:12 2013 (r319845)
+++ head/www/oops/Makefile Tue Jun 4 10:01:59 2013 (r319846)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: oops
-# Date created: 15 August 2000
-# Whom: osa
-#
+# Created by: osa
# $FreeBSD$
-#
PORTNAME= oops
PORTVERSION= ${OOPSVERSION}
@@ -49,43 +45,39 @@ USE_RC_SUBR= oops
PKGMESSAGE= ${WRKDIR}/pkg-message
SUB_FILES= pkg-message
-OPTIONS= GIGABASE "GigaBase storage" on \
- DB4 "Berkeley DB v4 storage" off \
- MYSQL "MySQL auth support" off \
- PGSQL "PostgreSQL auth support" off \
- PCRE "PCRE support" off
+OPTIONS_DEFINE= MYSQL PGSQL PCRE
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list