Date: Thu, 21 Mar 2013 17:43:46 +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: r314856 - in head/databases: adodb dbconnect drizzle freetds gdbm libdbi-drivers libdrizzle mysql2odbc opendbx p5-DBD-mysql p5-DBIx-Simple pxlib rrdtool rrdtool10 slony1 sqlite-ext-mobi... Message-ID: <201303211743.r2LHhkeW065475@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu Mar 21 17:43:46 2013 New Revision: 314856 URL: http://svnweb.freebsd.org/changeset/ports/314856 Log: Convert to new options framework left unconverted ports in databases category Modified: head/databases/adodb/Makefile head/databases/dbconnect/Makefile head/databases/drizzle/Makefile head/databases/freetds/Makefile head/databases/gdbm/Makefile head/databases/libdbi-drivers/Makefile head/databases/libdrizzle/Makefile head/databases/mysql2odbc/Makefile head/databases/opendbx/Makefile head/databases/p5-DBD-mysql/Makefile head/databases/p5-DBIx-Simple/Makefile head/databases/pxlib/Makefile head/databases/rrdtool/Makefile head/databases/rrdtool10/Makefile head/databases/slony1/Makefile head/databases/sqlite-ext-mobigroup/Makefile head/databases/sqlite3/Makefile head/databases/sqlrelay/Makefile head/databases/tdb/Makefile head/databases/tokyocabinet/Makefile head/databases/tokyotyrant/Makefile head/databases/virtuoso/Makefile Modified: head/databases/adodb/Makefile ============================================================================== --- head/databases/adodb/Makefile Thu Mar 21 17:39:03 2013 (r314855) +++ head/databases/adodb/Makefile Thu Mar 21 17:43:46 2013 (r314856) @@ -1,9 +1,5 @@ -# New ports collection makefile for: adodb -# Date created: 4 May 2001 -# Whom: abgoeree@uwnet.nl -# +# Created by: abgoeree@uwnet.nl # $FreeBSD$ -# PORTNAME= adodb PORTVERSION= 4.99.2 @@ -26,13 +22,14 @@ NO_BUILD= YES ADODB_SUBDIRS= contrib datadict drivers lang pear perf session xsl -OPTIONS= TESTS "Install tests" off +OPTIONS_DEFINE= TESTS DOCS +TESTS_DESC= Install tests -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> SUB_FILES+= pkg-message -.if defined (WITH_TESTS) +.if ${PORT_OPTIONS:MTESTS} PLIST_SUB+= TESTS= .else PLIST_SUB+= TESTS="@comment " @@ -50,14 +47,14 @@ do-install: @cd ${WRKSRC}; ${FIND} ${ADODB_SUBDIRS} -type f \ -exec ${INSTALL_DATA} ${WRKSRC}/{} ${DATADIR}/{} \; -.if defined (WITH_TESTS) +.if ${PORT_OPTIONS:MTESTS} @${MKDIR} ${DATADIR}/tests @cd ${WRKSRC}; ${FIND} tests -type f \ -exec ${INSTALL_DATA} ${WRKSRC}/{} ${DATADIR}/{} \; .endif post-install: -.if !defined (NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${DOCSDIR}/cute_icons_for_site @cd ${WRKSRC}; ${FIND} . ! -path './*/*' -type f -name '*.txt' \ -exec ${INSTALL_MAN} ${WRKSRC}/{} ${DOCSDIR}/{} \; @@ -68,4 +65,4 @@ post-install: .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/dbconnect/Makefile ============================================================================== --- head/databases/dbconnect/Makefile Thu Mar 21 17:39:03 2013 (r314855) +++ head/databases/dbconnect/Makefile Thu Mar 21 17:43:46 2013 (r314856) @@ -1,10 +1,5 @@ -# ex:ts=8 -# New ports collection makefile for: dbconnect -# Date created: Jul 23, 2001 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= dbconnect PORTVERSION= 0.3.5 @@ -23,14 +18,14 @@ USE_LDCONFIG= yes CXXFLAGS+= ${PTHREAD_CFLAGS} -fPIC -DFREEBSD LDFLAG+= ${PTHREAD_LIBS} -OPTIONS= MYSQL "With MySQL driver" on \ - PGSQL "With PostgreSQL driver" off +OPTIONS_DEFINE= MYSQL PGSQL +OPTIONS_DEFAULT= MYSQL -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> PLIST_SUB+= PORTVERSION=${PORTVERSION} -.if !defined(WITHOUT_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= YES CONFIGURE_ARGS+= --enable-mysql=yes \ --with-mysql_include=${LOCALBASE}/include/mysql \ @@ -40,7 +35,7 @@ PLIST_SUB+= MYSQL="" PLIST_SUB+= MYSQL="@comment " .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --enable-pgsql=yes \ --with-pgsql_include=${LOCALBASE}/include \ @@ -65,4 +60,4 @@ do-install: $${libname}.so); \ done -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/drizzle/Makefile ============================================================================== --- head/databases/drizzle/Makefile Thu Mar 21 17:39:03 2013 (r314855) +++ head/databases/drizzle/Makefile Thu Mar 21 17:43:46 2013 (r314856) @@ -1,9 +1,5 @@ -# New ports collection makefile for: drizzle -# Date created: 2010-04-22 -# Whom: Greg Larkin <glarkin@FreeBSD.org> -# +# Created by: Greg Larkin <glarkin@FreeBSD.org> # $FreeBSD$ -# PORTNAME= drizzle PORTVERSION= 2010.05.1561 @@ -34,7 +30,7 @@ GROUPS= drizzle # Replace token in the rc.d script SUB_LIST+= USERS=${USERS} -OPTIONS= DOCS "Build documentation with doxygen (very slow)" Off +OPTIONS_DEFINE= DOXYGEN NLS BUILD_DEPENDS+= libdrizzle>=0:${PORTSDIR}/databases/libdrizzle \ e2fsprogs-libuuid>=0:${PORTSDIR}/misc/e2fsprogs-libuuid \ @@ -57,22 +53,21 @@ MAN8= drizzled.8 USE_RC_SUBR= drizzle-server -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${ARCH} == "i386" CONFIGURE_ARGS+=--disable-64bit .endif -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif -.if !defined(NOPORTDOCS) -.if defined(WITH_DOCS) +.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN} BUILD_DEPENDS+= doxygen>=0:${PORTSDIR}/devel/doxygen \ ${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz ALL_TARGET= all doxygen @@ -84,6 +79,5 @@ post-install:: .else PLIST_SUB+= PORTDOCS="@comment " .endif -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/freetds/Makefile ============================================================================== --- head/databases/freetds/Makefile Thu Mar 21 17:39:03 2013 (r314855) +++ head/databases/freetds/Makefile Thu Mar 21 17:43:46 2013 (r314856) @@ -1,7 +1,4 @@ -# New ports collection makefile for: freetds -# Date created: 02 Nov 1999 -# Whom: Domas Mituzas <midom@dammit.lt> -# +# Created by: Domas Mituzas <midom@dammit.lt> # $FreeBSD$ PORTNAME= freetds @@ -30,35 +27,34 @@ PORTDOCS= * MAN1= datacopy.1 freebcp.1 tsql.1 bsqldb.1 defncopy.1 -OPTIONS= OPENSSL "Use openssl" off \ - GNUTLS "Use GNUTLS" off \ - IODBC "Use iodbc (Mutually Exclusive)" off \ - UNIXODBC "Use unixodbc (Mutually Exclusive)" off \ - MSDBLIB "MS SQL Server support (breaks databases/sybtcl)" off +OPTIONS_DEFINE= OPENSSL GNUTLS MSDBLIB DOCS +OPTIONS_RADIO= ODBC +OPTIONS_RADIO_ODBC= IODBC UNIXODBC +MSDBLIB_DESC= MS SQL Server support (breaks databases/sybtcl) -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_OPENSSL) +.if ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif -.if defined(WITH_GNUTLS) +.if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+=--with-gnutls .endif -.if defined(WITH_IODBC) +.if ${PORT_OPTIONS:MIODBC} LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc CONFIGURE_ARGS+= --with-iodbc=${LOCALBASE} .endif -.if defined(WITH_UNIXODBC) +.if ${PORT_OPTIONS:MUNIXODBC} LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+= --with-unixodbc=${LOCALBASE} .endif -.if defined(WITH_IODBC) || defined(WITH_UNIXODBC) +.if ${PORT_OPTIONS:MIODBC) || defined(WITH_UNIXODBC} PLIST_SUB+= ODBC="" .else PLIST_SUB+= ODBC="@comment " @@ -66,7 +62,7 @@ PLIST_SUB+= ODBC="@comment " # We cannot use msdblib-style by default, because port databases/sybtcl # relies on sybase-style dblib -.if defined(WITH_MSDBLIB) +.if ${PORT_OPTIONS:MMSDBLIB} CONFIGURE_ARGS+= --enable-msdblib .endif @@ -84,7 +80,7 @@ post-patch: s| common.h||g' post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} images ${DOCSDIR} @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} doc ${DOCSDIR} .endif @@ -93,4 +89,4 @@ post-install: @${ECHO_CMD} "Sample configuration files have been installed in ${PREFIX}/etc" @${ECHO_CMD} "You should edit them and remove the .dist-suffix from their names" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/gdbm/Makefile ============================================================================== --- head/databases/gdbm/Makefile Thu Mar 21 17:39:03 2013 (r314855) +++ head/databases/gdbm/Makefile Thu Mar 21 17:43:46 2013 (r314856) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gdbm -# Date created: 8 Apr 1996 -# Whom: Brent J. Nordquist <bjn@visi.com> -# +# Created by: Brent J. Nordquist <bjn@visi.com> # $FreeBSD$ -# PORTNAME= gdbm PORTVERSION= 1.9.1 @@ -13,7 +9,8 @@ MASTER_SITES= GNU MAINTAINER= gabor@FreeBSD.org COMMENT= The GNU database manager -OPTIONS= COMPAT "dbm/ndbm compatibility" off +OPTIONS_DEFINE= COMPAT +COMPAT_DESC= dbm/ndbm compatibility GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool @@ -25,7 +22,7 @@ MAN3= gdbm.3 .include <bsd.port.options.mk> -.if defined(WITH_COMPAT) +.if ${PORT_OPTIONS:MCOMPAT} CONFIGURE_ARGS+=--enable-libgdbm-compat PLIST_SUB= GDBM_COMPAT="" .else @@ -33,10 +30,10 @@ PLIST_SUB= GDBM_COMPAT="@comment " .endif pre-everything:: -.if !defined(WITH_COMPAT) +.if ! ${PORT_OPTIONS:MCOMPAT} @${ECHO_MSG} @${ECHO_MSG} "If you need UNIX dbm/ndbm compatibility functions," - @${ECHO_MSG} "use \"make WITH_COMPAT=yes\"" + @${ECHO_MSG} "use \"make WITH=COMPAT\"" @${ECHO_MSG} .endif Modified: head/databases/libdbi-drivers/Makefile ============================================================================== --- head/databases/libdbi-drivers/Makefile Thu Mar 21 17:39:03 2013 (r314855) +++ head/databases/libdbi-drivers/Makefile Thu Mar 21 17:43:46 2013 (r314856) @@ -1,9 +1,5 @@ -# Ports collection makefile for: libdbi-drivers -# Date created: Oct 30, 2003 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= libdbi-drivers DISTVERSION= 0.8.3-1 @@ -22,23 +18,15 @@ CONFIGURE_ARGS= --disable-static \ --with-dbi-incdir=${LOCALBASE}/include/dbi DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION} -OPTIONS= MYSQL "With MySQL Driver" on \ - MSQL "With MSQL Driver" off \ - PGSQL "With PostgreSQL Driver" on \ - SQLITE2 "With SQLite 2 Driver" off \ - SQLITE3 "With SQLite 3 Driver" on \ - FIREBIRD "With Firebird Driver (BROKEN)" off \ - FREETDS "With FreeTDS Driver" off - -.include <bsd.port.pre.mk> - -.if defined(WITHOUT_MYSQL) && defined(WITHOUT_MSQL) && defined(WITHOUT_PGSQL) \ - && defined(WITHOUT_SQLITE2) && defined(WITHOUT_SQLITE3) \ - && defined(WITHOUT_FIREBIRD) && defined(WITHOUT_FREETDS) -IGNORE= choose at least one driver -.endif +OPTIONS_MULTI= DRIVER +OPTIONS_MULTI_DRIVER= MYSQL MSQL PGSQL SQLITE2 SQLITE3 FIREBIRD FREETDS + +OPTIONS_DEFAULT= MYSQL PGSQL SQLITE3 +SQLITE2_DESC= SQLite 2 Database + +.include <bsd.port.options.mk> -.if !defined(WITHOUT_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql PLIST_SUB+= MYSQL="" @@ -46,7 +34,7 @@ PLIST_SUB+= MYSQL="" PLIST_SUB+= MYSQL="@comment " .endif -.if defined(WITH_MSQL) +.if ${PORT_OPTIONS:MMSQL} LIB_DEPENDS+= msql.1:${PORTSDIR}/databases/msql CONFIGURE_ARGS+= --with-msql PLIST_SUB+= MSQL="" @@ -54,7 +42,7 @@ PLIST_SUB+= MSQL="" PLIST_SUB+= MSQL="@comment " .endif -.if !defined(WITHOUT_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql PLIST_SUB+= PGSQL="" @@ -62,7 +50,7 @@ PLIST_SUB+= PGSQL="" PLIST_SUB+= PGSQL="@comment " .endif -.if defined(WITH_SQLITE2) +.if ${PORT_OPTIONS:MSQLITE2} LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_ARGS+= --with-sqlite PLIST_SUB+= SQLITE2="" @@ -70,7 +58,7 @@ PLIST_SUB+= SQLITE2="" PLIST_SUB+= SQLITE2="@comment " .endif -.if !defined(WITHOUT_SQLITE3) +.if ${PORT_OPTIONS:MSQLITE3} LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3 CONFIGURE_ARGS+= --with-sqlite3 PLIST_SUB+= SQLITE3="" @@ -78,7 +66,7 @@ PLIST_SUB+= SQLITE3="" PLIST_SUB+= SQLITE3="@comment " .endif -.if defined(WITH_FIREBIRD) +.if ${PORT_OPTIONS:MFIREBIRD} LIB_DEPENDS+= gds.2:${PORTSDIR}/databases/firebird20-client CONFIGURE_ARGS+= --with-firebird PLIST_SUB+= FIREBIRD="" @@ -86,7 +74,7 @@ PLIST_SUB+= FIREBIRD="" PLIST_SUB+= FIREBIRD="@comment " .endif -.if defined(WITH_FREETDS) +.if ${PORT_OPTIONS:MFREETDS} LIB_DEPENDS+= tds.5:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+= --with-freetds PLIST_SUB+= FREETDS="" @@ -102,4 +90,4 @@ post-patch: -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure @${TOUCH} ${WRKSRC}/drivers/*/dbd_*/* -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/libdrizzle/Makefile ============================================================================== --- head/databases/libdrizzle/Makefile Thu Mar 21 17:39:03 2013 (r314855) +++ head/databases/libdrizzle/Makefile Thu Mar 21 17:43:46 2013 (r314856) @@ -1,9 +1,5 @@ -# New ports collection makefile for: libdrizzle -# Date created: 2010-03-03 -# Whom: Greg Larkin <glarkin@FreeBSD.org> -# +# Created by: Greg Larkin <glarkin@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libdrizzle PORTVERSION= 0.8 @@ -17,7 +13,7 @@ COMMENT= Client and protocol library for LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 -OPTIONS= DOCS "Build documentation with doxygen" Off +OPTIONS_DEFINE= DOXYGEN EXAMPLES USE_GCC= 4.2+ GNU_CONFIGURE= yes @@ -28,10 +24,9 @@ USE_LDCONFIG= yes SAMPLE_PROGS= client pipe_query proxy server simple \ simple_multi sqlite_server -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(NOPORTDOCS) -.if defined(WITH_DOCS) +.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEB} BUILD_DEPENDS+= doxygen>=0:${PORTSDIR}/devel/doxygen ALL_TARGET= all doxygen PLIST_SUB+= PORTDOCS="" @@ -42,9 +37,8 @@ post-install:: .else PLIST_SUB+= PORTDOCS="@comment " .endif -.endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} post-install:: @${INSTALL} -d ${EXAMPLESDIR} .for i in ${SAMPLE_PROGS} Modified: head/databases/mysql2odbc/Makefile ============================================================================== --- head/databases/mysql2odbc/Makefile Thu Mar 21 17:39:03 2013 (r314855) +++ head/databases/mysql2odbc/Makefile Thu Mar 21 17:43:46 2013 (r314856) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mysql2odbc -# Date created: 8 Aug 2005 -# Whom: Max Khon <fjoe@FreeBSD.org> -# +# Created by: Max Khon <fjoe@FreeBSD.org> # $FreeBSD$ -# PORTNAME= mysql2odbc PORTVERSION= 0.99.2 @@ -14,25 +10,18 @@ MASTER_SITES= http://www.iodbc.org/downl MAINTAINER= fjoe@FreeBSD.org COMMENT= Openlink MySQL-ODBC Gateway -OPTIONS= UNIXODBC "Build with unixODBC" on \ - IODBC "Build with iODBC" off \ +OPTIONS_SINGLE= ODBC +OPTIONS_SINGLE_ODBC= UNIXODBC IODBC +OPTIONS_DEFAULT= UNIXODBC -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITH_UNIXODBC) && !defined(WITH_IODBC) -WITH_UNIXODBC= yes -.endif - -.if defined(WITH_UNIXODBC) && defined(WITH_IODBC) -BROKEN= UNIXODBC and IODBC options are mutually exclusive -.endif - -.if defined(WITH_UNIXODBC) +.if ${PORT_OPTIONS:MUNIXODBC} LIB_DEPENDS= odbc:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS= --with-unixodbc=${LOCALBASE} .endif -.if defined(WITH_IODBC) +.if ${PORT_OPTIONS:MIODBC} LIB_DEPENDS= iodbc:${PORTSDIR}/databases/libiodbc CONFIGURE_ARGS= --with-iodbc .endif @@ -44,4 +33,4 @@ LDFLAGS+= ${PTHREAD_LIBS} USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/opendbx/Makefile ============================================================================== --- head/databases/opendbx/Makefile Thu Mar 21 17:39:03 2013 (r314855) +++ head/databases/opendbx/Makefile Thu Mar 21 17:43:46 2013 (r314856) @@ -1,9 +1,5 @@ -# New ports collection makefile for: opendbx -# Date Created: 17 March 2006 -# Whom: tremere@cainites.net -# +# Created by: tremere@cainites.net # $FreeBSD$ -# PORTNAME= opendbx PORTVERSION= 1.4.5 @@ -23,20 +19,17 @@ CONFIGURE_ARGS+= --with-backends="${CONF USE_LDCONFIG= ${PREFIX}/lib/opendbx -OPTIONS= MYSQL "Support for the MySQL database" on \ - PGSQL "Support for the PostgreSQL database" off \ - SQLITE "Support for the SQLite 2 database" off \ - SQLITE3 "Support for the SQLite 3 database" off \ - MSSQL "Support for the MSSQL database" off \ - SYBASE "Support for the Sybase database" off +OPTIONS_DEFINE= NLS +OPTIONS_MULTI= DRIVER +OPTIONS_MULTI_DRIVER= MYSQL PGSQL SQLITE2 MSSQL SYBASE +OPTIONS_DEFAULT= MYSQL +SQLITE2_DESC= SQLite 2 database +SYBASE_DESC= Sybase database +DRIVER_DESC= Database drivers -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE) && !defined(WITH_SQLITE3) && !defined(WITH_MSSQL) && !defined(WITH_SYBASE) -IGNORE= needs at least one database backend -.endif - -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL?= YES CONFIGURE_MODULES+= "mysql" CPPFLAGS+= -I${LOCALBASE}/include/mysql @@ -46,7 +39,7 @@ PLIST_SUB+= WITHMYSQL="" PLIST_SUB+= WITHMYSQL="@comment " .endif -.if !defined(WITHOUT_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL?= YES CONFIGURE_MODULES+= "pgsql" PLIST_SUB+= WITHPGSQL="" @@ -54,7 +47,7 @@ PLIST_SUB+= WITHPGSQL="" PLIST_SUB+= WITHPGSQL="@comment " .endif -.if defined(WITH_SQLITE) +.if ${PORT_OPTIONS:MSQLITE} LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_MODULES+= "sqlite" PLIST_SUB+= WITHSQLITE="" @@ -62,7 +55,7 @@ PLIST_SUB+= WITHSQLITE="" PLIST_SUB+= WITHSQLITE="@comment " .endif -.if defined(WITH_SQLITE3) +.if ${PORT_OPTIONS:MSQLITE3} LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 CONFIGURE_MODULES+= "sqlite3" PLIST_SUB+= WITHSQLITE3="" @@ -70,7 +63,7 @@ PLIST_SUB+= WITHSQLITE3="" PLIST_SUB+= WITHSQLITE3="@comment " .endif -.if defined(WITH_MSSQL) +.if ${PORT_OPTIONS:MMSSQL} LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds CONFIGURE_MODULES+= "mssql" PLIST_SUB+= WITHMSSQL="" @@ -78,7 +71,7 @@ PLIST_SUB+= WITHMSSQL="" PLIST_SUB+= WITHMSSQL="@comment " .endif -.if defined(WITH_SYBASE) +.if ${PORT_OPTIONS:MSYBASE} LIB_DEPENDS+= ct.4:${PORTSDIR}/databases/freetds CONFIGURE_MODULES+= "sybase" PLIST_SUB+= WITHSYBASE="" @@ -86,12 +79,12 @@ PLIST_SUB+= WITHSYBASE="" PLIST_SUB+= WITHSYBASE="@comment " .endif -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.else +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+= --disable-nls +PLIST_SUB+= NLS="@comment " .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/p5-DBD-mysql/Makefile ============================================================================== --- head/databases/p5-DBD-mysql/Makefile Thu Mar 21 17:39:03 2013 (r314855) +++ head/databases/p5-DBD-mysql/Makefile Thu Mar 21 17:43:46 2013 (r314856) @@ -1,9 +1,5 @@ -# New ports collection makefile for: DBD::mysql -# Date created: 27 Nov 2001 -# Whom: Sergey Skvortsov <skv@FreeBSD.org> -# +# Created by: Sergey Skvortsov <skv@FreeBSD.org> # $FreeBSD$ -# PORTNAME= DBD-mysql PORTVERSION= 4.021 @@ -29,11 +25,11 @@ PERL_CONFIGURE= yes MAN3= Bundle::DBD::mysql.3 DBD::mysql.3 DBD::mysql::INSTALL.3 -OPTIONS= SSL "build with OpenSSL support" off +OPTIONS_DEFINE= SSL .include <bsd.port.options.mk> -.if defined(WITH_SSL) +.if ${PORT_OPTIONS:MSSL} CONFIGURE_ARGS+= --ssl RUN_DEPENDS+= p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay .endif Modified: head/databases/p5-DBIx-Simple/Makefile ============================================================================== --- head/databases/p5-DBIx-Simple/Makefile Thu Mar 21 17:39:03 2013 (r314855) +++ head/databases/p5-DBIx-Simple/Makefile Thu Mar 21 17:43:46 2013 (r314856) @@ -1,9 +1,5 @@ -# New ports collection makefile for: DBIx::Simple -# Date created: 10 December 2005 -# Whom: Parv <parv@pair.org> -# +# Created by: Parv <parv@pair.org> # $FreeBSD$ -# PORTNAME= DBIx-Simple PORTVERSION= 1.35 @@ -16,10 +12,11 @@ COMMENT= Simplified object oriented inte RUN_DEPENDS= p5-DBI>=1.21:${PORTSDIR}/databases/p5-DBI -OPTIONS= SQL_INTERP "Interpolate Perl variables into SQL" off \ - SQL_ABSTRACT "Generate SQL from Perl data structures" off \ - DBIX_XHTML_TABLE "Create XHTML tables from SQL queries" off \ - TEXT_TABLE "Create plain text table from data" off +OPTIONS_DEFINE= SQL_INTERP SQL_ABSTRACT DBIX_XHTML_TABLE TEXT_TABLE +SQL_INTERP_DESC= Interpolate Perl variables into SQL +SQL_ABSTRACT_DESC= Generate SQL from Perl data structures +DBIX_XHTML_TABLE_DESC= Create XHTML tables from SQL queries +TEXT_TABLE_DESC= Create plain text table from data PERL_CONFIGURE= yes @@ -28,22 +25,22 @@ MAN3= DBIx::Simple.3 \ DBIx::Simple::Comparison.3 \ DBIx::Simple::Result::RowObject.3 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_SQL_INTERP) +.if ${PORT_OPTIONS:MSQL_INTERP} RUN_DEPENDS+= p5-SQL-Interp>=0:${PORTSDIR}/databases/p5-SQL-Interp .endif -.if defined(WITH_SQL_ABSTRACT) +.if ${PORT_OPTIONS:MSQL_ABSTRACT} RUN_DEPENDS+= p5-SQL-Abstract>=0:${PORTSDIR}/databases/p5-SQL-Abstract .endif -.if defined(WITH_DBIX_XHTML_TABLE) +.if ${PORT_OPTIONS:MDBIX_XHTML_TABLE} RUN_DEPENDS+= p5-DBIx-XHTML_Table>=0:${PORTSDIR}/databases/p5-DBIx-XHTML_Table .endif -.if defined(WITH_TEXT_TABLE) +.if ${PORT_OPTIONS:MTEXT_TABLE} RUN_DEPENDS+= p5-Text-Table>=0:${PORTSDIR}/textproc/p5-Text-Table .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/pxlib/Makefile ============================================================================== --- head/databases/pxlib/Makefile Thu Mar 21 17:39:03 2013 (r314855) +++ head/databases/pxlib/Makefile Thu Mar 21 17:43:46 2013 (r314856) @@ -1,9 +1,5 @@ -# New ports collection makefile for: pxlib -# Date created: 10 December 2005 -# Whom: Sergey Matveychuk <sem@FreeBSD.org> -# +# Created by: Sergey Matveychuk <sem@FreeBSD.org> # $FreeBSD$ -# PORTNAME= pxlib PORTVERSION= 0.6.3 @@ -27,11 +23,12 @@ LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes -OPTIONS= DOCS "Build and install documentation" off +OPTIONS_DEFINE= MAN +MAN_DESC= Build and install manpages -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_DOCS) +.if ${PORT_OPTIONS:MMAN} BUILD_DEPENDS+= docbook-to-man:${PORTSDIR}/textproc/docbook-to-man \ docbook2man:${PORTSDIR}/textproc/docbook-utils @@ -58,4 +55,4 @@ pre-build: ${REINPLACE_CMD} -e 's/^DOCDIR =.*/DOCDIR =/' ${WRKSRC}/Makefile .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/rrdtool/Makefile ============================================================================== --- head/databases/rrdtool/Makefile Thu Mar 21 17:39:03 2013 (r314855) +++ head/databases/rrdtool/Makefile Thu Mar 21 17:43:46 2013 (r314856) @@ -1,9 +1,5 @@ -# New ports collection makefile for: rrdtool -# Date created: 20 July 1999 -# Whom: Dmitry Sivachenko <dima@Chg.RU> -# +# Created by: Dmitry Sivachenko <dima@Chg.RU> # $FreeBSD$ -# PORTNAME= rrdtool PORTVERSION= 1.4.7 @@ -38,16 +34,18 @@ PORTDOCS= * PORTEXAMPLES= 4charts.pl bigtops.pl cgi-demo.cgi minmax.pl perftest.pl \ piped-demo.pl shared-demo.pl stripes.pl -OPTIONS= DEJAVU "Use DejaVu fonts (requires X11)" off \ - JSON "Support of json export" off \ - MMAP "Use mmap in rrd_update" on \ - PERL_MODULE "Build PERL module" on \ - PYTHON_MODULE "Build PYTHON bindings" off \ - RUBY_MODULE "Build RUBY bindings" off +OPTIONS_DEFINE= DEJAVU JSON MMAP PERL_MODULE PYTHON_MODULE RUBY_MODULE EXAMPLES DOCS +OPTIONS_DEFAULT= MMAP PERL_MODULE +DEJAVU_DESC= Use DejaVu fonts (requires X11) +JSON_DESC= Support of json export +MMAP_DESC= Use mmap in rrd_update +PERL_MODULE_DESC= Build PERL module +PYTHON_MODULE_DESC= Build PYTHON bindings +RUBY_MODULE_DESC= Build RUBY bindings .include <bsd.port.options.mk> -.if defined(WITH_PYTHON_MODULE) +.if ${PORT_OPTIONS:MPYTHON_MODULE} USE_PYTHON= yes INSTALLS_EGGINFO=yes PYDISTUTILS_EGGINFO=py_rrdtool-0.2.1-${PYTHON_VERSION:S/thon//}.egg-info @@ -59,7 +57,7 @@ CONFIGURE_ARGS+= --disable-python PLIST_SUB+= WITH_PYTHON="@comment " .endif -.if defined(WITH_RUBY_MODULE) +.if ${PORT_OPTIONS:MRUBY_MODULE} USE_RUBY= yes .include "${PORTSDIR}/Mk/bsd.ruby.mk" PLIST_SUB+= WITH_RUBY="" @@ -69,7 +67,7 @@ CONFIGURE_ARGS+= --disable-ruby PLIST_SUB+= WITH_RUBY="@comment " .endif -.if !defined(WITHOUT_PERL_MODULE) +.if ${PORT_OPTIONS:MPERL_MODULE} USE_PERL5= yes CONFIGURE_ARGS+= --enable-perl --enable-perl-site-install PLIST_SUB+= WITH_PERL="" @@ -78,15 +76,15 @@ CONFIGURE_ARGS+= --disable-perl PLIST_SUB+= WITH_PERL="@comment " .endif -.if defined(WITHOUT_MMAP) +.if ! ${PORT_OPTIONS:MMMAP} CONFIGURE_ARGS+= --disable-mmap .endif -.if defined(WITH_JSON) +.if ${PORT_OPTIONS:MJSON} EXTRA_PATCHES+= ${FILESDIR}/thirdparty-json.diff .endif -.if exists(${LOCALBASE}/lib/X11/fonts/dejavu) || defined(WITH_DEJAVU) +.if exists(${LOCALBASE}/lib/X11/fonts/dejavu) || ${PORT_OPTIONS:MDEJAVU} RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu .endif @@ -102,26 +100,26 @@ MAN1= bin_dec_hex.1 cdeftutorial.1 rpnt rrdresize.1 rrdrestore.1 rrdthreads.1 rrdtool.1 rrdtune.1 \ rrdtutorial.1 rrdupdate.1 rrdxport.1 -.if !defined(WITHOUT_PERL_MODULE) +.if ${PORT_OPTIONS:MPERL_MODULE} MAN3= RRDp.3 RRDs.3 MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} .endif post-extract: @${REINPLACE_CMD} -e 's/^POD3/#POD3/' ${WRKSRC}/doc/Makefile.in -.if defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's/[[:space:]]install-idocDATA//g' \ -e 's/[[:space:]]install-ihtmlDATA//g' \ -e 's/^[[:space:]].*cd .* rrdtool.html index.html/ #/' \ ${WRKSRC}/doc/Makefile.in .endif -.if defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} ${REINPLACE_CMD} -e '/^SUBDIRS = /s| examples | |' \ ${WRKSRC}/Makefile.in .endif post-install: -.if !defined(BATCH) && !defined(NOPORTEXAMPLES) +.if !defined(BATCH) && ${PORT_OPTIONS:MEXAMPLES} @${ECHO_MSG} "" @${ECHO_MSG} "############################################################################" @${ECHO_MSG} "# See ${EXAMPLESDIR} for some demonstration code #" Modified: head/databases/rrdtool10/Makefile ============================================================================== --- head/databases/rrdtool10/Makefile Thu Mar 21 17:39:03 2013 (r314855) +++ head/databases/rrdtool10/Makefile Thu Mar 21 17:43:46 2013 (r314856) @@ -1,9 +1,5 @@ -# New ports collection makefile for: rrdtool -# Date created: 20 July 1999 -# Whom: Dmitry Sivachenko <dima@Chg.RU> -# +# Created by: Dmitry Sivachenko <dima@Chg.RU> # $FreeBSD$ -# PORTNAME= rrdtool PORTVERSION= 1.0.50 @@ -37,11 +33,12 @@ MAN1= RRDp.1 RRDs.1 bin_dec_hex.1 rrdcg MAN3= RRDp.3 RRDs.3 MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} -OPTIONS= LATIN2 "ISO-8859-2 fonts support" off +OPTIONS_DEFINE= LATIN2 +LATIN2_DESC= ISO-8859-2 fonts support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_LATIN2) +.if ${PORT_OPTIONS:MLATIN2} CONFIGURE_ARGS+=--enable-latin2 .endif @@ -54,7 +51,7 @@ BROKEN= Does not build on ia64 .endif post-extract: -.if defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's/install-idocDATA install-ihtmlDATA//g' \ ${WRKSRC}/doc/Makefile.in .endif @@ -67,4 +64,4 @@ post-install: @${ECHO_MSG} "############################################################################" .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/slony1/Makefile ============================================================================== --- head/databases/slony1/Makefile Thu Mar 21 17:39:03 2013 (r314855) +++ head/databases/slony1/Makefile Thu Mar 21 17:43:46 2013 (r314856) @@ -23,13 +23,14 @@ USE_RC_SUBR= slon SUB_FILES= pkg-message slon-mkservice.sh SUB_LIST+= NAME=slon -OPTIONS= PERLTOOLS "Install perl configuration tools" Off +OPTIONS_DEFINE= PERLTOOLS DOCS +PERLTOOLS_DESC= Install perl configuration tools CONFLICTS?= slony1v2-2* -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_PERLTOOLS) +.if ${PORT_OPTIONS:MPERLTOOLS} USE_PERL5= yes CONFIGURE_ARGS+= --with-perltools=${LOCALBASE}/sbin RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg @@ -55,7 +56,7 @@ MAN1= slon.1 slonik.1 .endif post-install: -.if ! defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${MKDIR} ${DOCSDIR}/adminguide ${MKDIR} ${DOCSDIR}/howto @@ -70,4 +71,4 @@ post-install: @${INSTALL_DATA} ${FILESDIR}/slon.conf-sample ${PREFIX}/etc/ @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/sqlite-ext-mobigroup/Makefile ============================================================================== --- head/databases/sqlite-ext-mobigroup/Makefile Thu Mar 21 17:39:03 2013 (r314855) +++ head/databases/sqlite-ext-mobigroup/Makefile Thu Mar 21 17:43:46 2013 (r314856) @@ -1,9 +1,5 @@ -# New ports collection makefile for: sqlite-ext-mobigroup -# Date created: 28 Jul 2010 -# Whom: Pavel Volkov <pavelivolkov@googlemail.com> -# +# Created by: Pavel Volkov <pavelivolkov@googlemail.com> # $FreeBSD$ -# PORTNAME= sqlite-ext-mobigroup PORTVERSION= 3.7.5.1 @@ -22,10 +18,11 @@ WRKSRC= ${WRKDIR}/sqlite3-${PORTVERSION USE_LDCONFIG= ${PREFIX}/libexec/${DIST_SUBDIR} -OPTIONS= COMPRESS "compress content into a blob using libz" off \ - ENV "implements the getenv" off \ - INET "provide the ipv4 functions in SQL queries" on \ - MD5 "implements the MD5 message-digest algorithm" off +OPTIONS_DEFINE= COMPRESS ENV INET MD5 EXAMPLES DOCS +COMPRESS_DESC= compress content into a blob using libz +ENV_DESC= implements the getenv +INET_DESC= provide the ipv4 functions in SQL queries +MD5_DESC= implements the MD5 message-digest algorithm PLIST_DIRS= libexec/${DIST_SUBDIR} PORTDOCS= * @@ -33,74 +30,74 @@ PORTEXAMPLES= * .include <bsd.port.options.mk> -.ifdef WITH_COMPRESS +.if ${PORT_OPTIONS:MCOMPRESS} PLIST_FILES+= libexec/${DIST_SUBDIR}/libsqlitecompress.so .endif -.ifdef WITH_INET +.if ${PORT_OPTIONS:MINET} PLIST_FILES+= libexec/${DIST_SUBDIR}/libsqliteipv4.so .endif -.ifdef WITH_ENV +.if ${PORT_OPTIONS:MENV} PLIST_FILES+= libexec/${DIST_SUBDIR}/libsqliteenv.so .endif -.ifdef WITH_MD5 +.if ${PORT_OPTIONS:MMD5} PLIST_FILES+= libexec/${DIST_SUBDIR}/libsqlitemd5.so .endif CFLAGS+= -I${PREFIX}/include -fPIC -lm -shared do-build: -.ifdef WITH_COMPRESS +.if ${PORT_OPTIONS:MCOMPRESS} @cd ${WRKSRC}/ext/_compress && \ ${CC} -lz ${CFLAGS} compress.c -o libsqlitecompress.so .endif -.ifdef WITH_INET +.if ${PORT_OPTIONS:MINET} @cd ${WRKSRC}/ext/inet && \ ${CC} ${CFLAGS} ipv4-ext.c -o libsqliteipv4.so .endif -.ifdef WITH_ENV +.if ${PORT_OPTIONS:MENV} @cd ${WRKSRC}/ext/env && \ ${CC} ${CFLAGS} env.c -o libsqliteenv.so .endif -.ifdef WITH_MD5 +.if ${PORT_OPTIONS:MMD5} @cd ${WRKSRC}/ext/md5 && \ ${CC} ${CFLAGS} md5.c -o libsqlitemd5.so .endif do-install: @${MKDIR} ${PREFIX}/libexec/${DIST_SUBDIR} -.ifndef NOPORTDOCS +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .endif -.ifndef NOPORTEXAMPLES +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} .endif -.ifdef WITH_COMPRESS +.if ${PORT_OPTIONS:MCOMPRESS} @${INSTALL_PROGRAM} ${WRKSRC}/ext/_compress/libsqlitecompress.so ${PREFIX}/libexec/${DIST_SUBDIR} .endif -.ifdef WITH_INET +.if ${PORT_OPTIONS:MINET} @${INSTALL_PROGRAM} ${WRKSRC}/ext/inet/libsqliteipv4.so ${PREFIX}/libexec/${DIST_SUBDIR} -. ifndef NOPORTDOCS +. if ${PORT_OPTIONS:MDOCS} @${SED} '/\/\*/d;/\*\//,$$d' ${WRKSRC}/ext/inet/ipv4-ext.c > ${WRKSRC}/ext/inet/README-ipv4.txt @${INSTALL_DATA} ${WRKSRC}/ext/inet/README-ipv4.txt ${DOCSDIR} . endif -. ifndef NOPORTEXAMPLES +. if ${PORT_OPTIONS:MEXAMPLES} @${INSTALL_DATA} ${WRKSRC}/ext/inet/ipv4-ext.sql ${EXAMPLESDIR} *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303211743.r2LHhkeW065475>