aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2016-04-25 16:17:31 +0000
committerMathieu Arnold <mat@FreeBSD.org>2016-04-25 16:17:31 +0000
commitd78beb132cdff1572d8b545be1fb09eea396d6ae (patch)
tree3ae246ccbda59847628903cdf71a3645fe2d5a86
parent4d32bbcef6444fe1625b9b0a62da9c7aceadd457 (diff)
downloadports-d78beb132cdff1572d8b545be1fb09eea396d6ae.tar.gz
ports-d78beb132cdff1572d8b545be1fb09eea396d6ae.zip
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
Notes
Notes: svn path=/head/; revision=414019
-rw-r--r--Mk/Uses/mysql.mk (renamed from Mk/bsd.database.mk)85
-rw-r--r--Mk/bsd.port.mk16
-rw-r--r--Mk/bsd.sanity.mk4
-rw-r--r--databases/mysql-connector-c++/Makefile3
-rw-r--r--databases/mysql-connector-c/Makefile3
-rw-r--r--databases/tcl-Mysql/Makefile3
-rw-r--r--dns/opendnssec/Makefile2
-rw-r--r--lang/harbour/Makefile2
-rw-r--r--lang/php55/Makefile.ext68
-rw-r--r--lang/php56/Makefile.ext68
-rw-r--r--lang/php70/Makefile.ext38
-rw-r--r--net-mgmt/ocsinventory-ng/Makefile3
-rw-r--r--net/mediatomb/Makefile5
-rw-r--r--textproc/sphinxsearch-devel/Makefile2
-rw-r--r--textproc/sphinxsearch/Makefile2
15 files changed, 161 insertions, 143 deletions
diff --git a/Mk/bsd.database.mk b/Mk/Uses/mysql.mk
index 6ef5d9466c8a..b5e8549232ef 100644
--- a/Mk/bsd.database.mk
+++ b/Mk/Uses/mysql.mk
@@ -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 with MySQL version ${MYSQL_VER} (MySQL ${
. 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${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT}
.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
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index b05a22b32676..e8fe347f594a 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -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 mkfontscale mkfontdir fc-cache \
.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
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
index cb8fc114130e..7f5258ba8117 100644
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@@ -169,7 +169,7 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
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})
diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
index ce6d01a20c1a..f587cf3b5b8f 100644
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -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}"
diff --git a/databases/mysql-connector-c/Makefile b/databases/mysql-connector-c/Makefile
index f35db227116e..ad44dd96c8e0 100644
--- a/databases/mysql-connector-c/Makefile
+++ b/databases/mysql-connector-c/Makefile
@@ -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}
diff --git a/databases/tcl-Mysql/Makefile b/databases/tcl-Mysql/Makefile
index 3e851232989b..6d88506bb2e7 100644
--- a/databases/tcl-Mysql/Makefile
+++ b/databases/tcl-Mysql/Makefile
@@ -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
diff --git a/dns/opendnssec/Makefile b/dns/opendnssec/Makefile
index 3aae5fdfbebb..a3ce07c89a17 100644
--- a/dns/opendnssec/Makefile
+++ b/dns/opendnssec/Makefile
@@ -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
diff --git a/lang/harbour/Makefile b/lang/harbour/Makefile
index 8ecb7e4749ef..c94d607c6e14 100644
--- a/lang/harbour/Makefile
+++ b/lang/harbour/Makefile
@@ -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
diff --git a/lang/php55/Makefile.ext b/lang/php55/Makefile.ext
index 69a16f499b15..5845e3d41f1a 100644
--- a/lang/php55/Makefile.ext
+++ b/lang/php55/Makefile.ext
@@ -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
diff --git a/lang/php56/Makefile.ext b/lang/php56/Makefile.ext
index 8ed5295444be..fec5aff98418 100644
--- a/lang/php56/Makefile.ext
+++ b/lang/php56/Makefile.ext
@@ -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
diff --git a/lang/php70/Makefile.ext b/lang/php70/Makefile.ext
index 88c8d16e5b7e..043949cc8cb8 100644
--- a/lang/php70/Makefile.ext
+++ b/lang/php70/Makefile.ext
@@ -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
diff --git a/net-mgmt/ocsinventory-ng/Makefile b/net-mgmt/ocsinventory-ng/Makefile
index bb12cdd674c9..e68182f2c970 100644
--- a/net-mgmt/ocsinventory-ng/Makefile
+++ b/net-mgmt/ocsinventory-ng/Makefile
@@ -22,9 +22,8 @@ RUN_DEPENDS= p5-XML-Simple>=0:textproc/p5-XML-Simple \
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
diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile
index 7885ee347fd8..7672b4d7fcc2 100644
--- a/net/mediatomb/Makefile
+++ b/net/mediatomb/Makefile
@@ -55,13 +55,15 @@ EXTERNAL_TRANSCODING_DESC= external transcoding support
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
diff --git a/textproc/sphinxsearch-devel/Makefile b/textproc/sphinxsearch-devel/Makefile
index 66e149baed67..9275ee9bf3a0 100644
--- a/textproc/sphinxsearch-devel/Makefile
+++ b/textproc/sphinxsearch-devel/Makefile
@@ -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
diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile
index 14f089345c02..bdb8824ee494 100644
--- a/textproc/sphinxsearch/Makefile
+++ b/textproc/sphinxsearch/Makefile
@@ -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