Date: Mon, 25 Apr 2016 16:17:32 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414019 - in head: Mk Mk/Uses databases/mysql-connector-c databases/mysql-connector-c++ databases/tcl-Mysql dns/opendnssec lang/harbour lang/php55 lang/php56 lang/php70 net-mgmt/ocsinve... Message-ID: <201604251617.u3PGHW5L015145@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Apr 25 16:17:31 2016 New Revision: 414019 URL: https://svnweb.freebsd.org/changeset/ports/414019 Log: Move MySQL support from bsd.databases.mk to Uses/mysql.mk. Also, USE_MYSQL can't happen after bsd.port.pre.mk because it is a USES. PR: 208971 Submitted by: mat Exp-run by: antoine With hat: portmgr Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D5951 Added: head/Mk/Uses/mysql.mk - copied, changed from r414018, head/Mk/bsd.database.mk Deleted: head/Mk/bsd.database.mk Modified: head/Mk/bsd.port.mk (contents, props changed) head/Mk/bsd.sanity.mk (contents, props changed) head/databases/mysql-connector-c++/Makefile (contents, props changed) head/databases/mysql-connector-c/Makefile (contents, props changed) head/databases/tcl-Mysql/Makefile (contents, props changed) head/dns/opendnssec/Makefile (contents, props changed) head/lang/harbour/Makefile (contents, props changed) head/lang/php55/Makefile.ext (contents, props changed) head/lang/php56/Makefile.ext (contents, props changed) head/lang/php70/Makefile.ext (contents, props changed) head/net-mgmt/ocsinventory-ng/Makefile (contents, props changed) head/net/mediatomb/Makefile (contents, props changed) head/textproc/sphinxsearch-devel/Makefile (contents, props changed) head/textproc/sphinxsearch/Makefile (contents, props changed) Copied and modified: head/Mk/Uses/mysql.mk (from r414018, head/Mk/bsd.database.mk) ============================================================================== --- head/Mk/bsd.database.mk Mon Apr 25 16:17:19 2016 (r414018, copy source) +++ head/Mk/Uses/mysql.mk Mon Apr 25 16:17:31 2016 (r414019) @@ -1,44 +1,56 @@ # $FreeBSD$ # - -.if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) - -Database_Post_Include= bsd.database.mk -Database_Include_MAINTAINER= ports@FreeBSD.org - -# This file contains some routines to interact with different databases, such -# as MySQL. To include this file, define macro -# USE_[DATABASE], for example USE_MYSQL. Defining macro like -# USE_[DATABASE]_VER or WANT_[DATABASE]_VER will include this file as well. +# Provide support for MySQL +# Feature: mysql +# Usage: USES=mysql or USES=mysql:args +# Valid ARGS: <version>, server, embedded +# +# version If no version is given (by the maintainer via the port), try to +# find the currently installed version. Fall back to default if +# necessary (MySQL-5.6 = 56). +# server/embedded +# Depend on the server at run/build time. If none of these is +# set, depends on the client. # -## -# USE_MYSQL - Add MySQL (client/server/embedded) dependency (default: -# client). -# If no version is given (by the maintainer via the port or -# by the user via defined variable), try to find the -# currently installed version. Fall back to default if -# necessary (MySQL-5.6 = 56). -# DEFAULT_MYSQL_VER -# - MySQL default version. Can be overridden within a port. -# Default: 56. -# WANT_MYSQL_VER -# - Maintainer can set an arbitrary version of MySQL to always -# build this port with (overrides WITH_MYSQL_VER). # IGNORE_WITH_MYSQL -# - This variable can be defined if the ports does not support -# one or more versions of MySQL. +# This variable can be defined if the ports does not support one +# or more versions of MySQL. # WITH_MYSQL_VER -# - User defined variable to set MySQL version. +# User defined variable to set MySQL version. # MYSQL_VER -# - Detected MySQL version. +# Detected MySQL version. +# +# MAINTAINER: ports@FreeBSD.org + +.if !defined(_INCLUDE_USES_MYSQL_MK) +_INCLUDE_USES_MYSQL_MK= yes .include "${PORTSDIR}/Mk/bsd.default-versions.mk" +.if !empty(mysql_ARGS) +.undef _WANT_MYSQL_VER +.undef _WANT_MYSQL_SERVER +.undef _WANT_MYSQL_EMBEDDED +_MYSQL_ARGS= ${mysql_ARGS:S/,/ /g} +.if ${_MYSQL_ARGS:Mserver} +_WANT_MYSQL_SERVER= yes +_MYSQL_ARGS:= ${_MYSQL_ARGS:Nserver} +.endif +.if ${_MYSQL_ARGS:Membedded} +_WANT_MYSQL_EMBEDDED= yes +_MYSQL_ARGS:= ${_MYSQL_ARGS:Nembedded} +.endif + +# Port requested a version +.if !empty(_MYSQL_ARGS) +_WANT_MYSQL_VER= ${_MYSQL_ARGS} +.endif +.endif # !empty(mysql_ARGS) + .if defined(DEFAULT_MYSQL_VER) WARNING+= "DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIONS=mysql=${DEFAULT_MYSQL_VER} instead" .endif -.if defined(USE_MYSQL) DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//} # MySQL client version currently supported. # When adding a version, please keep the comment in @@ -68,11 +80,11 @@ _MYSQL_VER= ${_MYSQL} .endif .endif -.if defined(WANT_MYSQL_VER) -.if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${WANT_MYSQL_VER} -IGNORE= cannot install: the port wants mysql${WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client +.if defined(_WANT_MYSQL_VER) +.if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${_WANT_MYSQL_VER} +IGNORE= cannot install: the port wants mysql${_WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client .endif -MYSQL_VER= ${WANT_MYSQL_VER} +MYSQL_VER= ${_WANT_MYSQL_VER} .elif defined(WITH_MYSQL_VER) MYSQL_VER= ${WITH_MYSQL_VER} .else @@ -81,7 +93,7 @@ MYSQL_VER= ${_MYSQL_VER} .else MYSQL_VER= ${DEFAULT_MYSQL_VER} .endif -.endif # WANT_MYSQL_VER +.endif # _WANT_MYSQL_VER .if defined(_MYSQL_VER) .if ${_MYSQL_VER} != ${MYSQL_VER} @@ -109,9 +121,9 @@ IGNORE= cannot install: does not work w . endif . endfor .endif # IGNORE_WITH_MYSQL -.if (${USE_MYSQL} == "server" || ${USE_MYSQL} == "embedded") +.if defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED) RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER} -.if (${USE_MYSQL} == "embedded") +.if defined(_WANT_MYSQL_EMBEDDED) BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER} .endif .else @@ -120,6 +132,5 @@ LIB_DEPENDS+= libmysqlclient.so.${MYSQL$ .else IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER} .endif # Check for correct libs -.endif # USE_MYSQL -.endif # defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) +.endif Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Apr 25 16:17:19 2016 (r414018) +++ head/Mk/bsd.port.mk Mon Apr 25 16:17:31 2016 (r414019) @@ -1407,6 +1407,18 @@ USES+= mate USES+=bdb:${USE_BDB} .endif +.if defined(USE_MYSQL) +USE_MYSQL:= ${USE_MYSQL:N[yY][eE][sS]:Nclient} +.if defined(WANT_MYSQL_VER) +.if empty(USE_MYSQL) +USE_MYSQL:=${WANT_MYSQL_VER} +.else +USE_MYSQL:=${USE_MYSQL},${WANT_MYSQL_VER} +.endif +.endif +USES+=mysql:${USE_MYSQL} +.endif + .if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT) .include "${PORTSDIR}/Mk/bsd.wx.mk" .endif @@ -1867,10 +1879,6 @@ _FORCE_POST_PATTERNS= rmdir kldxref mkfo .include "${PORTSDIR}/Mk/bsd.xorg.mk" .endif -.if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) -.include "${PORTSDIR}/Mk/bsd.database.mk" -.endif - .if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER1) .include "${PORTSDIR}/Mk/bsd.gstreamer.mk" .endif Modified: head/Mk/bsd.sanity.mk ============================================================================== --- head/Mk/bsd.sanity.mk Mon Apr 25 16:17:19 2016 (r414018) +++ head/Mk/bsd.sanity.mk Mon Apr 25 16:17:31 2016 (r414019) @@ -169,7 +169,7 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM U PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \ USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \ UNIQUENAME LATEST_LINK USE_SQLITE USE_FIREBIRD -SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY USE_BDB +SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY USE_BDB USE_MYSQL WANT_MYSQL_VER SANITY_NOTNEEDED= WX_UNICODE USE_AUTOTOOLS_ALT= USES=autoreconf and GNU_CONFIGURE=yes @@ -211,6 +211,8 @@ PLIST_DIRSTRY_ALT= PLIST_DIRS USE_SQLITE_ALT= USES=sqlite USE_FIREBIRD_ALT= USES=firebird USE_BDB_ALT= USES=bdb:${USE_BDB} +USE_MYSQL_ALT= USES=mysql:${USE_MYSQL} +WANT_MYSQL_VER_ALT= USES=mysql:${WANT_MYSQL_VER} .for a in ${SANITY_DEPRECATED} .if defined(${a}) Modified: head/databases/mysql-connector-c++/Makefile ============================================================================== --- head/databases/mysql-connector-c++/Makefile Mon Apr 25 16:17:19 2016 (r414018) +++ head/databases/mysql-connector-c++/Makefile Mon Apr 25 16:17:31 2016 (r414019) @@ -15,8 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_regex.so:devel/boost-libs -USE_MYSQL= 51+ -USES= cmake:outsource +USES= cmake:outsource mysql USE_LDCONFIG= yes CMAKE_ARGS= -DDOC_DESTINATION="${DOCSDIR}" Modified: head/databases/mysql-connector-c/Makefile ============================================================================== --- head/databases/mysql-connector-c/Makefile Mon Apr 25 16:17:19 2016 (r414018) +++ head/databases/mysql-connector-c/Makefile Mon Apr 25 16:17:31 2016 (r414019) @@ -12,10 +12,9 @@ COMMENT= MySQL database connector for C LICENSE= GPLv2 -USE_MYSQL= 51+ USE_OPENSSL= yes WITH_OPENSSL_PORT=yes -USES= cmake:outsource compiler:features +USES= cmake:outsource compiler:features mysql CMAKE_ARGS+= -DWITH_SSL=system \ -DOPENSSL_INCLUDE_DIR=${LOCALBASE}/include/openssl USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} Modified: head/databases/tcl-Mysql/Makefile ============================================================================== --- head/databases/tcl-Mysql/Makefile Mon Apr 25 16:17:19 2016 (r414018) +++ head/databases/tcl-Mysql/Makefile Mon Apr 25 16:17:31 2016 (r414019) @@ -15,8 +15,7 @@ OPTIONS_DEFINE= DOCS PATCH_DEPENDS= rcsdiff:devel/rcs -USE_MYSQL= 41+ -USES= tcl tar:tgz +USES= mysql tcl tar:tgz TCL_NODOT= tcl${TCL_VER:S/.//} WRKSRC= ${WRKDIR}/tcl-sql LIB_NAME= libTclMySQL.so.1 Modified: head/dns/opendnssec/Makefile ============================================================================== --- head/dns/opendnssec/Makefile Mon Apr 25 16:17:19 2016 (r414018) +++ head/dns/opendnssec/Makefile Mon Apr 25 16:17:31 2016 (r414019) @@ -47,7 +47,7 @@ SQLITE_USE= yes .if ${PORT_OPTIONS:MMYSQL} CONFIGURE_ARGS+= --with-database-backend=mysql -USE_MYSQL= compat +USES+= mysql SCRIPTDATA= migrate_adapters_1.mysql migrate_keyshare_mysql.pl \ migrate_zone_delete.mysql migrate_id_mysql.pl \ migrate_to_ng_mysql.pl migrate_1_4_8.mysql Modified: head/lang/harbour/Makefile ============================================================================== --- head/lang/harbour/Makefile Mon Apr 25 16:17:19 2016 (r414018) +++ head/lang/harbour/Makefile Mon Apr 25 16:17:31 2016 (r414019) @@ -90,6 +90,7 @@ MAKE_ENV= HB_ARCHITECTURE=${HB_ARCH} \ PGSQL_USES= pgsql FIREBIRD_USES= firebird +MYSQL_USES= mysql .include <bsd.port.pre.mk> @@ -115,7 +116,6 @@ PLIST_SUB+= SQLITE="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes MAKE_ENV+= HB_WITH_MYSQL=nolocal .else MAKE_ENV+= HB_WITH_MYSQL=no Modified: head/lang/php55/Makefile.ext ============================================================================== --- head/lang/php55/Makefile.ext Mon Apr 25 16:17:19 2016 (r414018) +++ head/lang/php55/Makefile.ext Mon Apr 25 16:17:31 2016 (r414019) @@ -499,6 +499,40 @@ CONFIGURE_ARGS+=--disable-flatfile . endif .endif +.if ${PHP_MODNAME} == "mysql" +. if ${PORT_OPTIONS:MMYSQLND} +CONFIGURE_ARGS+=--with-mysql=mysqlnd +. else +CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \ + --with-zlib-dir=/usr + +USES+= mysql +. endif +.endif + +.if ${PHP_MODNAME} == "mysqli" +. if ${PORT_OPTIONS:MMYSQLND} +CONFIGURE_ARGS+=--with-mysqli=mysqlnd +. else +CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config + +USES+= mysql +. endif +.endif + +.if ${PHP_MODNAME} == "pdo_mysql" +. if ${PORT_OPTIONS:MMYSQLND} +CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd + +USE_PHP+= mysql +. else +CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ + --with-zlib-dir=/usr + +USES+= mysql +. endif +.endif + .include <bsd.port.pre.mk> .if ${PHP_MODNAME} == "gd" @@ -542,27 +576,6 @@ CONFIGURE_ARGS+=--disable-mbregex . endif .endif -.if ${PHP_MODNAME} == "mysql" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-mysql=mysqlnd -. else -CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr - -USE_MYSQL= yes -. endif -.endif - -.if ${PHP_MODNAME} == "mysqli" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-mysqli=mysqlnd -. else -CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config - -USE_MYSQL= yes -. endif -.endif - .if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3" post-extract: @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 @@ -576,19 +589,6 @@ LIB_DEPENDS+= libct.so:databases/freetds . endif .endif -.if ${PHP_MODNAME} == "pdo_mysql" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd - -USE_PHP+= mysql -. else -CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr - -USE_MYSQL= yes -. endif -.endif - .if ${PHP_MODNAME} == "xml" post-extract: @${MKDIR} ${WRKSRC}/ext/xml Modified: head/lang/php56/Makefile.ext ============================================================================== --- head/lang/php56/Makefile.ext Mon Apr 25 16:17:19 2016 (r414018) +++ head/lang/php56/Makefile.ext Mon Apr 25 16:17:31 2016 (r414019) @@ -502,6 +502,40 @@ CONFIGURE_ARGS+=--disable-flatfile . endif .endif +.if ${PHP_MODNAME} == "mysql" +. if ${PORT_OPTIONS:MMYSQLND} +CONFIGURE_ARGS+=--with-mysql=mysqlnd +. else +CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \ + --with-zlib-dir=/usr + +USES+= mysql +. endif +.endif + +.if ${PHP_MODNAME} == "mysqli" +. if ${PORT_OPTIONS:MMYSQLND} +CONFIGURE_ARGS+=--with-mysqli=mysqlnd +. else +CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config + +USES+= mysql +. endif +.endif + +.if ${PHP_MODNAME} == "pdo_mysql" +. if ${PORT_OPTIONS:MMYSQLND} +CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd + +USE_PHP+= mysql +. else +CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ + --with-zlib-dir=/usr + +USES+= mysql +. endif +.endif + .include <bsd.port.pre.mk> .if ${PHP_MODNAME} == "gd" @@ -545,27 +579,6 @@ CONFIGURE_ARGS+=--disable-mbregex . endif .endif -.if ${PHP_MODNAME} == "mysql" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-mysql=mysqlnd -. else -CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr - -USE_MYSQL= yes -. endif -.endif - -.if ${PHP_MODNAME} == "mysqli" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-mysqli=mysqlnd -. else -CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config - -USE_MYSQL= yes -. endif -.endif - .if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3" post-extract: @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 @@ -579,19 +592,6 @@ LIB_DEPENDS+= libct.so:databases/freetds . endif .endif -.if ${PHP_MODNAME} == "pdo_mysql" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd - -USE_PHP+= mysql -. else -CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr - -USE_MYSQL= yes -. endif -.endif - .if ${PHP_MODNAME} == "xml" post-extract: @${MKDIR} ${WRKSRC}/ext/xml Modified: head/lang/php70/Makefile.ext ============================================================================== --- head/lang/php70/Makefile.ext Mon Apr 25 16:17:19 2016 (r414018) +++ head/lang/php70/Makefile.ext Mon Apr 25 16:17:31 2016 (r414019) @@ -494,6 +494,25 @@ CONFIGURE_ARGS+=--disable-flatfile . endif .endif +.if ${PHP_MODNAME} == "mysqli" +. if ${PORT_OPTIONS:MMYSQLND} +CONFIGURE_ARGS+=--with-mysqli=mysqlnd +. else +CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config +USES+= mysql +. endif +.endif + +.if ${PHP_MODNAME} == "pdo_mysql" +. if ${PORT_OPTIONS:MMYSQLND} +CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd +. else +CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ + --with-zlib-dir=/usr +USES+= mysql +. endif +.endif + .include <bsd.port.pre.mk> .if ${PHP_MODNAME} == "gd" @@ -537,25 +556,6 @@ CONFIGURE_ARGS+=--disable-mbregex . endif .endif -.if ${PHP_MODNAME} == "mysqli" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-mysqli=mysqlnd -. else -CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config -USE_MYSQL= yes -. endif -.endif - -.if ${PHP_MODNAME} == "pdo_mysql" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd -. else -CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr -USE_MYSQL= yes -. endif -.endif - .if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3" post-extract: @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 Modified: head/net-mgmt/ocsinventory-ng/Makefile ============================================================================== --- head/net-mgmt/ocsinventory-ng/Makefile Mon Apr 25 16:17:19 2016 (r414018) +++ head/net-mgmt/ocsinventory-ng/Makefile Mon Apr 25 16:17:31 2016 (r414019) @@ -22,9 +22,8 @@ RUN_DEPENDS= p5-XML-Simple>=0:textproc/p p5-SOAP-Lite>=0:net/p5-SOAP-Lite \ p5-XML-Entities>=0:textproc/p5-XML-Entities -USES= perl5 +USES= mysql perl5 USE_APACHE_RUN= 22+ -USE_MYSQL= 41+ WANT_PHP_WEB= yes USE_PHP= mysql pcre zlib session xml gd zip openssl mbstring NO_BUILD= yes Modified: head/net/mediatomb/Makefile ============================================================================== --- head/net/mediatomb/Makefile Mon Apr 25 16:17:19 2016 (r414018) +++ head/net/mediatomb/Makefile Mon Apr 25 16:17:31 2016 (r414019) @@ -55,13 +55,15 @@ EXTERNAL_TRANSCODING_DESC= external tran ID3LIB_DESC= id3lib support LIBEXTRACTOR_DESC= libextractor support +SQLITE_USES= sqlite +MYSQL_USES= mysql + .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MSQLITE} CONFIGURE_ARGS+= --enable-sqlite3 \ --with-sqlite3-h="${LOCALBASE}/include" \ --with-sqlite3-libs="${LOCALBASE}/lib" -LIB_DEPENDS+= libsqlite3.so:databases/sqlite3 .else CONFIGURE_ARGS+= --disable-sqlite3 .endif @@ -69,7 +71,6 @@ CONFIGURE_ARGS+= --disable-sqlite3 .if ${PORT_OPTIONS:MMYSQL} CONFIGURE_ARGS+= --enable-mysql \ --with-mysql-cfg="${LOCALBASE}/bin/mysql_config" -USE_MYSQL= yes .else CONFIGURE_ARGS+= --disable-mysql .endif Modified: head/textproc/sphinxsearch-devel/Makefile ============================================================================== --- head/textproc/sphinxsearch-devel/Makefile Mon Apr 25 16:17:19 2016 (r414018) +++ head/textproc/sphinxsearch-devel/Makefile Mon Apr 25 16:17:31 2016 (r414019) @@ -68,7 +68,7 @@ OPTIONS_SET_FORCE= LIBSTEMMER MYSQL_CONFIGURE_WITH= mysql MYSQL_CONFIGURE_ON= --with-mysql-includes=${LOCALBASE}/include/mysql \ --with-mysql-libs=${LOCALBASE}/lib/mysql -MYSQL_USE= mysql +MYSQL_USES= mysql OPTIMIZED_CFLAGS_CXXFLAGS=-O3 -fomit-frame-pointer Modified: head/textproc/sphinxsearch/Makefile ============================================================================== --- head/textproc/sphinxsearch/Makefile Mon Apr 25 16:17:19 2016 (r414018) +++ head/textproc/sphinxsearch/Makefile Mon Apr 25 16:17:31 2016 (r414019) @@ -65,7 +65,7 @@ OPTIONS_SET_FORCE= LIBSTEMMER MYSQL_CONFIGURE_WITH= mysql MYSQL_CONFIGURE_ON= --with-mysql-includes=${LOCALBASE}/include/mysql \ --with-mysql-libs=${LOCALBASE}/lib/mysql -MYSQL_USE= mysql +MYSQL_USES= mysql OPTIMIZED_CFLAGS_CXXFLAGS=-O3 -fomit-frame-pointer
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604251617.u3PGHW5L015145>