diff options
55 files changed, 150 insertions, 102 deletions
diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk index 36d6ce454f1c..cf5840131744 100644 --- a/Mk/Uses/mysql.mk +++ b/Mk/Uses/mysql.mk @@ -19,6 +19,9 @@ # MYSQL_VER # Detected MySQL version. # +# DBD_MYSQL +# Set compatible p5-DBD-mysql version +# # MAINTAINER: ports@FreeBSD.org .if !defined(_INCLUDE_USES_MYSQL_MK) @@ -142,4 +145,10 @@ LIB_DEPENDS+= ${_MYSQL_SHLIB}.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT} IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER} . endif # Check for correct libs +. if ${MYSQL_FLAVOUR} == mariadb +DBD_MYSQL= p5-DBD-mysql4>=0:databases/p5-DBD-mysql4 +. else +DBD_MYSQL= p5-DBD-mysql>=0:databases/p5-DBD-mysql +. endif + .endif diff --git a/comms/atslog/Makefile b/comms/atslog/Makefile index 243324ef36e7..a442dffef7e3 100644 --- a/comms/atslog/Makefile +++ b/comms/atslog/Makefile @@ -1,6 +1,6 @@ PORTNAME= atslog PORTVERSION= 2.1.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= comms MASTER_SITES= BERLIOS @@ -35,8 +35,8 @@ WWW_DESC= Install web interface WWWGD_DESC= Graphic reports MYSQL_USES= mysql -MYSQL_BUILD_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql -MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql +MYSQL_BUILD_DEPENDS= ${DBD_MYSQL} +MYSQL_RUN_DEPENDS= ${DBD_MYSQL} PGSQL_USES= pgsql PGSQL_BUILD_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg diff --git a/databases/innotop/Makefile b/databases/innotop/Makefile index a0cd61da780d..3baf8a40e885 100644 --- a/databases/innotop/Makefile +++ b/databases/innotop/Makefile @@ -1,5 +1,6 @@ PORTNAME= innotop PORTVERSION= 1.13.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= databases @@ -10,7 +11,7 @@ WWW= https://github.com/innotop/innotop LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql \ +BUILD_DEPENDS= ${DBD_MYSQL} \ p5-DBI>=1.46:databases/p5-DBI \ p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey \ p5-Time-HiRes>0:devel/p5-Time-HiRes \ diff --git a/databases/mtop/Makefile b/databases/mtop/Makefile index 7bb878920f81..b6f9333e4348 100644 --- a/databases/mtop/Makefile +++ b/databases/mtop/Makefile @@ -1,6 +1,6 @@ PORTNAME= mtop PORTVERSION= 0.6.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION} @@ -12,11 +12,11 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= p5-Curses>=0:devel/p5-Curses \ - p5-DBD-mysql>=0:databases/p5-DBD-mysql + ${DBD_MYSQL} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes -USES= perl5 +USES= mysql perl5 USE_PERL5= configure post-patch: diff --git a/databases/mysqlreport/Makefile b/databases/mysqlreport/Makefile index 15bba81d2698..86f6915797ca 100644 --- a/databases/mysqlreport/Makefile +++ b/databases/mysqlreport/Makefile @@ -1,6 +1,6 @@ PORTNAME= mysqlreport PORTVERSION= 3.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases MAINTAINER= ports@FreeBSD.org @@ -10,13 +10,13 @@ WWW= https://hackmysql.com/mysqlreport LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql \ +RUN_DEPENDS= ${DBD_MYSQL} \ p5-DBI>=0:databases/p5-DBI \ p5-Term-ReadKey>=0:devel/p5-Term-ReadKey NO_ARCH= yes NO_BUILD= yes -USES= perl5 shebangfix +USES= mysql perl5 shebangfix WRKSRC_SUBDIR= ${PORTNAME} PLIST_FILES= bin/mysqlreport diff --git a/databases/mytop/Makefile b/databases/mytop/Makefile index 034c056942fd..faee6e334d48 100644 --- a/databases/mytop/Makefile +++ b/databases/mytop/Makefile @@ -1,5 +1,6 @@ PORTNAME= mytop PORTVERSION= 1.7 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= ports@FreeBSD.org @@ -8,7 +9,7 @@ WWW= https://jeremy.zawodny.com/mysql/mytop/ LICENSE= GPLv2 -RUN_DEPENDS= p5-DBD-mysql>1.0:databases/p5-DBD-mysql \ +RUN_DEPENDS= ${DBD_MYSQL} \ p5-DBI>=1.13:databases/p5-DBI \ p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey @@ -18,7 +19,7 @@ GH_TAGNAME= 437f2ef NO_ARCH= yes -USES+= perl5 +USES+= mysql perl5 USE_PERL5= configure PLIST_FILES= bin/mytop \ diff --git a/databases/p5-Class-DBI-mysql/Makefile b/databases/p5-Class-DBI-mysql/Makefile index 0711ab8fc1ac..81cb5f360027 100644 --- a/databases/p5-Class-DBI-mysql/Makefile +++ b/databases/p5-Class-DBI-mysql/Makefile @@ -1,6 +1,6 @@ PORTNAME= Class-DBI-mysql PORTVERSION= 1.00 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -11,9 +11,9 @@ WWW= https://metacpan.org/release/Class-DBI-mysql BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Class-DBI>=0:databases/p5-Class-DBI \ - p5-DBD-mysql>=0:databases/p5-DBD-mysql + ${DBD_MYSQL} -USES= perl5 +USES= mysql perl5 USE_PERL5= configure .include <bsd.port.mk> diff --git a/databases/p5-DBIx-MySQLSequence/Makefile b/databases/p5-DBIx-MySQLSequence/Makefile index 2c726034da4e..b120bb8f6f28 100644 --- a/databases/p5-DBIx-MySQLSequence/Makefile +++ b/databases/p5-DBIx-MySQLSequence/Makefile @@ -1,6 +1,6 @@ PORTNAME= DBIx-MySQLSequence PORTVERSION= 1.04 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -9,14 +9,14 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Proper and correct (emulated) sequence support for MySQL WWW= https://metacpan.org/release/DBIx-MySQLSequence -BUILD_DEPENDS= p5-DBD-mysql>0:databases/p5-DBD-mysql \ +BUILD_DEPENDS= ${DBD_MYSQL} \ p5-DBI>0:databases/p5-DBI \ p5-Params-Util>=0.26:devel/p5-Params-Util -RUN_DEPENDS= p5-DBD-mysql>0:databases/p5-DBD-mysql \ +RUN_DEPENDS= ${DBD_MYSQL} \ p5-DBI>0:databases/p5-DBI \ p5-Params-Util>=0.26:devel/p5-Params-Util -USES= perl5 +USES= mysql perl5 USE_PERL5= configure post-patch: diff --git a/databases/p5-DBIx-TableHash/Makefile b/databases/p5-DBIx-TableHash/Makefile index 92a23b73d85b..9cf9567deeb7 100644 --- a/databases/p5-DBIx-TableHash/Makefile +++ b/databases/p5-DBIx-TableHash/Makefile @@ -1,7 +1,7 @@ PORTNAME= DBIx-TableHash CATEGORIES= databases perl5 PORTVERSION= 1.05 -PORTREVISION= 1 +PORTREVISION= 2 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:CHTHORMAN PKGNAMEPREFIX= p5- @@ -11,9 +11,9 @@ COMMENT= Tie a hash to a MySQL table plus SQL utilities WWW= https://christhorman.com/projects/perl/DBIx-TableHash/ BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql +RUN_DEPENDS= ${DBD_MYSQL} -USES= perl5 +USES= mysql perl5 USE_PERL5= configure .include <bsd.port.mk> diff --git a/databases/p5-MySQL-Diff/Makefile b/databases/p5-MySQL-Diff/Makefile index 71f66fe38db2..1e62c43ba9cd 100644 --- a/databases/p5-MySQL-Diff/Makefile +++ b/databases/p5-MySQL-Diff/Makefile @@ -1,5 +1,6 @@ PORTNAME= MySQL-Diff PORTVERSION= 0.50 +PORTREVISION= 1 CATEGORIES= databases perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -13,11 +14,11 @@ LICENSE_COMB= dual BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Class-MakeMethods>=0:devel/p5-Class-MakeMethods \ - p5-DBD-mysql>=0:databases/p5-DBD-mysql \ + ${DBD_MYSQL} \ p5-File-Slurp>=0:devel/p5-File-Slurp \ p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote -USES= perl5 shebangfix +USES= mysql perl5 shebangfix USE_PERL5= configure SHEBANG_FILES= bin/mysqldiff diff --git a/databases/p5-Test-mysqld/Makefile b/databases/p5-Test-mysqld/Makefile index a77739977fc9..789fffbb9579 100644 --- a/databases/p5-Test-mysqld/Makefile +++ b/databases/p5-Test-mysqld/Makefile @@ -1,5 +1,6 @@ PORTNAME= Test-mysqld PORTVERSION= 1.0013 +PORTREVISION= 1 CATEGORIES= databases perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,12 +15,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Class-Accessor-Lite>=0:devel/p5-Class-Accessor-Lite \ - p5-DBD-mysql>=0:databases/p5-DBD-mysql \ + ${DBD_MYSQL} \ p5-DBI>=0:databases/p5-DBI \ p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive TEST_DEPENDS= p5-Test-SharedFork>=0:devel/p5-Test-SharedFork -USES= perl5 +USES= mysql perl5 USE_PERL5= modbuildtiny NO_ARCH= yes diff --git a/databases/p5-mysql-genocide/Makefile b/databases/p5-mysql-genocide/Makefile index 566a87d8ba76..11a3c59d46f3 100644 --- a/databases/p5-mysql-genocide/Makefile +++ b/databases/p5-mysql-genocide/Makefile @@ -1,6 +1,6 @@ PORTNAME= mysql-genocide PORTVERSION= 0.03 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:RSOLIV @@ -11,9 +11,9 @@ COMMENT= Parallel operation on MySQL processlist WWW= https://metacpan.org/release/RSOLIV/mysql-genocide-0.03 BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql +RUN_DEPENDS= ${DBD_MYSQL} -USES= perl5 +USES= mysql perl5 USE_PERL5= configure .include <bsd.port.mk> diff --git a/databases/percona-toolkit/Makefile b/databases/percona-toolkit/Makefile index d20d91967c59..bd9f994116d3 100644 --- a/databases/percona-toolkit/Makefile +++ b/databases/percona-toolkit/Makefile @@ -1,5 +1,6 @@ PORTNAME= percona-toolkit DISTVERSION= 3.5.2 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= https://www.percona.com/downloads/${PORTNAME}/${PORTVERSION}/source/tarball/ @@ -11,12 +12,12 @@ LICENSE= ARTPERL10 GPLv2 LICENSE_COMB= dual RUN_DEPENDS= bash:shells/bash \ - p5-DBD-mysql>=3:databases/p5-DBD-mysql \ + ${DBD_MYSQL} \ p5-DBI>=1.46:databases/p5-DBI \ p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey \ pidof:sysutils/pidof -USES= perl5 shebangfix +USES= mysql perl5 shebangfix USE_PERL5= configure SHEBANG_FILES= bin/pt-* diff --git a/deskutils/note/Makefile b/deskutils/note/Makefile index 9d7ec2bab443..8d0ade1192a5 100644 --- a/deskutils/note/Makefile +++ b/deskutils/note/Makefile @@ -1,5 +1,6 @@ PORTNAME= note DISTVERSION= 1.3.26 +PORTREVISION= 1 CATEGORIES= deskutils perl5 MASTER_SITES= http://www.daemon.de/idisk/Apps/note/ @@ -19,8 +20,9 @@ NO_ARCH= yes OPTIONS_DEFINE= EXAMPLES MYSQL PWSAFE3 OPTIONS_DEFAULT= BLOWFISH DES IDEA MYSQL PWSAFE3 -MYSQL_RUN_DEPENDS= p5-DBD-mysql>0:databases/p5-DBD-mysql \ +MYSQL_RUN_DEPENDS= ${DBD_MYSQL} \ p5-DBI>0:databases/p5-DBI +MYSQL_USES= mysql PWSAFE3_DESC= Password Safe v3 backend PWSAFE3_RUN_DEPENDS= p5-Crypt-PWSafe3>0:security/p5-Crypt-PWSafe3 diff --git a/devel/bugzilla44/Makefile b/devel/bugzilla44/Makefile index 0e88f2107a7d..0b0db38d0440 100644 --- a/devel/bugzilla44/Makefile +++ b/devel/bugzilla44/Makefile @@ -1,6 +1,6 @@ PORTNAME= bugzilla PORTVERSION= 4.4.13 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= MOZILLA/webtools MOZILLA/webtools/archived @@ -47,7 +47,7 @@ EMPTY_DIRS_LIST=data graphs contrib lib t xt MODPERL_USES= apache:run MYSQL_USES= mysql -MYSQL_RUN_DEPENDS= p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql +MYSQL_RUN_DEPENDS= ${DBD_MYSQL} PGSQL_USES= pgsql PGSQL_RUN_DEPENDS= p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg SQLITE_USES= sqlite diff --git a/devel/bugzilla50/Makefile b/devel/bugzilla50/Makefile index d7886fd857b1..2e1b884f0eea 100644 --- a/devel/bugzilla50/Makefile +++ b/devel/bugzilla50/Makefile @@ -1,6 +1,6 @@ PORTNAME= bugzilla PORTVERSION= 5.0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= MOZILLA/webtools MOZILLA/webtools/archived @@ -48,7 +48,7 @@ EMPTY_DIRS_LIST=data graphs contrib lib t xt MODPERL_USES= apache:run MYSQL_USES= mysql -MYSQL_RUN_DEPENDS= p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql +MYSQL_RUN_DEPENDS= ${DBD_MYSQL} PGSQL_USES= pgsql:11+ PGSQL_RUN_DEPENDS= p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg SQLITE_USES= sqlite diff --git a/mail/assp/Makefile b/mail/assp/Makefile index 115ed0933457..39dde5a3e4f4 100644 --- a/mail/assp/Makefile +++ b/mail/assp/Makefile @@ -1,6 +1,6 @@ PORTNAME= assp PORTVERSION= 1.9.9.14158 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://www.ringofsaturn.com/distfiles/ @@ -96,7 +96,8 @@ RUN_DEPENDS+= p5-Net-DNS>=0.68:dns/p5-Net-DNS .if ${PORT_OPTIONS:MMYSQL} RUN_DEPENDS+= p5-Tie-DBI>=1.05:databases/p5-Tie-DBI -RUN_DEPENDS+= p5-DBD-mysql>=0:databases/p5-DBD-mysql +RUN_DEPENDS+= ${DBD_MYSQL} +USES+= mysql .endif .if ${PORT_OPTIONS:MMATCHRE} diff --git a/mail/exilog/Makefile b/mail/exilog/Makefile index 2cdba1a826db..a6866f4d680e 100644 --- a/mail/exilog/Makefile +++ b/mail/exilog/Makefile @@ -1,6 +1,6 @@ PORTNAME= exilog PORTVERSION= 0.5 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= mail MASTER_SITES= http://duncanthrax.net/exilog/ @@ -30,7 +30,7 @@ OPTIONS_DEFAULT= AGENT DOCS MYSQL OPTIONS_SUB= YES AGENT_DESC= Include exilog agent -MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql +MYSQL_RUN_DEPENDS= ${DBD_MYSQL} MYSQL_USES= mysql PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg diff --git a/mail/opendmarc/Makefile b/mail/opendmarc/Makefile index 114c2b74a2fe..e7636444a181 100644 --- a/mail/opendmarc/Makefile +++ b/mail/opendmarc/Makefile @@ -1,6 +1,6 @@ PORTNAME= opendmarc PORTVERSION= 1.4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail security MASTER_SITES= GH @@ -13,10 +13,10 @@ LICENSE_COMB= multi RUN_DEPENDS= p5-Switch>=0:lang/p5-Switch \ p5-DBI>=0:databases/p5-DBI \ - p5-DBD-mysql>=0:databases/p5-DBD-mysql \ + ${DBD_MYSQL} \ p5-HTTP-Message>=0:www/p5-HTTP-Message -USES= cpe libtool perl5 shebangfix autoreconf +USES= cpe libtool mysql perl5 shebangfix autoreconf LICENSE_FILE_SENDMAIL= ${WRKSRC}/LICENSE.Sendmail LICENSE_GROUPS_SENDMAIL= FSF OSI LICENSE_NAME_SENDMAIL= Sendmail Open Source License diff --git a/mail/policyd2/Makefile b/mail/policyd2/Makefile index c31d36e2aa39..f4147f5a9083 100644 --- a/mail/policyd2/Makefile +++ b/mail/policyd2/Makefile @@ -1,6 +1,6 @@ PORTNAME= policyd2 PORTVERSION= 2.0.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= https://download.policyd.org/v${PORTVERSION}/ DISTNAME= cluebringer-v${PORTVERSION} @@ -39,7 +39,8 @@ PGSQL_DESC= Add a dependency on DBD::Pg SQLITE_DESC= Add a dependency on DBD:SQLite WEBUI_DESC= Add a dependency on the corresponding PHP pdo driver -MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql +MYSQL_RUN_DEPENDS= ${DBD_MYSQL} +MYSQL_USES= mysql PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg SQLITE_RUN_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite diff --git a/mail/ratelimit-policyd/Makefile b/mail/ratelimit-policyd/Makefile index dfd58c973b4e..7e5efab5217d 100644 --- a/mail/ratelimit-policyd/Makefile +++ b/mail/ratelimit-policyd/Makefile @@ -1,5 +1,6 @@ PORTNAME= ratelimit-policyd PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= mail MAINTAINER= 000.fbsd@quip.cz @@ -8,13 +9,13 @@ WWW= https://github.com/MirLach/ratelimit-policyd LICENSE= NONE -USES+= perl5 shebangfix +USES+= mysql perl5 shebangfix USE_GITHUB= yes GH_ACCOUNT= MirLach #GH_TAGNAME= 65154a2 -RUN_DEPENDS+= p5-DBD-mysql>=0:databases/p5-DBD-mysql +RUN_DEPENDS+= ${DBD_MYSQL} SHEBANG_FILES= ratelimit-policyd.pl diff --git a/mail/spamassassin-devel/Makefile b/mail/spamassassin-devel/Makefile index ce9e36451e06..b144aa58ff2d 100644 --- a/mail/spamassassin-devel/Makefile +++ b/mail/spamassassin-devel/Makefile @@ -123,7 +123,8 @@ DMARC_RUN_DEPENDS= p5-Mail-DMARC>=0:mail/p5-Mail-DMARC \ p5-URI>=0:net/p5-URI GNUPG_RUN_DEPENDS= gnupg1>=1.4.7:security/gnupg1 GNUPG2_RUN_DEPENDS= gpg2:security/gnupg -MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql +MYSQL_RUN_DEPENDS= ${DBD_MYSQL} +MYSQL_USES= mysql PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg PYZOR_RUN_DEPENDS= pyzor:mail/pyzor RAZOR_RUN_DEPENDS= razor-agents>=2.84:mail/razor-agents \ diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 06993c0e624f..63058355b9a2 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,5 +1,6 @@ PORTNAME= spamassassin PORTVERSION= 4.0.1 +PORTREVISION= 1 CATEGORIES?= mail perl5 MASTER_SITES= https://archive.apache.org/dist/${PORTNAME}/source/ CPAN/Mail DISTNAME= Mail-SpamAssassin-${PORTVERSION} @@ -119,7 +120,8 @@ DMARC_RUN_DEPENDS= p5-Mail-DMARC>=0:mail/p5-Mail-DMARC \ p5-URI>=0:net/p5-URI GNUPG_RUN_DEPENDS= gnupg1>=1.4.7:security/gnupg1 GNUPG2_RUN_DEPENDS= gpg2:security/gnupg -MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql +MYSQL_RUN_DEPENDS= ${DBD_MYSQL} +MYSQL_USES= mysql PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg PYZOR_RUN_DEPENDS= pyzor:mail/pyzor RAZOR_RUN_DEPENDS= razor-agents>=2.84:mail/razor-agents \ diff --git a/mail/sqlgrey/Makefile b/mail/sqlgrey/Makefile index 0e08bd7d3f9c..29dd55de1b02 100644 --- a/mail/sqlgrey/Makefile +++ b/mail/sqlgrey/Makefile @@ -1,6 +1,6 @@ PORTNAME= sqlgrey PORTVERSION= 1.8.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-1.8%20%28stable%29 @@ -38,7 +38,8 @@ OPTIONS_DEFAULT=PGSQL STATS_DESC= Depend on Date::Calc for logstats.pl script PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg -MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql +MYSQL_RUN_DEPENDS= ${DBD_MYSQL} +MYSQL_USES= mysql SQLITE_RUN_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite STATS_RUN_DEPENDS= p5-Date-Calc>=0:devel/p5-Date-Calc diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile index 55719a5614a3..02f2c7ff9196 100644 --- a/mail/sympa/Makefile +++ b/mail/sympa/Makefile @@ -1,6 +1,6 @@ PORTNAME= sympa DISTVERSION= 6.2.72 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MAINTAINER= dgeo@centrale-med.fr @@ -110,9 +110,10 @@ APACHE_RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:www/mod_fastcgi APACHE_USES= apache:run FASTCGI_RUN_DEPENDS= p5-CGI-Fast>=1.08:www/p5-CGI-Fast \ p5-FCGI>=0.67:www/p5-FCGI -MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql +MYSQL_RUN_DEPENDS= ${DBD_MYSQL} MYSQL_SUB_LIST= REQ_MYSQL=mysql MYSQL_SUB_LIST_OFF= REQ_MYSQL="" +MYSQL_USES= mysql PGSQL_RUN_DEPENDS= p5-DBD-Pg>=2.00:databases/p5-DBD-Pg PGSQL_SUB_LIST= REQ_PGSQL=postgresql PGSQL_SUB_LIST_OFF= REQ_PGSQL="" diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile index 5733489accc8..8af625e9eaeb 100644 --- a/multimedia/mythtv/Makefile +++ b/multimedia/mythtv/Makefile @@ -1,6 +1,7 @@ PORTNAME= mythtv DISTVERSIONPREFIX= v DISTVERSION= 34.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia @@ -110,7 +111,7 @@ BINDINGS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=0:databases/py-mysql ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR} \ p5-DBI>=0:databases/p5-DBI \ - p5-DBD-mysql>0:databases/p5-DBD-mysql \ + ${DBD_MYSQL} \ p5-Net-UPnP>=0:multimedia/p5-Net-UPnP \ p5-IO-Socket-INET6>=2.51:net/p5-IO-Socket-INET6 \ p5-XML-Simple>=0:textproc/p5-XML-Simple \ @@ -123,7 +124,7 @@ BINDINGS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.2.2:databases/py-mys ${PYTHON_PKGNAMEPREFIX}requests-cache>0:www/py-requests-cache@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}simplejson>=3:devel/py-simplejson@${PY_FLAVOR} \ p5-DBI>=0:databases/p5-DBI \ - p5-DBD-mysql>0:databases/p5-DBD-mysql \ + ${DBD_MYSQL} \ p5-Net-UPnP>=0:multimedia/p5-Net-UPnP \ p5-IO-Socket-INET6>=2.51:net/p5-IO-Socket-INET6 \ p5-XML-Simple>=0:textproc/p5-XML-Simple \ @@ -131,6 +132,7 @@ BINDINGS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.2.2:databases/py-mys p5-LWP-UserAgent-Determined>=0:www/p5-LWP-UserAgent-Determined BINDINGS_CONFIGURE_ON= --python="${PYTHON_CMD}" --with-bindings=perl,python BINDINGS_CONFIGURE_OFF= --without-bindings=perl,python +BINDINGS_USES= mysql HDHOMERUN_DESC= Native support for HDHomeRun network tuners HDHOMERUN_LIB_DEPENDS= libhdhomerun.so:multimedia/libhdhomerun diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile index 28e74abdf046..69a34e271d9a 100644 --- a/multimedia/zoneminder/Makefile +++ b/multimedia/zoneminder/Makefile @@ -1,6 +1,6 @@ PORTNAME= zoneminder DISTVERSION= 1.36.33 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MAINTAINER= bsd@abinet.ru @@ -10,7 +10,7 @@ WWW= https://www.zoneminder.com/ LICENSE= GPLv2 ZM_DEPENDS= p5-DBI>=0:databases/p5-DBI \ - p5-DBD-mysql>=0:databases/p5-DBD-mysql \ + ${DBD_MYSQL} \ p5-Date-Manip>=0:devel/p5-Date-Manip \ p5-Test-LWP-UserAgent>=0:www/p5-Test-LWP-UserAgent \ p5-Sys-Mmap>=0:devel/p5-Sys-Mmap \ diff --git a/net-mgmt/check_mysql_health/Makefile b/net-mgmt/check_mysql_health/Makefile index 07c912678ae1..6cbb22ccdcb3 100644 --- a/net-mgmt/check_mysql_health/Makefile +++ b/net-mgmt/check_mysql_health/Makefile @@ -1,6 +1,6 @@ PORTNAME= check_mysql_health DISTVERSION= 3.0.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= https://labs.consol.de/assets/downloads/nagios/ @@ -11,9 +11,9 @@ WWW= https://labs.consol.de/de/nagios/check_mysql_health/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql +RUN_DEPENDS= ${DBD_MYSQL} -USES= autoreconf perl5 gmake +USES= autoreconf mysql perl5 gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-statefiles-dir=${NAGIOSDIR} \ diff --git a/net-mgmt/mysql-snmp/Makefile b/net-mgmt/mysql-snmp/Makefile index e0d8c51969c9..c97b32321e58 100644 --- a/net-mgmt/mysql-snmp/Makefile +++ b/net-mgmt/mysql-snmp/Makefile @@ -2,7 +2,7 @@ PORTNAME= mysql-snmp DISTVERSIONPREFIX= v DISTVERSION= 1.2-17 DISTVERSIONSUFFIX= -g1d0b409 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt perl5 MAINTAINER= 0mp@FreeBSD.org @@ -13,13 +13,13 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= net-snmp>=0:net-mgmt/net-snmp \ - p5-DBD-mysql>=0:databases/p5-DBD-mysql \ + ${DBD_MYSQL} \ p5-DBI>=0:databases/p5-DBI \ p5-Math-BigInt-GMP>=0:math/p5-Math-BigInt-GMP \ p5-Net-SNMP>=5.4.3:net-mgmt/p5-Net-SNMP \ p5-Unix-Syslog>=0:sysutils/p5-Unix-Syslog -USES= perl5 shebangfix +USES= mysql perl5 shebangfix USE_GITHUB= yes GH_ACCOUNT= masterzen USE_PERL5= run test diff --git a/net-mgmt/nagios-check_mysql_slave/Makefile b/net-mgmt/nagios-check_mysql_slave/Makefile index d0103111d32e..74f559c7ee3c 100644 --- a/net-mgmt/nagios-check_mysql_slave/Makefile +++ b/net-mgmt/nagios-check_mysql_slave/Makefile @@ -1,6 +1,6 @@ PORTNAME= check_mysql_slave PORTVERSION= 0.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= http://buhacoff.net/2009/products/check_mysql_slave/archive/ \ ZI @@ -14,13 +14,13 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= p5-DBI>=1.60.7:databases/p5-DBI \ - p5-DBD-mysql>0:databases/p5-DBD-mysql + ${DBD_MYSQL} PORTSCOUT= ignore:1 NO_BUILD= yes NO_ARCH= yes -USES= perl5 shebangfix +USES= mysql perl5 shebangfix SHEBANG_FILES= check_mysql_slave check_mysql_slave_epn USE_PERL5= run DOC_FILES= check_mysql_slave.html check_mysql_slave.pod diff --git a/net-mgmt/netdot/Makefile b/net-mgmt/netdot/Makefile index e3bdac514e39..78e2f68ea0e2 100644 --- a/net-mgmt/netdot/Makefile +++ b/net-mgmt/netdot/Makefile @@ -1,7 +1,7 @@ PORTNAME= netdot PORTVERSION= 1.0.7 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt MAINTAINER= nick@foobar.org @@ -16,7 +16,7 @@ RUN_DEPENDS= p5-libapreq2>=0:www/p5-libapreq2 \ p5-Apache-AuthCookie>=0:www/p5-Apache-AuthCookie \ p5-Apache2-SiteControl>=1.0:www/p5-Apache2-SiteControl \ p5-URI>=0:net/p5-URI \ - p5-DBD-mysql>=0:databases/p5-DBD-mysql \ + ${DBD_MYSQL} \ p5-SQL-Translator>=0.07:databases/p5-SQL-Translator \ p5-Class-DBI>=3.0.17:databases/p5-Class-DBI \ p5-Class-DBI-AbstractSearch>=0:databases/p5-Class-DBI-AbstractSearch \ diff --git a/net-mgmt/ocsinventory-server/Makefile b/net-mgmt/ocsinventory-server/Makefile index 6023742136ad..3a119c78caac 100644 --- a/net-mgmt/ocsinventory-server/Makefile +++ b/net-mgmt/ocsinventory-server/Makefile @@ -1,5 +1,6 @@ PORTNAME= ocsinventory-server PORTVERSION= 2.12.1 +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= dgeo@centrale-med.fr @@ -11,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= p5-XML-Simple>=2.12:textproc/p5-XML-Simple \ p5-DBI>=1.40:databases/p5-DBI \ - p5-DBD-mysql>=2.9004:databases/p5-DBD-mysql \ + ${DBD_MYSQL} \ p5-Apache-DBI>=0.93:www/p5-Apache-DBI \ p5-Net-IP>=1.21:net-mgmt/p5-Net-IP \ p5-SOAP-Lite>=0.66:net/p5-SOAP-Lite \ diff --git a/net-mgmt/pandorafms_server/Makefile b/net-mgmt/pandorafms_server/Makefile index 64bbd745a1e8..3fe6264ca00c 100644 --- a/net-mgmt/pandorafms_server/Makefile +++ b/net-mgmt/pandorafms_server/Makefile @@ -1,5 +1,5 @@ PORTNAME= pandora_server -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MAINTAINER= koichiro@rworks.jp @@ -20,7 +20,7 @@ PANDORA_DEPS= p5-DBI>=0:databases/p5-DBI \ p5-JSON>=0:converters/p5-JSON BUILD_DEPENDS= ${PANDORA_DEPS} RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \ - p5-DBD-mysql>=4:databases/p5-DBD-mysql \ + ${DBD_MYSQL} \ wmic:net-mgmt/wmi-client \ nmap:security/nmap \ p5-Encode-Locale>=0:converters/p5-Encode-Locale \ @@ -34,7 +34,7 @@ XPROBE_DESC= Install xprobe PGSQL_DESC= Use PostgreSQL backend (experimental) EXTRAS_DESC= Extra dependencies for util scripts -USES= perl5 shebangfix +USES= mysql perl5 shebangfix SHEBANG_FILES= FreeBSD/pandora_server \ bin/pandora_server \ util/integrity_check \ diff --git a/net-mgmt/rackmonkey/Makefile b/net-mgmt/rackmonkey/Makefile index d9147cf8982f..3394822c3861 100644 --- a/net-mgmt/rackmonkey/Makefile +++ b/net-mgmt/rackmonkey/Makefile @@ -1,7 +1,7 @@ PORTNAME= rackmonkey PORTVERSION= 1.2.5 DISTVERSIONSUFFIX= -1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt www MASTER_SITES= SF \ ftp://ftp.secure-computing.net/pub/FreeBSD/ports/${PORTNAME}/ \ @@ -39,7 +39,7 @@ RUN_DEPENDS+= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite .endif .if ${PORT_OPTIONS:MMYSQL} USES+= mysql -RUN_DEPENDS+= p5-DBD-mysql>=0:databases/p5-DBD-mysql +RUN_DEPENDS+= ${DBD_MYSQL} .endif .if ${PORT_OPTIONS:MPGSQL} USES+= pgsql diff --git a/net/p5-Net-Google-SafeBrowsing2/Makefile b/net/p5-Net-Google-SafeBrowsing2/Makefile index 726bcc27ca06..b53138988ef3 100644 --- a/net/p5-Net-Google-SafeBrowsing2/Makefile +++ b/net/p5-Net-Google-SafeBrowsing2/Makefile @@ -1,6 +1,6 @@ PORTNAME= Net-Google-SafeBrowsing2 PORTVERSION= 1.09 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -31,8 +31,9 @@ NO_ARCH= yes USES= perl5 USE_PERL5= configure -MYSQL_BUILD_DEPENDS= p5-DBD-mysql>=4:databases/p5-DBD-mysql -MYSQL_RUN_DEPENDS= p5-DBD-mysql>=4:databases/p5-DBD-mysql +MYSQL_BUILD_DEPENDS= ${DBD_MYSQL} +MYSQL_RUN_DEPENDS= ${DBD_MYSQL} +MYSQL_USES= mysql POSTGRES_BUILD_DEPENDS= p5-DBD-Pg>=2:databases/p5-DBD-Pg POSTGRES_RUN_DEPENDS= p5-DBD-Pg>=2:databases/p5-DBD-Pg SQLITE_BUILD_DEPENDS= p5-DBD-SQLite>=1:databases/p5-DBD-SQLite diff --git a/net/prosearch/Makefile b/net/prosearch/Makefile index 6b2f3d2f2661..7cacbf95b109 100644 --- a/net/prosearch/Makefile +++ b/net/prosearch/Makefile @@ -1,6 +1,6 @@ PORTNAME= prosearch PORTVERSION= 0.19.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= net www MASTER_SITES= http://pro.setun.net/search/download/ SF/pro-search/pro-search/${PORTVERSION} @@ -80,7 +80,7 @@ p5-FCGI>=0:www/p5-FCGI .if ${PORT_OPTIONS:MMYSQL} USES+= mysql RUN_DEPENDS+=\ -p5-DBD-mysql>=0:databases/p5-DBD-mysql +${DBD_MYSQL} .endif .if ${PORT_OPTIONS:MDB} && ${PORT_OPTIONS:MMYSQL} diff --git a/net/pwhois/Makefile b/net/pwhois/Makefile index ea84ca8eec80..7484b2c25e3c 100644 --- a/net/pwhois/Makefile +++ b/net/pwhois/Makefile @@ -1,5 +1,6 @@ PORTNAME= pwhois PORTVERSION= 2.2.1.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://pwhois.org/get/ \ ZI @@ -15,7 +16,7 @@ RUN_DEPENDS= p5-DBI>0:databases/p5-DBI \ p5-Net-Telnet>0:net/p5-Net-Telnet \ p5-Net-CIDR>0:net-mgmt/p5-Net-CIDR \ p5-RPSL-Parser>0:devel/p5-RPSL-Parser \ - p5-DBD-mysql>=0:databases/p5-DBD-mysql + ${DBD_MYSQL} FETCH_ARGS= -p diff --git a/net/radiator/Makefile b/net/radiator/Makefile index 50363e2ee206..c73d5cbb2b19 100644 --- a/net/radiator/Makefile +++ b/net/radiator/Makefile @@ -1,5 +1,6 @@ PORTNAME= Radiator PORTVERSION= 4.24 +PORTREVISION= 1 CATEGORIES= net DISTNAME= ${PORTNAME}-${PORTVERSION}-1 MASTER_SITES= # fetch manually @@ -18,6 +19,7 @@ LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell OPTIONS_DEFINE= MYSQL MYSQL_DESC= MySQL support +MYSQL_USES= mysql USES= perl5 tar:tgz USE_PERL5= configure @@ -36,7 +38,7 @@ IGNORE= will not be automatically fetched due to licensing\ .endif .if ${PORT_OPTIONS:MMYSQL} -RUN_DEPENDS+= p5-DBD-mysql>=0:databases/p5-DBD-mysql +RUN_DEPENDS+= ${DBD_MYSQL} .endif pre-configure: diff --git a/net/rtg/Makefile b/net/rtg/Makefile index 65a052321f9d..897dbd8217ba 100644 --- a/net/rtg/Makefile +++ b/net/rtg/Makefile @@ -1,6 +1,6 @@ PORTNAME= rtg PORTVERSION= 0.7.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= ftp://ftpmirror.uk/freebsd-ports/rtg/ @@ -13,7 +13,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp \ libgd.so:graphics/gd RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI \ - p5-DBD-mysql>=0:databases/p5-DBD-mysql + ${DBD_MYSQL} USES= mysql:client perl5 shebangfix ssl USE_RC_SUBR= rtgpoll diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index d7885de9b9bb..370705793f7b 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,6 +1,6 @@ PORTNAME= amavisd-new DISTVERSION= 2.12.3 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= security @@ -112,7 +112,8 @@ RUN_DEPENDS+= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite .endif .if ${PORT_OPTIONS:MMYSQL} -RUN_DEPENDS+= p5-DBD-mysql>=0:databases/p5-DBD-mysql +RUN_DEPENDS+= ${DBD_MYSQL} +USES+= mysql .endif .if ${PORT_OPTIONS:MPGSQL} diff --git a/security/maia/Makefile b/security/maia/Makefile index 30237f78c2e0..b221c8c0bcf7 100644 --- a/security/maia/Makefile +++ b/security/maia/Makefile @@ -1,6 +1,6 @@ PORTNAME= maia DISTVERSION= 1.0.4 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= security MAINTAINER= ek@purplehat.org @@ -133,12 +133,12 @@ PLIST_SUB+= WEBHOST="@comment " .if ${PORT_OPTIONS:MMYSQL} && ${PORT_OPTIONS:MLOCAL} USES+= mysql:server,client -RUN_DEPENDS+= p5-DBD-mysql>=0:databases/p5-DBD-mysql +RUN_DEPENDS+= ${DBD_MYSQL} .endif .if ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MLOCAL} USES+= mysql:client -RUN_DEPENDS+= p5-DBD-mysql>=0:databases/p5-DBD-mysql +RUN_DEPENDS+= ${DBD_MYSQL} .endif .if ${PORT_OPTIONS:MMYSQL} && ${PORT_OPTIONS:MWEBHOST} diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile index 3bdd1c3aa161..546e4a8e7c49 100644 --- a/security/p5-openxpki/Makefile +++ b/security/p5-openxpki/Makefile @@ -1,6 +1,7 @@ PORTNAME= openxpki DISTVERSIONPREFIX= v DISTVERSION= 3.24.2 +PORTREVSION= 1 CATEGORIES= security perl5 PKGNAMEPREFIX= p5- diff --git a/security/p5-openxpki/files/pkg-message.in b/security/p5-openxpki/files/pkg-message.in index 5fb3c1370b08..b711dab6beb9 100644 --- a/security/p5-openxpki/files/pkg-message.in +++ b/security/p5-openxpki/files/pkg-message.in @@ -14,7 +14,7 @@ - Install e.g. databases/mariadb106-server - Add value mysql to file /etc/make.conf like this: DEFAULT_VERSIONS+= mysql=10.6m - - cd /usr/ports/databases/p5-DBD-mysql && make reinstall + - cd /usr/ports/databases/p5-DBD-mysql4 && make reinstall Note that installing of databases/p5-DBD-MariaDB here may hinder operation of your OpeXPKI setup. - Install your favorite web server. diff --git a/sysutils/p5-MogileFS-Server/Makefile b/sysutils/p5-MogileFS-Server/Makefile index 9b19982efe6b..1fe926b32005 100644 --- a/sysutils/p5-MogileFS-Server/Makefile +++ b/sysutils/p5-MogileFS-Server/Makefile @@ -1,5 +1,6 @@ PORTNAME= MogileFS-Server PORTVERSION= 2.73 +PORTREVISION= 1 CATEGORIES= sysutils perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:DORMANDO @@ -12,7 +13,7 @@ WWW= https://metacpan.org/release/MogileFS-Server BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Danga-Socket>=1.56:devel/p5-Danga-Socket \ p5-DBD-SQLite>=1.13:databases/p5-DBD-SQLite \ - p5-DBD-mysql>=0:databases/p5-DBD-mysql \ + ${DBD_MYSQL} \ p5-DBI>=0:databases/p5-DBI \ p5-IO-AIO>=0:devel/p5-IO-AIO \ p5-MogileFS-Client>=0:sysutils/p5-MogileFS-Client \ @@ -21,7 +22,7 @@ RUN_DEPENDS= p5-Danga-Socket>=1.56:devel/p5-Danga-Socket \ p5-Sys-Syscall>=0.22:devel/p5-Sys-Syscall NO_ARCH= yes -USES= perl5 +USES= mysql perl5 USE_PERL5= configure REINPLACE_ARGS= -i '' USE_RC_SUBR= mogilefsd mogstored diff --git a/sysutils/watchmen/Makefile b/sysutils/watchmen/Makefile index 80f56d385b4b..4d1f0162fa61 100644 --- a/sysutils/watchmen/Makefile +++ b/sysutils/watchmen/Makefile @@ -1,5 +1,6 @@ PORTNAME= watchmen PORTVERSION= 0.09 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= proler@gmail.com @@ -28,10 +29,12 @@ MYSQL_DESC= Enable test mysql queries PGSQL_DESC= Enable test postgresql queries EMAIL_DESC= Report problems by email -MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql +MYSQL_RUN_DEPENDS= ${DBD_MYSQL} PGSQL_RUN_DEPENDS= p5-DBD-Pg>=2.19.2:databases/p5-DBD-Pg EMAIL_RUN_DEPENDS= p5-MIME-Lite>=0:mail/p5-MIME-Lite +MYSQL_USES= mysql + post-install: ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.dist ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample diff --git a/textproc/p5-Hailo/Makefile b/textproc/p5-Hailo/Makefile index 59371de09bbe..ebb8f8643dbb 100644 --- a/textproc/p5-Hailo/Makefile +++ b/textproc/p5-Hailo/Makefile @@ -1,5 +1,6 @@ PORTNAME= Hailo PORTVERSION= 0.75 +PORTREVISION= 1 CATEGORIES= textproc perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:AVAR @@ -51,6 +52,7 @@ OPTIONS_DEFAULT=SQLITE SQLITE_RUN_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg -MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql +MYSQL_RUN_DEPENDS= ${DBD_MYSQL} +MYSQL_USES= mysql .include <bsd.port.mk> diff --git a/www/interchange/Makefile b/www/interchange/Makefile index a24b5991b1de..e72cb3f604c5 100644 --- a/www/interchange/Makefile +++ b/www/interchange/Makefile @@ -1,5 +1,6 @@ PORTNAME= interchange PORTVERSION= 5.6.3 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= http://ftp.icdevgroup.org/interchange/5.6/tar/ @@ -32,7 +33,8 @@ CONFLICTS_INSTALL= isc-cron mcron # bin/crontab OPTIONS_DEFINE= MYSQL PGSQL OPTIONS_DEFAULT= MYSQL -MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql +MYSQL_RUN_DEPENDS= ${DBD_MYSQL} +MYSQL_USES= mysql PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg GROUPS= interch diff --git a/www/ljdeps/Makefile b/www/ljdeps/Makefile index b5919fafb18e..ac22de8c6b32 100644 --- a/www/ljdeps/Makefile +++ b/www/ljdeps/Makefile @@ -1,6 +1,6 @@ PORTNAME= ljdeps PORTVERSION= 1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www perl5 MAINTAINER= ports@FreeBSD.org @@ -20,11 +20,11 @@ RUN_DEPENDS= p5-Net-Telnet>=0:net/p5-Net-Telnet \ p5-GD-Graph>=0:graphics/p5-GD-Graph \ p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil \ p5-Data-ShowTable>=0:devel/p5-Data-ShowTable \ - p5-DBD-mysql>=0:databases/p5-DBD-mysql \ + ${DBD_MYSQL} \ p5-Proc-ProcessTable>=0:devel/p5-Proc-ProcessTable \ p5-SOAP-Lite>=0:net/p5-SOAP-Lite \ p5-Unicode-MapUTF8>=0:converters/p5-Unicode-MapUTF8 -USES= metaport perl5 +USES= metaport mysql perl5 .include <bsd.port.mk> diff --git a/www/otrs/Makefile b/www/otrs/Makefile index 6f317aeb4cf2..9cfb4864362a 100644 --- a/www/otrs/Makefile +++ b/www/otrs/Makefile @@ -1,7 +1,7 @@ PORTNAME= otrs DISTVERSIONPREFIX= rel- DISTVERSION= 6_0_29 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MAINTAINER= m.tsatsenko@gmail.com @@ -101,7 +101,8 @@ PLIST_SUB= VER_CKEDITOR="4.7.0" OTRS_USER=${USERS} WWWOWN=${WWWOWN} PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg PGSQL_USES= pgsql -MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql +MYSQL_RUN_DEPENDS= ${DBD_MYSQL} +MYSQL_USES= mysql SSL_RUN_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay diff --git a/www/rt44/Makefile b/www/rt44/Makefile index 61729b727223..ec221fd93008 100644 --- a/www/rt44/Makefile +++ b/www/rt44/Makefile @@ -1,5 +1,6 @@ PORTNAME= rt DISTVERSION= 4.4.7 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://download.bestpractical.com/pub/rt/release/ PKGNAMESUFFIX= 44 @@ -80,6 +81,7 @@ SPAWN_FCGI_RUN_DEPENDS= ${LOCALBASE}/bin/spawn-fcgi:www/spawn-fcgi \ ${FASTCGI_DEPS} MYSQL_RUN_DEPENDS= ${MYSQL_DEPS} +MYSQL_USES= mysql MYSQL_VARS= DB_TYPE=mysql DB_DBA_USER=root PGSQL_RUN_DEPENDS= ${PGSQL_DEPS} diff --git a/www/rt44/Makefile.cpan b/www/rt44/Makefile.cpan index 2d810c46833e..9efd275aacd8 100644 --- a/www/rt44/Makefile.cpan +++ b/www/rt44/Makefile.cpan @@ -244,7 +244,7 @@ MODPERL2_DEPS= p5-libapreq2>0:www/p5-libapreq2 \ ### --- MYSQL --- ### DBD::mysql 2.1018 -MYSQL_DEPS= p5-DBD-mysql>=2.1018:databases/p5-DBD-mysql +MYSQL_DEPS= ${DBD_MYSQL} ### --- PGSQL --- ### DBD::Pg 3.3.1 diff --git a/www/rt50/Makefile b/www/rt50/Makefile index f9744f86b531..1652e8507ae4 100644 --- a/www/rt50/Makefile +++ b/www/rt50/Makefile @@ -1,5 +1,6 @@ PORTNAME= rt DISTVERSION= 5.0.5 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://download.bestpractical.com/pub/rt/release/ PKGNAMESUFFIX= 50 @@ -84,6 +85,7 @@ SPAWN_FCGI_RUN_DEPENDS= ${LOCALBASE}/bin/spawn-fcgi:www/spawn-fcgi \ ${FASTCGI_DEPS} MYSQL_RUN_DEPENDS= ${MYSQL_DEPS} +MYSQL_USES= mysql MYSQL_VARS= DB_TYPE=mysql DB_DBA_USER=root PGSQL_RUN_DEPENDS= ${PGSQL_DEPS} diff --git a/www/rt50/Makefile.cpan b/www/rt50/Makefile.cpan index 74a087466bb9..91f775c6f7b4 100644 --- a/www/rt50/Makefile.cpan +++ b/www/rt50/Makefile.cpan @@ -280,7 +280,7 @@ MODPERL2_DEPS= p5-libapreq2>0:www/p5-libapreq2 \ ### --- MYSQL --- ### DBD::mysql 2.1018 -MYSQL_DEPS= p5-DBD-mysql>=2.1018:databases/p5-DBD-mysql +MYSQL_DEPS= ${DBD_MYSQL} ### --- PGSQL --- ### DBD::Pg 1.43 diff --git a/www/squid/Makefile b/www/squid/Makefile index 1075ddc89314..fa060c398b4c 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,5 +1,6 @@ PORTNAME= squid DISTVERSION= 6.8 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www2.pl.squid-cache.org/Versions/v6/ \ http://www1.il.squid-cache.org/Versions/v6/ \ diff --git a/www/squid/files/pkg-message.in b/www/squid/files/pkg-message.in index 4b78eb8e599d..2d7f114cdf51 100644 --- a/www/squid/files/pkg-message.in +++ b/www/squid/files/pkg-message.in @@ -33,7 +33,8 @@ o If AUTH_SQL option is set, please, don't forget to install one of following perl modules depending on database you like: - databases/p5-DBD-mysql + databases/p5-DBD-mysql (MySQL) + databases/p5-DBD-mysql4 (MariaDB) databases/p5-DBD-Pg databases/p5-DBD-SQLite |