Date: Sun, 13 Oct 2013 18:35:41 +0000 (UTC) From: Hajimu UMEMOTO <ume@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330242 - in head/security: cyrus-sasl2 cyrus-sasl2-saslauthd Message-ID: <201310131835.r9DIZfve027305@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ume Date: Sun Oct 13 18:35:41 2013 New Revision: 330242 URL: http://svnweb.freebsd.org/changeset/ports/330242 Log: use opt_USE knob. Spotted by: sunpoet Modified: head/security/cyrus-sasl2-saslauthd/Makefile head/security/cyrus-sasl2/Makefile Modified: head/security/cyrus-sasl2-saslauthd/Makefile ============================================================================== --- head/security/cyrus-sasl2-saslauthd/Makefile Sun Oct 13 17:36:31 2013 (r330241) +++ head/security/cyrus-sasl2-saslauthd/Makefile Sun Oct 13 18:35:41 2013 (r330242) @@ -48,8 +48,10 @@ BDB_CONFIGURE_ON= --with-dblib=berkeley --with-bdb-libdir=${BDB_LIB_DIR} \ --with-bdb-incdir=${BDB_INCLUDE_DIR} \ --with-bdb=${BDB_LIB_NAME} +BDB_USE= BDB=yes BDB_CONFIGURE_OFF= --with-dblib=ndbm OPENLDAP_DESC= Use OpenLDAP +OPENLDAP_USE= OPENLDAP=yes OPENLDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} HTTPFORM_DESC= Enable HTTP form authentication HTTPFORM_CONFIGURE_ENABLE=httpform @@ -57,7 +59,6 @@ HTTPFORM_CONFIGURE_ENABLE=httpform .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MBDB} -USE_BDB= yes INVALID_BDB_VER=2 .endif @@ -65,7 +66,6 @@ INVALID_BDB_VER=2 .if defined(WITH_OPENLDAP_VER) WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} .endif -USE_OPENLDAP= yes .endif .if !defined(WITHOUT_GSSAPI) && defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so) Modified: head/security/cyrus-sasl2/Makefile ============================================================================== --- head/security/cyrus-sasl2/Makefile Sun Oct 13 17:36:31 2013 (r330241) +++ head/security/cyrus-sasl2/Makefile Sun Oct 13 18:35:41 2013 (r330242) @@ -54,18 +54,23 @@ KEEP_DB_OPEN_DESC= Keep handle to Berkel KEEP_DB_OPEN_CONFIGURE_ENABLE=keep-db-open OBSOLETE_CRAM_ATTR_DESC=cmusaslsecretCRAM-MD5 property OBSOLETE_CRAM_ATTR_CONFIGURE_OFF=--enable-obsolete_cram_attr=no +BDB_USE= BDB=yes BDB_CONFIGURE_ON= --with-dblib=berkeley \ --with-bdb-libdir=${BDB_LIB_DIR} \ --with-bdb-incdir=${BDB_INCLUDE_DIR} \ --with-bdb=${BDB_LIB_NAME} BDB_CONFIGURE_OFF= --with-dblib=ndbm +MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} MYSQL_CONFIGURE_OFF= --without-mysql +PGSQL_USE= PGSQL=yes PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE} PGSQL_CONFIGURE_OFF= --without-pgsql SQLITE2_DESC= SQLite 2 database +SQLITE2_USE= SQLITE=2 SQLITE2_CONFIGURE_ON= --with-sqlite=${LOCALBASE} SQLITE2_CONFIGURE_OFF= --without-sqlite +SQLITE3_USE= SQLITE=3 SQLITE3_CONFIGURE_ON= --with-sqlite3=${LOCALBASE} SQLITE3_CONFIGURE_OFF= --without-sqlite3 CRAM_DESC= CRAM-MD5 authentication @@ -86,29 +91,12 @@ SCRAM_CONFIGURE_ENABLE= scram .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MBDB} -USE_BDB= yes INVALID_BDB_VER=2 SASLDB_NAME= sasldb2 .else SASLDB_NAME= sasldb2.db .endif -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes -.endif - -.if ${PORT_OPTIONS:MSQLITE2} -USE_SQLITE= 2 -.endif - -.if ${PORT_OPTIONS:MSQLITE3} -USE_SQLITE= 3 -.endif - .if ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL} || \ ${PORT_OPTIONS:MSQLITE2} || ${PORT_OPTIONS:MSQLITE3} CONFIGURE_ARGS+=--enable-sql
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310131835.r9DIZfve027305>