diff options
95 files changed, 103 insertions, 123 deletions
diff --git a/audio/icegenerator/Makefile b/audio/icegenerator/Makefile index 95a07d7aab1e..3fcfb012cf78 100644 --- a/audio/icegenerator/Makefile +++ b/audio/icegenerator/Makefile @@ -18,7 +18,7 @@ CONFIGURE_ARGS= --exec-prefix=${PREFIX} OPTIONS_DEFINE= DOCS MYSQL PGSQL -MYSQL_USE= MYSQL=YES +MYSQL_USES= mysql MYSQL_CONFIGURE_ON= --with-mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_ON= --with-pgsql diff --git a/benchmarks/super-smack/Makefile b/benchmarks/super-smack/Makefile index 737f5ae26567..564bbf5ee968 100644 --- a/benchmarks/super-smack/Makefile +++ b/benchmarks/super-smack/Makefile @@ -24,8 +24,7 @@ OPTIONS_MULTI= DB OPTIONS_MULTI_DB= MYSQL PGSQL OPTIONS_DEFAULT= MYSQL -MYSQL_USE= MYSQL=yes -MYSQL_USES= compiler:c++11-lang +MYSQL_USES= compiler:c++11-lang mysql MYSQL_CONFIGURE_ON= --with-mysql \ --with-mysql-include=${LOCALBASE}/include/mysql \ --with-mysql-lib=${LOCALBASE}/lib/mysql diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile index 901ea1a8368e..00287690b5bb 100644 --- a/databases/akonadi/Makefile +++ b/databases/akonadi/Makefile @@ -33,8 +33,8 @@ OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE OPTIONS_SUB= yes MYSQL_DESC= Install MySQL Qt plugin and server -MYSQL_USES= qt:5 -MYSQL_USE= MYSQL=server QT=sql-mysql_run +MYSQL_USES= mysql:server qt:5 +MYSQL_USE= QT=sql-mysql_run PGSQL_DESC= Install PostgreSQL Qt plugin # Do not add a dependency on PostgreSQL server as someone preferring diff --git a/databases/dbow/Makefile b/databases/dbow/Makefile index 53dcd0a84bf4..5129ebab5cec 100644 --- a/databases/dbow/Makefile +++ b/databases/dbow/Makefile @@ -10,11 +10,10 @@ MASTER_SITES= SF MAINTAINER= dtynan@kalopa.com COMMENT= DBOW is a database object generator for C, Perl, PHP, etc +USES= mysql MAKE_ENV+= MYSQL_INC=${LOCALBASE}/include/mysql \ MYSQL_LIB=${LOCALBASE}/lib/mysql -USE_MYSQL= yes - post-patch: @${REINPLACE_CMD} -e "s|CFLAGS=|CFLAGS+=|g" \ -e "s|^MYSQL_INC=|MYSQL_INC?=|" \ diff --git a/databases/fpc-mysql/Makefile b/databases/fpc-mysql/Makefile index 78d3ef56a0d1..73d108a7cc57 100644 --- a/databases/fpc-mysql/Makefile +++ b/databases/fpc-mysql/Makefile @@ -16,6 +16,6 @@ OPTIONS_DEFINE= MYSQL MYSQL_DESC= Install MySQL client OPTIONS_DEFAULT= MYSQL -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql .include "${MASTERDIR}/Makefile" diff --git a/databases/innotop/Makefile b/databases/innotop/Makefile index f720d5034b70..1f30eeeab798 100644 --- a/databases/innotop/Makefile +++ b/databases/innotop/Makefile @@ -19,9 +19,8 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USE_GITHUB= yes -USES= perl5 +USES= mysql perl5 USE_PERL5= configure -USE_MYSQL= yes post-patch: @${REINPLACE_CMD} -e 's|/etc/innotop|${PREFIX}/etc|g' ${WRKSRC}/innotop diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 89e48ae492d1..2550307d5e3d 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -65,8 +65,7 @@ CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 # MySQL-Server part .if !defined(CLIENT_ONLY) -USE_MYSQL= yes -WANT_MYSQL_VER= 55 +USES+= mysql:55 CONFLICTS_INSTALL= mysql5[0-46-9]-server-* \ mysqlwsrep* \ diff --git a/databases/mysqltcl/Makefile b/databases/mysqltcl/Makefile index 4c5af8aaff5f..d9977bc41e0a 100644 --- a/databases/mysqltcl/Makefile +++ b/databases/mysqltcl/Makefile @@ -9,9 +9,8 @@ MASTER_SITES= http://www.xdobry.de/mysqltcl/ MAINTAINER= tcltk@FreeBSD.org COMMENT= TCL module for accessing MySQL databases based on msqltcl -USES= tcl +USES= mysql tcl USE_LDCONFIG= yes -USE_MYSQL= yes PLIST_FILES= lib/${PORTNAME}-${PORTVERSION}/libmysqltcl${PORTVERSION}.so \ lib/${PORTNAME}-${PORTVERSION}/pkgIndex.tcl \ diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile index a41dd251139e..19f5e626b31d 100644 --- a/databases/opendbx/Makefile +++ b/databases/opendbx/Makefile @@ -30,7 +30,7 @@ SYBASE_DESC= Sybase database support DRIVER_DESC= Database drivers OPTIONS_SUB= YES -MYSQL_USE= MYSQL=YES +MYSQL_USES= mysql MYSQL_CPPFLAGS= -I${LOCALBASE}/include/mysql MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql diff --git a/databases/p5-DBIx-Class-Schema-Loader/Makefile b/databases/p5-DBIx-Class-Schema-Loader/Makefile index 279ef4b37420..cbf98659b99c 100644 --- a/databases/p5-DBIx-Class-Schema-Loader/Makefile +++ b/databases/p5-DBIx-Class-Schema-Loader/Makefile @@ -43,7 +43,7 @@ NO_ARCH= yes USES= perl5 USE_PERL5= configure -MYSQL_USE= mysql +MYSQL_USES= mysql PGSQL_USES= pgsql SQLITE_USES= sqlite diff --git a/databases/proftpd-mod_sql_mysql/Makefile b/databases/proftpd-mod_sql_mysql/Makefile index bb2f521ae0d1..8d1ae2a89447 100644 --- a/databases/proftpd-mod_sql_mysql/Makefile +++ b/databases/proftpd-mod_sql_mysql/Makefile @@ -14,7 +14,7 @@ DESCR= ${.CURDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../../ftp/proftpd -USE_MYSQL= yes +USES= mysql INCLUDEDIRS= ${LOCALBASE}/include:${LOCALBASE}/include/mysql LIBDIRS= ${LOCALBASE}/lib diff --git a/databases/qt5-sqldrivers-mysql/Makefile b/databases/qt5-sqldrivers-mysql/Makefile index 514e44909786..e651c12e55b5 100644 --- a/databases/qt5-sqldrivers-mysql/Makefile +++ b/databases/qt5-sqldrivers-mysql/Makefile @@ -4,6 +4,6 @@ DB= MYSQL DB_DESC= MySQL -USE_MYSQL= yes +USES= mysql .include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers" diff --git a/databases/rubygem-do_mysql/Makefile b/databases/rubygem-do_mysql/Makefile index 89a40fcaca52..516914ce7daa 100644 --- a/databases/rubygem-do_mysql/Makefile +++ b/databases/rubygem-do_mysql/Makefile @@ -11,8 +11,7 @@ COMMENT= Ruby DataObjects driver for MySQL RUN_DEPENDS= rubygem-data_objects>=0.10.17:databases/rubygem-data_objects -USE_MYSQL= yes +USES= gem mysql USE_RUBY= yes -USES= gem .include <bsd.port.mk> diff --git a/databases/soci/Makefile b/databases/soci/Makefile index c888d477fc03..45789db8ffa3 100644 --- a/databases/soci/Makefile +++ b/databases/soci/Makefile @@ -34,7 +34,7 @@ OPTIONS_EXCLUDE_powerpc= FIREBIRD OPTIONS_EXCLUDE_powerpc64= FIREBIRD OPTIONS_EXCLUDE_sparc64= FIREBIRD -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql MYSQL_CMAKE_BOOL= WITH_MYSQL PGSQL_USES= pgsql diff --git a/databases/sqlclient/Makefile b/databases/sqlclient/Makefile index ccef79fb484f..6314467cd53e 100644 --- a/databases/sqlclient/Makefile +++ b/databases/sqlclient/Makefile @@ -15,11 +15,10 @@ LICENSE= LGPL21 LIB_DEPENDS= libPerformance.so:devel/performance \ libsqlite3.so:databases/sqlite3 -USES= gnustep pgsql +USES= gnustep mysql pgsql USE_GNUSTEP= base build GNU_CONFIGURE= yes USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} -USE_MYSQL=yes LDFLAGS+= -pthread DEFAULT_LIBVERSION= 1.5 diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index 75660e8ad590..f8cb35117631 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -113,7 +113,7 @@ CONFIGURE_ARGS+= --disable-sqlite .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql CONFIGURE_ARGS+= --with-mysql-prefix="${LOCALBASE}" TOSTRIP+= libexec/sqlrelay/sqlrconnection_mysql.so .else diff --git a/databases/tuning-primer/Makefile b/databases/tuning-primer/Makefile index 21d30251485f..2111ef1e9598 100644 --- a/databases/tuning-primer/Makefile +++ b/databases/tuning-primer/Makefile @@ -15,9 +15,9 @@ COMMENT= MySQL performance tuning primer script LICENSE= GPLv2 +USES= mysql NO_BUILD= yes NO_ARCH= yes -USE_MYSQL= yes PLIST_FILES= bin/${PORTNAME} diff --git a/databases/vfront/Makefile b/databases/vfront/Makefile index 9ae8cb0cdd57..d4d48011f78d 100644 --- a/databases/vfront/Makefile +++ b/databases/vfront/Makefile @@ -22,7 +22,8 @@ OPTIONS_MULTI= DATABASE OPTIONS_MULTI_DATABASE= MYSQL PGSQL OPTIONS_DEFAULT= MYSQL PGSQL -MYSQL_USE= MYSQL=yes PHP=mysqli +MYSQL_USES= mysql +MYSQL_USE= PHP=mysqli PGSQL_USES= pgsql PGSQL_USE= PHP=pgsql diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile index 51a377cb6a76..94505e23bad9 100644 --- a/devel/apr2/Makefile +++ b/devel/apr2/Makefile @@ -58,7 +58,7 @@ IPV6_CONFIGURE_ENABLE= ipv6 MYSQL_CFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H MYSQL_CONFIGURE_WITH= mysql=${LOCALBASE} MYSQL_LIBS= -L${LOCALBASE}/lib/mysql -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql NDBM_CONFIGURE_WITH= ndbm=/usr PGSQL_CONFIGURE_ENV= ac_cv_path_PGSQL_CONFIG="" PGSQL_CONFIGURE_WITH= pgsql=${LOCALBASE} diff --git a/devel/bugzilla44/Makefile b/devel/bugzilla44/Makefile index 383bc883b48e..e163773901da 100644 --- a/devel/bugzilla44/Makefile +++ b/devel/bugzilla44/Makefile @@ -46,7 +46,7 @@ EMPTY_DIRS_LIST=data graphs contrib lib t xt .include "${.CURDIR}/Makefile.options" MODPERL_USE= APACHE_RUN=22+ -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql MYSQL_RUN_DEPENDS= p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql PGSQL_USES= pgsql PGSQL_RUN_DEPENDS= p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg diff --git a/devel/bugzilla50/Makefile b/devel/bugzilla50/Makefile index e5b762e78db4..f9ff9cff866c 100644 --- a/devel/bugzilla50/Makefile +++ b/devel/bugzilla50/Makefile @@ -48,7 +48,7 @@ EMPTY_DIRS_LIST=data graphs contrib lib t xt .include "${.CURDIR}/Makefile.options" MODPERL_USE= APACHE_RUN=22+ -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql MYSQL_RUN_DEPENDS= p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql PGSQL_USES= pgsql:9.1+ PGSQL_RUN_DEPENDS= p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg diff --git a/devel/gearmand-devel/Makefile b/devel/gearmand-devel/Makefile index ee3f459db0ec..5eb8289944ab 100644 --- a/devel/gearmand-devel/Makefile +++ b/devel/gearmand-devel/Makefile @@ -75,7 +75,7 @@ CONFIGURE_ARGS+= --disable-libmemcached .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql CONFIGURE_ARGS+= --with-mysql=yes .else CONFIGURE_ARGS+= --with-mysql=no diff --git a/devel/gearmand/Makefile b/devel/gearmand/Makefile index 9090958f9cfe..4f395be17891 100644 --- a/devel/gearmand/Makefile +++ b/devel/gearmand/Makefile @@ -74,7 +74,7 @@ CONFIGURE_ARGS+= --disable-libmemcached .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql CONFIGURE_ARGS+= --with-mysql=yes .else CONFIGURE_ARGS+= --with-mysql=no diff --git a/devel/matreshka/Makefile b/devel/matreshka/Makefile index 240a6d29f49e..8dfd29584fea 100644 --- a/devel/matreshka/Makefile +++ b/devel/matreshka/Makefile @@ -30,7 +30,7 @@ MYSQL_CONFIGURE_ENABLE= mysql ORACLE_CONFIGURE_ENABLE= oracle AMF_CONFIGURE_ENABLE= amf -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql PGSQL_USES= pgsql SQLITE3_USES= sqlite FIREBIRD_USES= firebird diff --git a/devel/p5-Test-DBIx-Class/Makefile b/devel/p5-Test-DBIx-Class/Makefile index f8b5404cc071..55eff2a0b6aa 100644 --- a/devel/p5-Test-DBIx-Class/Makefile +++ b/devel/p5-Test-DBIx-Class/Makefile @@ -36,7 +36,7 @@ TEST_DEPENDS= p5-MooseX-Types-LoadableClass>=0:devel/p5-MooseX-Types-LoadableCla p5-Test-Differences>=0:devel/p5-Test-Differences \ p5-Test-mysqld>=0:databases/p5-Test-mysqld # Also for test: -#USE_MYSQL+= server +#USES+= mysql:server NO_ARCH= yes USES= perl5 diff --git a/devel/sonarqube/Makefile b/devel/sonarqube/Makefile index 4e05176d0e31..cde4a4a0ef48 100644 --- a/devel/sonarqube/Makefile +++ b/devel/sonarqube/Makefile @@ -54,7 +54,7 @@ PLIST_SUB+= SQ_DB_DIR=${SQ_DB_DIR} \ OPTIONS_RADIO= SQL OPTIONS_RADIO_SQL= MYSQL PGSQL -MYSQL_USE= mysql=yes +MYSQL_USES= mysql PGSQL_USES= pgsql post-patch: diff --git a/devel/sope2/Makefile b/devel/sope2/Makefile index 772b95e7eb6b..675b6129e2c3 100644 --- a/devel/sope2/Makefile +++ b/devel/sope2/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ARGS= --with-gnustep --disable-debug --enable-strip LDAP_USE= OPENLDAP=client PGSQL_USES= pgsql -MYSQL_USE= MYSQL=client +MYSQL_USES= mysql MEMCACHED_RUN_DEPENDS= ${LOCALBASE}/bin/memcached:databases/memcached post-patch: diff --git a/devel/sope3/Makefile b/devel/sope3/Makefile index 8550b03fdafa..b0991c1cbb1f 100644 --- a/devel/sope3/Makefile +++ b/devel/sope3/Makefile @@ -44,7 +44,7 @@ CONFIGURE_ENV+= CC="${CC}" LDAP_USE= OPENLDAP=client PGSQL_USES= pgsql -MYSQL_USE= MYSQL=client +MYSQL_USES= mysql MEMCACHED_RUN_DEPENDS= ${LOCALBASE}/bin/memcached:databases/memcached post-patch: diff --git a/devel/sope4/Makefile b/devel/sope4/Makefile index 79f06ac665df..8ebb9e0e0092 100644 --- a/devel/sope4/Makefile +++ b/devel/sope4/Makefile @@ -42,7 +42,7 @@ CONFIGURE_ENV+= CC="${CC}" LDAP_USE= OPENLDAP=client PGSQL_USES= pgsql -MYSQL_USE= MYSQL=client +MYSQL_USES= mysql MEMCACHED_RUN_DEPENDS= ${LOCALBASE}/bin/memcached:databases/memcached post-patch: diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile index e37d8065d2cf..2fc641a492b5 100644 --- a/dns/mydns-ng/Makefile +++ b/dns/mydns-ng/Makefile @@ -42,7 +42,7 @@ PGSQL_CONFIGURE_ON= --with-pgsql \ --with-pgsql-lib=${LOCALBASE}/lib PGSQL_CONFIGURE_OFF= --without-pgsql -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_ON= --with-mysql \ --with-mysql-include=${LOCALBASE}/include/mysql \ --with-mysql-lib=${LOCALBASE}/lib/mysql diff --git a/dns/mydns/Makefile b/dns/mydns/Makefile index a6846cbcd5d8..d15c53938546 100644 --- a/dns/mydns/Makefile +++ b/dns/mydns/Makefile @@ -46,11 +46,11 @@ CONFIGURE_ARGS+=--without-mysql \ --with-pgsql-lib=${LOCALBASE}/lib PKGNAMESUFFIX= -pg .else +USES+= mysql CONFIGURE_ARGS+=--without-pgsql \ --with-mysql-include=${LOCALBASE}/include/mysql \ --with-mysql-lib=${LOCALBASE}/lib/mysql PKGNAMESUFFIX= -mysql -USE_MYSQL= yes .endif .if ${PORT_OPTIONS:MNLS} diff --git a/finance/frontaccounting/Makefile b/finance/frontaccounting/Makefile index 76ae54c7a560..a1dd4dfaff1c 100644 --- a/finance/frontaccounting/Makefile +++ b/finance/frontaccounting/Makefile @@ -32,7 +32,7 @@ LIGHTTPD_RUN_DEPENDS= lighttpd:www/lighttpd LIGHTTPD_USES= php:web NGINX_RUN_DEPENDS= nginx:www/nginx NGINX_USES= php:web -MYSQL_SERVER_USE= MYSQL=server +MYSQL_SERVER_USES= mysql:server NLS_USES= gettext .include <bsd.port.options.mk> diff --git a/ftp/smbftpd/Makefile b/ftp/smbftpd/Makefile index a5142bcb9b31..d5fc8c89e9fb 100644 --- a/ftp/smbftpd/Makefile +++ b/ftp/smbftpd/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= "--prefix=${PREFIX}" USES= perl5 USE_RC_SUBR= ${PORTNAME} -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= pgsql diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile index 6255558441d4..9986f20bb933 100644 --- a/ftp/wzdftpd/Makefile +++ b/ftp/wzdftpd/Makefile @@ -48,7 +48,7 @@ PERL_CONFIGURE_ENABLE= perl PERL_USES= perl5 MYSQL_CONFIGURE_ENABLE= mysql -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE} PGSQL_CONFIGURE_OFF= --disable-pgsql diff --git a/games/ldmud/Makefile b/games/ldmud/Makefile index a8deaa0b6cc4..a3f73922cd06 100644 --- a/games/ldmud/Makefile +++ b/games/ldmud/Makefile @@ -36,7 +36,7 @@ OPTIONS_SINGLE_MUDLIB= LPMUD DEMOLIB OPTIONS_SUB= yes LPMUD_DESC= Install default mudlib (LP-245) IPV6_CONFIGURE_ENABLE= use-ipv6 -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_ENABLE= use-mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_ENABLE= use-pgsql diff --git a/games/pvpgn/Makefile b/games/pvpgn/Makefile index 6e837b348b06..3875f09311c1 100644 --- a/games/pvpgn/Makefile +++ b/games/pvpgn/Makefile @@ -44,7 +44,7 @@ OPTIONS_SUB= yes D2_DESC= Diablo II server (D2CS/D2DBS) D2_CONFIGURE_ENABLE= d2cs d2dbs -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql PGSQL_USES= pgsql diff --git a/games/quetoo/Makefile b/games/quetoo/Makefile index 1824136c7cf3..c23a2b5fc919 100644 --- a/games/quetoo/Makefile +++ b/games/quetoo/Makefile @@ -69,7 +69,7 @@ PLIST_SUB+= VANCTF="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql CONFIGURE_ARGS+= --with-mysql CONFIGURE_ENV+= MYSQL_LIBS="-L${LOCALBASE}/lib/mysql -lmysqlclient" \ MYSQL_CFLAGS="-I${LOCALBASE}/include" diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile index bc1d1a1dfd4b..21e53098fc1e 100644 --- a/games/scorched3d/Makefile +++ b/games/scorched3d/Makefile @@ -41,7 +41,7 @@ LDFLAGS+= -L${LOCALBASE}/lib SCORCH_VERSION= 43.3d SCORCH_REVISION= # none -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_ON= --with-mysql PLIST_FILES= bin/scorched3d \ diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index 86d7343884f0..5b6a88bb01a1 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -77,7 +77,8 @@ MEDIAPLAYER_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ MEDIAPLAYER_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_FFmpeg \ CMAKE_DISABLE_FIND_PACKAGE_QtAV -MYSQL_USE= MYSQL=server QT=sql-mysql_run +MYSQL_USES= mysql:server +MYSQL_USE= QT=sql-mysql_run MYSQL_CMAKE_BOOL= ENABLE_INTERNALMYSQL \ ENABLE_MYSQLSUPPORT MYSQL_CMAKE_ON= -DMYSQLD_PATH:PATH=${LOCALBASE}/libexec \ diff --git a/irc/ratbox-services/Makefile b/irc/ratbox-services/Makefile index 881c590d417d..0286d23061f1 100644 --- a/irc/ratbox-services/Makefile +++ b/irc/ratbox-services/Makefile @@ -116,7 +116,7 @@ CONFIGURE_ARGS+= --enable-sqlite3=${LOCALBASE} .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql CONFIGURE_ARGS+= --enable-mysql=${LOCALBASE} .endif diff --git a/irc/unreal/Makefile b/irc/unreal/Makefile index 0ae423dbf3fd..30e54d78faa3 100644 --- a/irc/unreal/Makefile +++ b/irc/unreal/Makefile @@ -79,7 +79,7 @@ PREFIXAQ_CONFIGURE_ENABLE= prefixaq SQLMOD= ${PORTNAME}/SQLMod.tar.gz .if exists(${DISTDIR}/${SQLMOD}) -USE_MYSQL= yes +USES+= mysql WITH_SQLMOD= yes MAKE_ARGS= all custommodule MODULEFILE=m_sqlmod PLIST_SUB+= SQLMOD="" diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile index 495159ca5ed2..73b956fe05af 100644 --- a/japanese/tomoe/Makefile +++ b/japanese/tomoe/Makefile @@ -32,7 +32,7 @@ DICT_RUBY_CONFIGURE_ENABLE= dict-ruby EST_DESC= Enable Hyper Estraier dictionary module EST_CONFIGURE_WITH= est MYSQL_DESC= Enable MySQL dictionary module -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql PYTHON_DESC= Enable Python module PYTHON_USES= gnome python:2.7 diff --git a/lang/newlisp-devel/Makefile b/lang/newlisp-devel/Makefile index 7021f48171c6..48f7f03a5c16 100644 --- a/lang/newlisp-devel/Makefile +++ b/lang/newlisp-devel/Makefile @@ -67,7 +67,7 @@ PLIST_SUB+= GSL="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql MODULES+= mysql PLIST_SUB+= MYSQL="" .else diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile index 821dc1ecd8a6..ffb94f148d53 100644 --- a/lang/newlisp/Makefile +++ b/lang/newlisp/Makefile @@ -54,7 +54,7 @@ MODULES+= gsl .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql MODULES+= mysql .endif diff --git a/lang/urweb/Makefile b/lang/urweb/Makefile index a2ba82687302..7057b4025ef0 100644 --- a/lang/urweb/Makefile +++ b/lang/urweb/Makefile @@ -57,7 +57,7 @@ CONFIGURE_ENV+= SQHEADER="no" .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql .else CONFIGURE_ENV+= MSHEADER="no" .endif diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 04bbd475f3c6..7ea1cfa6905b 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -52,7 +52,7 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls ICONV_USES= iconv:lib,build INTERNATIONAL_LIB_DEPENDS= libidn.so:dns/libidn LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb -MYSQL_USE= mysql=yes +MYSQL_USES= mysql OPENLDAP_USE= openldap=yes PGSQL_USES= pgsql REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis diff --git a/mail/postfix-policyd-sf/Makefile b/mail/postfix-policyd-sf/Makefile index d782040804df..3b7d58b40d0b 100644 --- a/mail/postfix-policyd-sf/Makefile +++ b/mail/postfix-policyd-sf/Makefile @@ -15,8 +15,7 @@ PKGNAMESUFFIX= -sf MAINTAINER= mat@FreeBSD.org COMMENT= Anti-spam plugin for Postfix (written in C) -USE_MYSQL= yes -USES= gmake +USES= gmake mysql USE_RC_SUBR= policyd REALNAME= ${PKGNAME:C/-${PORTVERSION}.*//} diff --git a/mail/qmail-mysql/Makefile b/mail/qmail-mysql/Makefile index eab894662843..2267a33e2b2b 100644 --- a/mail/qmail-mysql/Makefile +++ b/mail/qmail-mysql/Makefile @@ -15,8 +15,7 @@ MYSQL_PATCH_VERSION= 1.1.15 SLAVE_MYSQL= yes -USES= compiler:c11 -USE_MYSQL= yes +USES= compiler:c11 mysql MASTERDIR= ${.CURDIR}/../qmail DESCR= ${.CURDIR}/pkg-descr diff --git a/mail/qsf/Makefile b/mail/qsf/Makefile index 317c585f6a50..70090bd4c1cc 100644 --- a/mail/qsf/Makefile +++ b/mail/qsf/Makefile @@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --without-gdbm .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql .else CONFIGURE_ARGS+= --without-mysql .endif diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile index 60c85a2f9953..611ad70920c1 100644 --- a/mail/tpop3d/Makefile +++ b/mail/tpop3d/Makefile @@ -43,7 +43,7 @@ MBOXINDICES_CONFIGURE_ENABLE= mbox-bsd-save-indices GDBMAUTH_CPPFLAGS= -I${LOCALBASE}/include GDBMAUTH_LIB_DEPENDS= libgdbm.so:databases/gdbm -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_ON= --enable-auth-mysql \ --with-mysql-lib-dir=${LOCALBASE}/lib/mysql \ --with-mysql-include-dir=${LOCALBASE}/include/mysql diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile index 31825cbe4906..e8d4ae0856c9 100644 --- a/mail/vpopmail/Makefile +++ b/mail/vpopmail/Makefile @@ -269,7 +269,7 @@ LDAP_FILES= ${WRKSRC}/doc/README.ldap \ .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql .if defined(WITH_MYSQL_USER) || defined(WITH_MYSQL_READ_USER) || defined(WITH_MYSQL_UPDATE_USER) BROKEN_MYSQL_PARAMS= true diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile index 0386e4255a62..1793d65002d3 100644 --- a/net-im/jabberd/Makefile +++ b/net-im/jabberd/Makefile @@ -75,7 +75,7 @@ PGSQL_CONFIGURE_ENABLE= pgsql SQLITE_CONFIGURE_ENABLE=sqlite SQLITE_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_ENABLE= mysql BDB_USES= bdb diff --git a/net-im/mu-conference/Makefile b/net-im/mu-conference/Makefile index 1e87ff54f945..1e783e14367d 100644 --- a/net-im/mu-conference/Makefile +++ b/net-im/mu-conference/Makefile @@ -46,7 +46,7 @@ MAKE_JOBS_UNSAFE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql CFLAGS+= -DHAVE_MYSQL LIBS+= `${LOCALBASE}/bin/mysql_config --libs` DOCFILES+= README.sql mu-conference.sql diff --git a/net-mgmt/devmon/Makefile b/net-mgmt/devmon/Makefile index 62c269e7d3e7..c0e52e740b56 100644 --- a/net-mgmt/devmon/Makefile +++ b/net-mgmt/devmon/Makefile @@ -27,13 +27,9 @@ SUB_LIST= USERS=${USERS} \ OPTIONS_DEFINE= MYSQL DOCS -REINPLACE_ARGS= -i '' - -.include <bsd.port.options.mk> +MYSQL_USES= mysql -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -.endif +REINPLACE_ARGS= -i '' post-patch: @${REINPLACE_CMD} -e 's|/var/run/devmon.pid|/var/run/devmon/devmon.pid|g' ${WRKSRC}/devmon.cfg ${WRKSRC}/modules/dm_config.pm diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile index f30635f68533..3f3b8daf5a33 100644 --- a/net-mgmt/monitoring-plugins/Makefile +++ b/net-mgmt/monitoring-plugins/Makefile @@ -94,7 +94,7 @@ NETSNMP_CONFIGURE_OFF= ac_cv_path_PATH_TO_SNMPGET= \ RADIUS_LIB_DEPENDS= libradiusclient-ng.so:net/radiusclient RADIUS_CONFIGURE_WITH= radius -MYSQL_USE= mysql=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql=${LOCALBASE} PGSQL_USES= pgsql diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile index a0c9ac14b5ed..c49b2451109a 100644 --- a/net-mgmt/nagios-plugins/Makefile +++ b/net-mgmt/nagios-plugins/Makefile @@ -100,7 +100,7 @@ NETSNMP_CONFIGURE_OFF= ac_cv_path_PATH_TO_SNMPGET= \ RADIUS_LIB_DEPENDS= libradiusclient-ng.so:net/radiusclient RADIUS_CONFIGURE_WITH= radius -MYSQL_USE= mysql=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql=${LOCALBASE} PGSQL_USES= pgsql diff --git a/net-mgmt/netdot/Makefile b/net-mgmt/netdot/Makefile index 463f803ce8c5..794d968a9898 100644 --- a/net-mgmt/netdot/Makefile +++ b/net-mgmt/netdot/Makefile @@ -43,9 +43,8 @@ RUN_DEPENDS= p5-libapreq2>=0:www/p5-libapreq2 \ rrdtool:databases/rrdtool \ netdisco-mibs>=0:net-mgmt/netdisco-mibs -USES= gmake perl5 shebangfix +USES= gmake mysql perl5 shebangfix NO_BUILD= yes -USE_MYSQL= yes SUB_FILES= pkg-message pkg-install SUB_LIST= WWWDIR="${WWWDIR}" \ diff --git a/net-mgmt/rackmonkey/Makefile b/net-mgmt/rackmonkey/Makefile index 4226f46fe0bb..a7d410cd300c 100644 --- a/net-mgmt/rackmonkey/Makefile +++ b/net-mgmt/rackmonkey/Makefile @@ -40,7 +40,7 @@ USES+= sqlite RUN_DEPENDS+= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql RUN_DEPENDS+= p5-DBD-mysql>=0:databases/p5-DBD-mysql .endif .if ${PORT_OPTIONS:MPGSQL} diff --git a/net-mgmt/super_mediator/Makefile b/net-mgmt/super_mediator/Makefile index 38c0211b68c3..1df2010820cb 100644 --- a/net-mgmt/super_mediator/Makefile +++ b/net-mgmt/super_mediator/Makefile @@ -34,7 +34,7 @@ SKIPSET_LIB_DEPENDS= libsilk.so:security/silktools SPREAD_LIB_DEPENDS= libspread.so:net/spread4 MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT} -MYSQL_USE= mysql +MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql SKIPSET_CONFIGURE_WITH= skipset diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile index c8d0f02b7431..453d4b10f205 100644 --- a/net/gnu-radius/Makefile +++ b/net/gnu-radius/Makefile @@ -48,7 +48,7 @@ SNMP_CONFIGURE_ENABLE= snmp CLIENT_CONFIGURE_ENABLE= client CLIENT_LIB_DEPENDS= libguile.so:lang/guile CLIENT_CONFIGURE_OFF= --without-guile -MYSQL_USE= mysql=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= postgres diff --git a/net/kea/Makefile b/net/kea/Makefile index ef0bd627a306..e795802f1455 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -43,7 +43,7 @@ PORTDOCS= AUTHORS COPYING ChangeLog README \ OPTIONS_DEFINE= DOCS MYSQL PGSQL OPTIONS_SUB= yes -MYSQL_USE= MYSQL=client +MYSQL_USES= mysql MYSQL_CONFIGURE_ON= --with-dhcp-mysql=${LOCALBASE}/bin/mysql_config MYSQL_CONFIGURE_OFF= --without-dhcp-mysql PGSQL_USES= pgsql diff --git a/net/libnss-mysql/Makefile b/net/libnss-mysql/Makefile index 672b4ce25729..328ab0989041 100644 --- a/net/libnss-mysql/Makefile +++ b/net/libnss-mysql/Makefile @@ -13,9 +13,8 @@ COMMENT= NSS module using a MySQL database for backend GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-mysql=${LOCALBASE} INSTALL_TARGET= install-strip -USES= libtool +USES= libtool mysql USE_LDCONFIG= yes -USE_MYSQL= yes post-patch: @${REINPLACE_CMD} 's,$${srcdir}/aux/mkinstalldirs,$${mkinstalldirs},' \ diff --git a/net/linknx/Makefile b/net/linknx/Makefile index 911e33f97194..65b34071d80b 100644 --- a/net/linknx/Makefile +++ b/net/linknx/Makefile @@ -47,7 +47,7 @@ LIBLUA_CFLAGS= -I${LUA_INCDIR} LIBLUA_LDFLAGS= -L${LUA_LIBDIR} MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config MYSQL_CONFIGURE_OFF= --without-mysql -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql PORTDOCS= * diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index aa41e090f59a..970f82e2ead2 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -67,7 +67,7 @@ DBUS_USE= GNOME=glib20 DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libdbus-1.so:devel/dbus DBUS_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR} -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_OFF=--with-mysql-config=/nonexistent ACL_LIB_DEPENDS= libsunacl.so:sysutils/libsunacl ACL_CONFIGURE_WITH=acls diff --git a/net/pwhois/Makefile b/net/pwhois/Makefile index 1aaf26ed024f..2e241fd1df82 100644 --- a/net/pwhois/Makefile +++ b/net/pwhois/Makefile @@ -25,9 +25,8 @@ FETCH_ARGS= -p USERS= ${PORTNAME} GROUPS= ${PORTNAME} -USES= shebangfix tar:tgz +USES= mysql shebangfix tar:tgz SHEBANG_FILES= pwhois-updatedb -USE_MYSQL= client USE_RC_SUBR= ${PORTNAME}d SUB_FILES= pkg-message 512.pwhois-updatedb SUB_LIST= TOUCH="${TOUCH}" RM="${RM}" CHOWN="${CHOWN}" \ diff --git a/net/traff/Makefile b/net/traff/Makefile index 16a3f7d98be2..4de6584f82bb 100644 --- a/net/traff/Makefile +++ b/net/traff/Makefile @@ -24,7 +24,7 @@ OPTIONS_DEFAULT= MYSQL .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql CPPFLAGS+= -DwithMYSQL -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib/mysql -lmysqlclient_r CONFIGURE_ARGS+=--enable-mysql diff --git a/net/yate/Makefile b/net/yate/Makefile index 702a8b46ccde..6cf6d2eec70f 100644 --- a/net/yate/Makefile +++ b/net/yate/Makefile @@ -73,8 +73,7 @@ ILBC_CONFIGURE_ENABLE= ilbc ILBC_LIB_DEPENDS= libilbc.so:net/ilbc MYSQL_CONFIGURE_WITH= mysql -MYSQL_USE= mysql=yes -MYSQL_USES= ssl +MYSQL_USES= mysql ssl PGSQL_CONFIGURE_WITH= libpq=${LOCALBASE} PGSQL_USES= pgsql diff --git a/security/barnyard2/Makefile b/security/barnyard2/Makefile index 75714bd9226b..78851af93bbd 100644 --- a/security/barnyard2/Makefile +++ b/security/barnyard2/Makefile @@ -51,7 +51,7 @@ BRO_CONFIGURE_ENABLE= bro GRE_CONFIGURE_ENABLE= gre IPV6_CONFIGURE_ENABLE= ipv6 MPLS_CONFIGURE_ENABLE= mpls -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql MYSQL_CONFIGURE_ON= --with-mysql-includes=${LOCALBASE}/include/mysql \ --with-mysql-libraries=${LOCALBASE}/lib/mysql diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index c4ede3c1271d..ebfac748a613 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -123,8 +123,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool OPTIONS_DEFINE+= DOCS DOCS= README.authmysql.html README.authmysql.myownquery -USES+= compiler:c11 -USE_MYSQL= yes +USES+= compiler:c11 mysql CONFIGURE_ARGS+=--with-authmysql \ --with-mysql-libs=${LOCALBASE}/lib/mysql \ --with-mysql-includes=${LOCALBASE}/include/mysql diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile index 31e954efc40b..d4143fef593f 100644 --- a/security/libpreludedb/Makefile +++ b/security/libpreludedb/Makefile @@ -29,7 +29,7 @@ OPTIONS_DEFAULT= MYSQL OPTIONS_SUB= yes MYSQL_DESC= MySQL plugin -MYSQL_USE= mysql=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql PGSQL_DESC= PostgreSQL plugin PGSQL_USES= pgsql diff --git a/security/maia/Makefile b/security/maia/Makefile index 03e99ab3b288..8a61ea494d21 100644 --- a/security/maia/Makefile +++ b/security/maia/Makefile @@ -135,7 +135,7 @@ PLIST_SUB+= WEBHOST="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql .endif .if ${PORT_OPTIONS:MMYSQL} && ${PORT_OPTIONS:MWEBHOST} USE_PHP+= mysqli @@ -157,7 +157,7 @@ RUN_DEPENDS+= p5-DBD-mysql>=0:databases/p5-DBD-mysql .endif .if ${PORT_OPTIONS:MMYSQLSERVER} -USE_MYSQL= server +USES+= mysql:server .endif .if ${PORT_OPTIONS:MPGSQL} diff --git a/security/ossec-hids-local/Makefile b/security/ossec-hids-local/Makefile index 7f5b4273e41c..49881bdc7207 100644 --- a/security/ossec-hids-local/Makefile +++ b/security/ossec-hids-local/Makefile @@ -41,7 +41,7 @@ ZEROMQ_LIB_DEPENDS= libczmq.so:net/czmq INOTIFY_USES= pkgconfig LUA_USES= readline -MYSQL_USE= mysql +MYSQL_USES= mysql PGSQL_USES= pgsql USE_GITHUB= yes diff --git a/security/pam-modules/Makefile b/security/pam-modules/Makefile index e7d99c9190ed..11e8fd74b5d6 100644 --- a/security/pam-modules/Makefile +++ b/security/pam-modules/Makefile @@ -28,7 +28,7 @@ GROUPMEMBER_DESC= Build pam_groupmember MYSQL_CONFIGURE_ENABLE= mysql MYSQL_DESC= Build pam_mysql -MYSQL_USE= MYSQL +MYSQL_USES= mysql PGSQL_CONFIGURE_ENABLE= pgsql PGSQL_DESC= Build pam_pgsql diff --git a/security/pam-mysql/Makefile b/security/pam-mysql/Makefile index cd2fd0e47540..b0ef223868a8 100644 --- a/security/pam-mysql/Makefile +++ b/security/pam-mysql/Makefile @@ -14,8 +14,7 @@ COMMENT= Pam module for authenticating with MySQL LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c11 libtool:keepla -USE_MYSQL= yes +USES= compiler:c11 libtool:keepla mysql GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-mysql=${LOCALBASE} \ --with-pam-mods-dir=${PREFIX}/lib \ diff --git a/security/razorback-dispatcher/Makefile b/security/razorback-dispatcher/Makefile index bd794a32b827..25e47b6bea6c 100644 --- a/security/razorback-dispatcher/Makefile +++ b/security/razorback-dispatcher/Makefile @@ -22,9 +22,8 @@ LIB_DEPENDS= librazorback_api.so:security/razorback-api \ libmemcached.so:databases/libmemcached \ libcli.so:devel/libcli -USES= autoreconf libtool pathfix pkgconfig +USES= autoreconf libtool mysql pathfix pkgconfig GNU_CONFIGURE= yes -USE_MYSQL= yes USE_RC_SUBR= dispatcher dispatcher_safed SUB_FILES= pkg-message CPPFLAGS+= -I${LOCALBASE}/include diff --git a/security/scanhill/Makefile b/security/scanhill/Makefile index 3eee812c5ac4..7680c093406e 100644 --- a/security/scanhill/Makefile +++ b/security/scanhill/Makefile @@ -22,7 +22,7 @@ PORTDOCS= README.txt INSTALL.txt mysql.sql OPTIONS_DEFINE= MYSQL DOCS -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_ENABLE= mysql post-patch: diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index 4843210595f8..58901fb07f07 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -157,7 +157,7 @@ CMAKE_ARGS+= -Dbuild-dird=ON \ # Server default database MYSQL_CMAKE_ON= -Dmysql=ON -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql SQLITE3_CMAKE_ON= -Dsqlite3=ON SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 PGSQL_CMAKE_ON= -Dpostgresql=ON diff --git a/sysutils/bareos16-server/Makefile b/sysutils/bareos16-server/Makefile index c913fd0a1dd7..2224eedb360b 100644 --- a/sysutils/bareos16-server/Makefile +++ b/sysutils/bareos16-server/Makefile @@ -154,7 +154,7 @@ CONFFILES= sd dir # Server default database MYSQL_CONFIGURE_ON= --with-mysql=yes -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql SQLITE3_CONFIGURE_ON= --with-sqlite3=yes SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 PGSQL_CONFIGURE_ON= --with-postgresql=yes diff --git a/sysutils/bareos17-server/Makefile b/sysutils/bareos17-server/Makefile index 6923315702cd..0c954aa95b47 100644 --- a/sysutils/bareos17-server/Makefile +++ b/sysutils/bareos17-server/Makefile @@ -154,7 +154,7 @@ CONFFILES= sd dir # Server default database MYSQL_CONFIGURE_ON= --with-mysql=yes -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql SQLITE3_CONFIGURE_ON= --with-sqlite3=yes SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 PGSQL_CONFIGURE_ON= --with-postgresql=yes diff --git a/sysutils/msyslog/Makefile b/sysutils/msyslog/Makefile index 1eb06dbf1794..030355881d76 100644 --- a/sysutils/msyslog/Makefile +++ b/sysutils/msyslog/Makefile @@ -17,7 +17,7 @@ LICENSE_COMB= dual OPTIONS_DEFINE= MYSQL PGSQL EXAMPLES OPTIONS_SUB= yes -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_OFF= --without-mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_OFF= --without-pgsql diff --git a/textproc/refdb/Makefile b/textproc/refdb/Makefile index a27c994f747a..c3354b565257 100644 --- a/textproc/refdb/Makefile +++ b/textproc/refdb/Makefile @@ -45,7 +45,7 @@ USE_RC_SUBR= refdbd .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql # If libdbi-drivers has been built without MySQL driver, abort .if exists(${LOCALBASE}/lib/dbd) && !exists(${LOCALBASE}/lib/dbd/libdbdmysql.so) IGNORE= rebuild databases/libdbi-drivers with MySQL support diff --git a/www/ach/Makefile b/www/ach/Makefile index a0f8544e5caf..9d33c3d6c8ad 100644 --- a/www/ach/Makefile +++ b/www/ach/Makefile @@ -14,8 +14,7 @@ BROKEN= unfetchable LICENSE= GPLv3 -USE_MYSQL= yes -USES= php tar +USES= mysql php tar USE_GITHUB= yes GH_ACCOUNT= Burton GH_PROJECT= Analysis-of-Competing-Hypotheses diff --git a/www/bacula-web/Makefile b/www/bacula-web/Makefile index d341b1430e30..7e8101c62510 100644 --- a/www/bacula-web/Makefile +++ b/www/bacula-web/Makefile @@ -35,7 +35,7 @@ SQLITE_USES= sqlite .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql CONFIGURE_ARGS+= --with-mysql=yes SUB_LIST+= REQ_MYSQL=mysql USE_PHP+= pdo_mysql diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile index ff5b9a1eac3e..eb92c544a670 100644 --- a/www/cherokee/Makefile +++ b/www/cherokee/Makefile @@ -73,7 +73,7 @@ IPV6_CONFIGURE_OFF= --disable-ipv6 LDAP_USE= openldap=yes LDAP_CONFIGURE_ON= --with-ldap=yes LDAP_CONFIGURE_OFF= --with-ldap=no -MYSQL_USE= mysql=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_ON= --with-mysql=yes MYSQL_CONFIGURE_OFF= --with-mysql=no RRDTOOL_DESC= Usage graphs support diff --git a/www/mediawiki131/Makefile b/www/mediawiki131/Makefile index 8c610249443f..0e07594dfc4c 100644 --- a/www/mediawiki131/Makefile +++ b/www/mediawiki131/Makefile @@ -41,7 +41,8 @@ MEMCACHED_DESC= Use memcached IMAGICK_DESC= Use ImageMagick SOCKETS_DESC= Use sockets -MYSQL_USE= mysql=client php=mysqli +MYSQL_USES= mysql +MYSQL_USE= php=mysqli PGSQL_USE= php=pgsql SQLITE_USE= php=sqlite3 LDAP_USE= php=ldap diff --git a/www/mediawiki132/Makefile b/www/mediawiki132/Makefile index 3fe90cb51780..b701933ced5a 100644 --- a/www/mediawiki132/Makefile +++ b/www/mediawiki132/Makefile @@ -41,7 +41,8 @@ MEMCACHED_DESC= Use memcached IMAGICK_DESC= Use ImageMagick SOCKETS_DESC= Use sockets -MYSQL_USE= mysql=client php=mysqli +MYSQL_USES= mysql +MYSQL_USE= php=mysqli PGSQL_USE= php=pgsql SQLITE_USE= php=sqlite3 LDAP_USE= php=ldap diff --git a/www/mediawiki133/Makefile b/www/mediawiki133/Makefile index 9c0cfec6a3ae..00f0d15c53d7 100644 --- a/www/mediawiki133/Makefile +++ b/www/mediawiki133/Makefile @@ -41,7 +41,8 @@ MEMCACHED_DESC= Use memcached IMAGICK_DESC= Use ImageMagick SOCKETS_DESC= Use sockets -MYSQL_USE= mysql=client php=mysqli +MYSQL_USES= mysql +MYSQL_USE= php=mysqli PGSQL_USE= php=pgsql SQLITE_USE= php=sqlite3 LDAP_USE= php=ldap diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile index 275f9436cc32..052213b8a18b 100644 --- a/www/mnogosearch/Makefile +++ b/www/mnogosearch/Makefile @@ -73,7 +73,7 @@ CONFIGURE_ARGS+= --disable-syslog .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} .endif diff --git a/www/mod_auth_cookie_mysql2/Makefile b/www/mod_auth_cookie_mysql2/Makefile index 607ad5cacee2..297338d96bcb 100644 --- a/www/mod_auth_cookie_mysql2/Makefile +++ b/www/mod_auth_cookie_mysql2/Makefile @@ -12,8 +12,7 @@ DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org COMMENT= Allows authentication against MySQL database via secure cookie -USE_MYSQL= yes -USES= apache:2.2+ +USES= apache:2.2+ mysql AP_FAST_BUILD= yes AP_GENPLIST= yes diff --git a/www/mod_auth_mysql2/Makefile b/www/mod_auth_mysql2/Makefile index a4870da0f923..32485463bd30 100644 --- a/www/mod_auth_mysql2/Makefile +++ b/www/mod_auth_mysql2/Makefile @@ -14,9 +14,8 @@ COMMENT= MySQL-based authentication module with VirtualHost support LICENSE= APACHE20 -USES= apache:2.2+ tar:tgz +USES= apache:2.2+ mysql tar:tgz WRKSRC= ${WRKDIR}/${PORTNAME} -USE_MYSQL= yes AP_FAST_BUILD= yes AP_GENPLIST= yes AP_INC+= ${LOCALBASE}/include/mysql diff --git a/www/mod_auth_mysql_another/Makefile b/www/mod_auth_mysql_another/Makefile index 8915ebe4b60e..843fa904405b 100644 --- a/www/mod_auth_mysql_another/Makefile +++ b/www/mod_auth_mysql_another/Makefile @@ -13,8 +13,7 @@ COMMENT= Allows users to use MySQL databases for user authentication LICENSE= APACHE10 -USE_MYSQL= yes -USES= apache:2.2+ +USES= apache:2.2+ mysql SHORTMODNAME= mysql_auth AP_FAST_BUILD= yes diff --git a/www/mod_log_sql2/Makefile b/www/mod_log_sql2/Makefile index 12b531e65779..8c17422c0896 100644 --- a/www/mod_log_sql2/Makefile +++ b/www/mod_log_sql2/Makefile @@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} MAINTAINER= apache@FreeBSD.org COMMENT= Allows Apache to log to a MySQL database -USES= apache:2.2+ gmake tar:bzip2 -USE_MYSQL= yes +USES= apache:2.2+ gmake mysql tar:bzip2 GNU_CONFIGURE= yes OPTIONS_SUB= yes diff --git a/www/mod_tsa/Makefile b/www/mod_tsa/Makefile index dc706d556255..3c5900265798 100644 --- a/www/mod_tsa/Makefile +++ b/www/mod_tsa/Makefile @@ -35,7 +35,7 @@ PORTEXAMPLES= *.sql tsa.conf .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql CONFIGURE_ARGS+= --enable-mysql=yes SRC_FILE+= db_mysql.c AP_INC+= -I${LOCALBASE}/include/mysql diff --git a/www/typo3-8/Makefile b/www/typo3-8/Makefile index e1ba672cc854..b35b305531a3 100644 --- a/www/typo3-8/Makefile +++ b/www/typo3-8/Makefile @@ -51,7 +51,7 @@ CURL_USE= PHP=curl GD_USE= PHP=gd GMP_USE= PHP=gmp MBSTRING_USE= PHP=mbstring -MYSQL_USE= MYSQL=server +MYSQL_USES= mysql:server ZLIB_USE= PHP=zlib .include <bsd.port.options.mk> diff --git a/www/udmsearch/Makefile b/www/udmsearch/Makefile index 5db638cda10c..2d9a341cf5f9 100644 --- a/www/udmsearch/Makefile +++ b/www/udmsearch/Makefile @@ -25,7 +25,7 @@ USES= libtool OPTIONS_DEFINE= MYSQL PGSQL DOCS OPTIONS_DEFAULT= MYSQL -MYSQL_USE= MYSQL=YES +MYSQL_USES= mysql MYSQL_CONFIGURE_ON+= --with-mysql=${LOCALBASE} PGSQL_USES= pgsql PGSQL_CONFIGURE_ON+= --with-pgsql=${LOCALBASE}/pgsql |