Date: Fri, 15 Nov 2019 10:12:08 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517643 - in head: audio/icegenerator benchmarks/super-smack databases/akonadi databases/dbow databases/fpc-mysql databases/innotop databases/mysql55-server databases/mysqltcl databases... Message-ID: <201911151012.xAFAC8xY088660@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Fri Nov 15 10:12:08 2019 New Revision: 517643 URL: https://svnweb.freebsd.org/changeset/ports/517643 Log: Move remaining USE_MYSQL, WANT_MYSQL_VER to USES=mysql Modified: head/audio/icegenerator/Makefile head/benchmarks/super-smack/Makefile head/databases/akonadi/Makefile head/databases/dbow/Makefile head/databases/fpc-mysql/Makefile head/databases/innotop/Makefile head/databases/mysql55-server/Makefile head/databases/mysqltcl/Makefile head/databases/opendbx/Makefile head/databases/p5-DBIx-Class-Schema-Loader/Makefile head/databases/proftpd-mod_sql_mysql/Makefile head/databases/qt5-sqldrivers-mysql/Makefile head/databases/rubygem-do_mysql/Makefile head/databases/soci/Makefile head/databases/sqlclient/Makefile head/databases/sqlrelay/Makefile head/databases/tuning-primer/Makefile head/databases/vfront/Makefile head/devel/apr2/Makefile head/devel/bugzilla44/Makefile head/devel/bugzilla50/Makefile head/devel/gearmand-devel/Makefile head/devel/gearmand/Makefile head/devel/matreshka/Makefile head/devel/p5-Test-DBIx-Class/Makefile head/devel/sonarqube/Makefile head/devel/sope2/Makefile head/devel/sope3/Makefile head/devel/sope4/Makefile head/dns/mydns-ng/Makefile head/dns/mydns/Makefile head/finance/frontaccounting/Makefile head/ftp/smbftpd/Makefile head/ftp/wzdftpd/Makefile head/games/ldmud/Makefile head/games/pvpgn/Makefile head/games/quetoo/Makefile head/games/scorched3d/Makefile head/graphics/digikam/Makefile head/irc/ratbox-services/Makefile head/irc/unreal/Makefile head/japanese/tomoe/Makefile head/lang/newlisp-devel/Makefile head/lang/newlisp/Makefile head/lang/urweb/Makefile head/mail/exim/Makefile head/mail/postfix-policyd-sf/Makefile head/mail/qmail-mysql/Makefile head/mail/qsf/Makefile head/mail/tpop3d/Makefile head/mail/vpopmail/Makefile head/net-im/jabberd/Makefile head/net-im/mu-conference/Makefile head/net-mgmt/devmon/Makefile head/net-mgmt/monitoring-plugins/Makefile head/net-mgmt/nagios-plugins/Makefile head/net-mgmt/netdot/Makefile head/net-mgmt/rackmonkey/Makefile head/net-mgmt/super_mediator/Makefile head/net/gnu-radius/Makefile head/net/kea/Makefile head/net/libnss-mysql/Makefile head/net/linknx/Makefile head/net/netatalk3/Makefile head/net/pwhois/Makefile head/net/traff/Makefile head/net/yate/Makefile head/security/barnyard2/Makefile head/security/courier-authlib/Makefile head/security/libpreludedb/Makefile head/security/maia/Makefile head/security/ossec-hids-local/Makefile head/security/pam-modules/Makefile head/security/pam-mysql/Makefile head/security/razorback-dispatcher/Makefile head/security/scanhill/Makefile head/sysutils/bareos-server/Makefile head/sysutils/bareos16-server/Makefile head/sysutils/bareos17-server/Makefile head/sysutils/msyslog/Makefile head/textproc/refdb/Makefile head/www/ach/Makefile head/www/bacula-web/Makefile head/www/cherokee/Makefile head/www/mediawiki131/Makefile head/www/mediawiki132/Makefile head/www/mediawiki133/Makefile head/www/mnogosearch/Makefile head/www/mod_auth_cookie_mysql2/Makefile head/www/mod_auth_mysql2/Makefile head/www/mod_auth_mysql_another/Makefile head/www/mod_log_sql2/Makefile head/www/mod_tsa/Makefile head/www/typo3-8/Makefile head/www/udmsearch/Makefile Modified: head/audio/icegenerator/Makefile ============================================================================== --- head/audio/icegenerator/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/audio/icegenerator/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/benchmarks/super-smack/Makefile ============================================================================== --- head/benchmarks/super-smack/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/benchmarks/super-smack/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/databases/akonadi/Makefile ============================================================================== --- head/databases/akonadi/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/databases/akonadi/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/databases/dbow/Makefile ============================================================================== --- head/databases/dbow/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/databases/dbow/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -10,10 +10,9 @@ 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" \ Modified: head/databases/fpc-mysql/Makefile ============================================================================== --- head/databases/fpc-mysql/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/databases/fpc-mysql/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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" Modified: head/databases/innotop/Makefile ============================================================================== --- head/databases/innotop/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/databases/innotop/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/databases/mysql55-server/Makefile ============================================================================== --- head/databases/mysql55-server/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/databases/mysql55-server/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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* \ Modified: head/databases/mysqltcl/Makefile ============================================================================== --- head/databases/mysqltcl/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/databases/mysqltcl/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 \ Modified: head/databases/opendbx/Makefile ============================================================================== --- head/databases/opendbx/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/databases/opendbx/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/databases/p5-DBIx-Class-Schema-Loader/Makefile ============================================================================== --- head/databases/p5-DBIx-Class-Schema-Loader/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/databases/p5-DBIx-Class-Schema-Loader/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -43,7 +43,7 @@ NO_ARCH= yes USES= perl5 USE_PERL5= configure -MYSQL_USE= mysql +MYSQL_USES= mysql PGSQL_USES= pgsql SQLITE_USES= sqlite Modified: head/databases/proftpd-mod_sql_mysql/Makefile ============================================================================== --- head/databases/proftpd-mod_sql_mysql/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/databases/proftpd-mod_sql_mysql/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/databases/qt5-sqldrivers-mysql/Makefile ============================================================================== --- head/databases/qt5-sqldrivers-mysql/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/databases/qt5-sqldrivers-mysql/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -4,6 +4,6 @@ DB= MYSQL DB_DESC= MySQL -USE_MYSQL= yes +USES= mysql .include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers" Modified: head/databases/rubygem-do_mysql/Makefile ============================================================================== --- head/databases/rubygem-do_mysql/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/databases/rubygem-do_mysql/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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> Modified: head/databases/soci/Makefile ============================================================================== --- head/databases/soci/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/databases/soci/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/databases/sqlclient/Makefile ============================================================================== --- head/databases/sqlclient/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/databases/sqlclient/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/databases/sqlrelay/Makefile ============================================================================== --- head/databases/sqlrelay/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/databases/sqlrelay/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/databases/tuning-primer/Makefile ============================================================================== --- head/databases/tuning-primer/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/databases/tuning-primer/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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} Modified: head/databases/vfront/Makefile ============================================================================== --- head/databases/vfront/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/databases/vfront/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/devel/apr2/Makefile ============================================================================== --- head/devel/apr2/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/devel/apr2/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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} Modified: head/devel/bugzilla44/Makefile ============================================================================== --- head/devel/bugzilla44/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/devel/bugzilla44/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/devel/bugzilla50/Makefile ============================================================================== --- head/devel/bugzilla50/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/devel/bugzilla50/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/devel/gearmand-devel/Makefile ============================================================================== --- head/devel/gearmand-devel/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/devel/gearmand-devel/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/devel/gearmand/Makefile ============================================================================== --- head/devel/gearmand/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/devel/gearmand/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/devel/matreshka/Makefile ============================================================================== --- head/devel/matreshka/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/devel/matreshka/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/devel/p5-Test-DBIx-Class/Makefile ============================================================================== --- head/devel/p5-Test-DBIx-Class/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/devel/p5-Test-DBIx-Class/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -36,7 +36,7 @@ TEST_DEPENDS= p5-MooseX-Types-LoadableClass>=0:devel/p 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 Modified: head/devel/sonarqube/Makefile ============================================================================== --- head/devel/sonarqube/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/devel/sonarqube/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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: Modified: head/devel/sope2/Makefile ============================================================================== --- head/devel/sope2/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/devel/sope2/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -41,7 +41,7 @@ CONFIGURE_ARGS= --with-gnustep --disable-debug --enab LDAP_USE= OPENLDAP=client PGSQL_USES= pgsql -MYSQL_USE= MYSQL=client +MYSQL_USES= mysql MEMCACHED_RUN_DEPENDS= ${LOCALBASE}/bin/memcached:databases/memcached post-patch: Modified: head/devel/sope3/Makefile ============================================================================== --- head/devel/sope3/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/devel/sope3/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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: Modified: head/devel/sope4/Makefile ============================================================================== --- head/devel/sope4/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/devel/sope4/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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: Modified: head/dns/mydns-ng/Makefile ============================================================================== --- head/dns/mydns-ng/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/dns/mydns-ng/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/dns/mydns/Makefile ============================================================================== --- head/dns/mydns/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/dns/mydns/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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} Modified: head/finance/frontaccounting/Makefile ============================================================================== --- head/finance/frontaccounting/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/finance/frontaccounting/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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> Modified: head/ftp/smbftpd/Makefile ============================================================================== --- head/ftp/smbftpd/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/ftp/smbftpd/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/ftp/wzdftpd/Makefile ============================================================================== --- head/ftp/wzdftpd/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/ftp/wzdftpd/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/games/ldmud/Makefile ============================================================================== --- head/games/ldmud/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/games/ldmud/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/games/pvpgn/Makefile ============================================================================== --- head/games/pvpgn/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/games/pvpgn/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/games/quetoo/Makefile ============================================================================== --- head/games/quetoo/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/games/quetoo/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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" Modified: head/games/scorched3d/Makefile ============================================================================== --- head/games/scorched3d/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/games/scorched3d/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 \ Modified: head/graphics/digikam/Makefile ============================================================================== --- head/graphics/digikam/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/graphics/digikam/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -77,7 +77,8 @@ MEDIAPLAYER_LIB_DEPENDS= libavcodec.so:multimedia/ffmp 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 \ Modified: head/irc/ratbox-services/Makefile ============================================================================== --- head/irc/ratbox-services/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/irc/ratbox-services/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/irc/unreal/Makefile ============================================================================== --- head/irc/unreal/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/irc/unreal/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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="" Modified: head/japanese/tomoe/Makefile ============================================================================== --- head/japanese/tomoe/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/japanese/tomoe/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/lang/newlisp-devel/Makefile ============================================================================== --- head/lang/newlisp-devel/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/lang/newlisp-devel/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -67,7 +67,7 @@ PLIST_SUB+= GSL="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql MODULES+= mysql PLIST_SUB+= MYSQL="" .else Modified: head/lang/newlisp/Makefile ============================================================================== --- head/lang/newlisp/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/lang/newlisp/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -54,7 +54,7 @@ MODULES+= gsl .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql MODULES+= mysql .endif Modified: head/lang/urweb/Makefile ============================================================================== --- head/lang/urweb/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/lang/urweb/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -57,7 +57,7 @@ CONFIGURE_ENV+= SQHEADER="no" .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql .else CONFIGURE_ENV+= MSHEADER="no" .endif Modified: head/mail/exim/Makefile ============================================================================== --- head/mail/exim/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/mail/exim/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/mail/postfix-policyd-sf/Makefile ============================================================================== --- head/mail/postfix-policyd-sf/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/mail/postfix-policyd-sf/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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}.*//} Modified: head/mail/qmail-mysql/Makefile ============================================================================== --- head/mail/qmail-mysql/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/mail/qmail-mysql/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/mail/qsf/Makefile ============================================================================== --- head/mail/qsf/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/mail/qsf/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --without-gdbm .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql .else CONFIGURE_ARGS+= --without-mysql .endif Modified: head/mail/tpop3d/Makefile ============================================================================== --- head/mail/tpop3d/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/mail/tpop3d/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/mail/vpopmail/Makefile ============================================================================== --- head/mail/vpopmail/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/mail/vpopmail/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/net-im/jabberd/Makefile ============================================================================== --- head/net-im/jabberd/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/net-im/jabberd/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/net-im/mu-conference/Makefile ============================================================================== --- head/net-im/mu-conference/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/net-im/mu-conference/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/net-mgmt/devmon/Makefile ============================================================================== --- head/net-mgmt/devmon/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/net-mgmt/devmon/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -27,13 +27,9 @@ SUB_LIST= USERS=${USERS} \ OPTIONS_DEFINE= MYSQL DOCS -REINPLACE_ARGS= -i '' +MYSQL_USES= mysql -.include <bsd.port.options.mk> - -.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 Modified: head/net-mgmt/monitoring-plugins/Makefile ============================================================================== --- head/net-mgmt/monitoring-plugins/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/net-mgmt/monitoring-plugins/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/net-mgmt/nagios-plugins/Makefile ============================================================================== --- head/net-mgmt/nagios-plugins/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/net-mgmt/nagios-plugins/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/net-mgmt/netdot/Makefile ============================================================================== --- head/net-mgmt/netdot/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/net-mgmt/netdot/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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}" \ Modified: head/net-mgmt/rackmonkey/Makefile ============================================================================== --- head/net-mgmt/rackmonkey/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/net-mgmt/rackmonkey/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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} Modified: head/net-mgmt/super_mediator/Makefile ============================================================================== --- head/net-mgmt/super_mediator/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/net-mgmt/super_mediator/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/net/gnu-radius/Makefile ============================================================================== --- head/net/gnu-radius/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/net/gnu-radius/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/net/kea/Makefile ============================================================================== --- head/net/kea/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/net/kea/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/net/libnss-mysql/Makefile ============================================================================== --- head/net/libnss-mysql/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/net/libnss-mysql/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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},' \ Modified: head/net/linknx/Makefile ============================================================================== --- head/net/linknx/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/net/linknx/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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= * Modified: head/net/netatalk3/Makefile ============================================================================== --- head/net/netatalk3/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/net/netatalk3/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/net/pwhois/Makefile ============================================================================== --- head/net/pwhois/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/net/pwhois/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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}" \ Modified: head/net/traff/Makefile ============================================================================== --- head/net/traff/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/net/traff/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/net/yate/Makefile ============================================================================== --- head/net/yate/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/net/yate/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/security/barnyard2/Makefile ============================================================================== --- head/security/barnyard2/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/security/barnyard2/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/security/courier-authlib/Makefile ============================================================================== --- head/security/courier-authlib/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/security/courier-authlib/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -123,8 +123,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/sysconftool/sysconfto 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 Modified: head/security/libpreludedb/Makefile ============================================================================== --- head/security/libpreludedb/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/security/libpreludedb/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/security/maia/Makefile ============================================================================== --- head/security/maia/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/security/maia/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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} Modified: head/security/ossec-hids-local/Makefile ============================================================================== --- head/security/ossec-hids-local/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/security/ossec-hids-local/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/security/pam-modules/Makefile ============================================================================== --- head/security/pam-modules/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/security/pam-modules/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/security/pam-mysql/Makefile ============================================================================== --- head/security/pam-mysql/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/security/pam-mysql/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 \ Modified: head/security/razorback-dispatcher/Makefile ============================================================================== --- head/security/razorback-dispatcher/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/security/razorback-dispatcher/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -22,9 +22,8 @@ LIB_DEPENDS= librazorback_api.so:security/razorback-ap 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 Modified: head/security/scanhill/Makefile ============================================================================== --- head/security/scanhill/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/security/scanhill/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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: Modified: head/sysutils/bareos-server/Makefile ============================================================================== --- head/sysutils/bareos-server/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/sysutils/bareos-server/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/sysutils/bareos16-server/Makefile ============================================================================== --- head/sysutils/bareos16-server/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/sysutils/bareos16-server/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/sysutils/bareos17-server/Makefile ============================================================================== --- head/sysutils/bareos17-server/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/sysutils/bareos17-server/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/sysutils/msyslog/Makefile ============================================================================== --- head/sysutils/msyslog/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/sysutils/msyslog/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/textproc/refdb/Makefile ============================================================================== --- head/textproc/refdb/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/textproc/refdb/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/www/ach/Makefile ============================================================================== --- head/www/ach/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/www/ach/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/www/bacula-web/Makefile ============================================================================== --- head/www/bacula-web/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/www/bacula-web/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/www/cherokee/Makefile ============================================================================== --- head/www/cherokee/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/www/cherokee/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/www/mediawiki131/Makefile ============================================================================== --- head/www/mediawiki131/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/www/mediawiki131/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 Modified: head/www/mediawiki132/Makefile ============================================================================== --- head/www/mediawiki132/Makefile Fri Nov 15 10:09:03 2019 (r517642) +++ head/www/mediawiki132/Makefile Fri Nov 15 10:12:08 2019 (r517643) @@ -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 OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911151012.xAFAC8xY088660>