Merge branch 'joyent/feature/pbulkmulti/trunk' into joyent/release/trunk

TritonDataCenter · Aug 4, 2022 · 1054d25 · 1054d25
2 parents 68a3388 + cb84bc1
commit 1054d25
Show file tree

Hide file tree

Showing 45 changed files with 93 additions and 51 deletions.
diff --git a/databases/innotop/Makefile b/databases/innotop/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2
 
 DEPENDS+= p5-Term-ReadKey>=2.10:../../devel/p5-Term-ReadKey
 DEPENDS+= p5-DBI>=1.13:../../databases/p5-DBI
-DEPENDS+= p5-DBD-mysql>=1.0:../../databases/p5-DBD-mysql
+DEPENDS+= p5-DBD-{mariadb,mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql
 
 PERL5_PACKLIST= auto/innotop/.packlist
 REPLACE_PERL= innotop

diff --git a/databases/myodbc/Makefile b/databases/myodbc/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.45 2021/06/23 20:33:08 nia Exp $
 
 DISTNAME= mysql-connector-odbc-5.3.14-src
-PKGNAME= ${DISTNAME:S/mysql-connector-odbc/myodbc/:S/-src$//}
+PKGNAME= ${DISTNAME:S/mysql-connector-odbc/${MYSQL_PKG_PREFIX}-odbc/:S/-src$//}
 PKGREVISION= 1
 CATEGORIES= databases
 MASTER_SITES= ${MASTER_SITE_MYSQL:=Connector-ODBC/5.3/}
@@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v2
 USE_CMAKE= yes
 CMAKE_ARGS= -Wno-dev
 #CMAKE_ARGS+= -DMYSQL_DIR=${BUILDLINK_PREFIX.mysql-client}
-CMAKE_ARGS+= -DMYSQL_INCLUDE_DIR=${BUILDLINK_PREFIX.mysql-client}/include/mysql
+CMAKE_ARGS+= -DMYSQL_INCLUDE_DIR=${BUILDLINK_PREFIX.mysql-client}/${BUILDLINK_INCDIRS.mysql-client}
 USE_LANGUAGES= c c++
 
 INSTALLATION_DIRS= share/doc/mysql-connector-odbc

diff --git a/databases/mytop/Makefile b/databases/mytop/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2
 DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI
 #DEPENDS+= p5-Term-ANSIColor-[0-9]*:../../devel/p5-Term-ANSIColor
 DEPENDS+= p5-Term-ReadKey-[0-9]*:../../devel/p5-Term-ReadKey
-DEPENDS+= p5-DBD-mysql-[0-9]*:../../databases/p5-DBD-mysql
+DEPENDS+= p5-DBD-{mariadb,mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql
 
 PERL5_PACKLIST= auto/mytop/.packlist
 REPLACE_PERL= mytop

diff --git a/databases/p5-App-Sqitch/options.mk b/databases/p5-App-Sqitch/options.mk
@@ -7,7 +7,7 @@ PKG_SUPPORTED_OPTIONS+= mysql odbc oracle pgsql sqlite
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mmysql)
-DEPENDS+= p5-DBD-mysql>=4.018:../../databases/p5-DBD-mysql
+DEPENDS+= p5-DBD-{mariadb,mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql
 # MySQL::Config: '0'
 BUILD_PARAMS+= --with mysql
 .endif

diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.83 2022/06/28 11:31:22 wiz Exp $
 
 DISTNAME= DBD-mysql-4.050
-PKGNAME= p5-${DISTNAME}
+PKGNAME= p5-${DISTNAME:S/mysql/${MYSQL_PKG_PREFIX}/}
 PKGREVISION= 5
 CATEGORIES= databases perl5
 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=DBD/}

diff --git a/databases/p5-DBIx-Class-Schema-Loader/options.mk b/databases/p5-DBIx-Class-Schema-Loader/options.mk
@@ -13,7 +13,7 @@ BUILDLINK_DEPMETHOD.p5-DBI?= full
 .endif
 
 .if !empty(PKG_OPTIONS:Mmysql)
-DEPENDS+= p5-DBD-mysql>=4.004:../../databases/p5-DBD-mysql
+DEPENDS+= p5-DBD-{mariadb,mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql
 BUILDLINK_DEPMETHOD.p5-DBI?= full
 .endif
 

diff --git a/databases/pear-MDB2_Driver_pgsql/Makefile b/databases/pear-MDB2_Driver_pgsql/Makefile
@@ -8,7 +8,7 @@ HOMEPAGE= https://pear.php.net/package/MDB2_Driver_pgsql
 COMMENT= Pgsql MDB2 driver
 LICENSE= modified-bsd
 
-DEPENDS+= ${PHP_PKG_PREFIX}-pgsql-[0-9]*:../../databases/php-pgsql
+DEPENDS+= ${PHP_PKG_PREFIX}-pgsql*-[0-9]*:../../databases/php-pgsql
 DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2>=2.5:../../databases/pear-MDB2
 
 PEAR_DIRRM_EXCLUDE= lib/php/MDB2

diff --git a/databases/percona-toolkit/Makefile b/databases/percona-toolkit/Makefile
@@ -35,7 +35,7 @@ SUBST_FILES.sh+= blib/script/pt-summary
 SUBST_SED.sh+= -e 's|^\#!.*|\#!${TOOLS_PATH.sh}|'
 SUBST_NOOP_OK.sh= yes
 
-DEPENDS+= p5-DBD-mysql-[0-9]*:../../databases/p5-DBD-mysql
+DEPENDS+= p5-DBD-{mariadb,mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql
 #DEPENDS+= {perl>=5.7.3,p5-Time-HiRes-[0-9]*}:../../time/p5-Time-HiRes
 
 PERL5_PACKLIST= auto/percona-toolkit/.packlist

diff --git a/databases/php-pdo_pgsql/Makefile b/databases/php-pdo_pgsql/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.19 2016/11/12 15:42:51 taca Exp $
 
 MODNAME= pdo_pgsql
+PKGNAME= ${PHP_PKG_PREFIX}-${MODNAME}${PGSQL_VERSION}-${PHP_VERSION}
 CATEGORIES+= databases
 COMMENT= PHP extension for PHP Data Objects (PostgreSQL)
 

diff --git a/databases/php-pgsql/Makefile b/databases/php-pgsql/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.19 2016/11/12 15:42:51 taca Exp $
 
 MODNAME= pgsql
+PKGNAME= ${PHP_PKG_PREFIX}-${MODNAME}${PGSQL_VERSION}-${PHP_VERSION}
 CATEGORIES+= databases
 COMMENT= PHP extension for PostgreSQL databases
 

diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE= https://github.com/phppgadmin/phppgadmin
 COMMENT= Set of PHP scripts to administer PostgreSQL over the WWW
 
 DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=7.2.0:../../converters/php-mbstring
-DEPENDS+= ${PHP_PKG_PREFIX}-pgsql>=7.2.0:../../databases/php-pgsql
+DEPENDS+= ${PHP_PKG_PREFIX}-pgsql*-[0-9]*:../../databases/php-pgsql
 
 PHP_VERSIONS_INCOMPATIBLE= 56
 

diff --git a/databases/py-mysqlclient/Makefile b/databases/py-mysqlclient/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.8 2022/01/04 20:52:43 wiz Exp $
 
 DISTNAME= mysqlclient-1.4.6
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/mysql/${MYSQL_PKG_PREFIX}/}
 PKGREVISION= 2
 CATEGORIES= databases python
 MASTER_SITES= ${MASTER_SITE_PYPI:=m/mysqlclient/}

diff --git a/databases/py-mysqldb/Makefile b/databases/py-mysqldb/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.54 2022/01/04 20:52:43 wiz Exp $
 
 DISTNAME= mysqlclient-1.3.10
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/mysqlclient/mysqldb/}
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/mysqlclient/${MYSQL_PKG_PREFIX}db/}
 PKGREVISION= 2
 CATEGORIES= databases python
 MASTER_SITES= ${MASTER_SITE_PYPI:=m/mysqlclient/}

diff --git a/devel/bugzilla/options.mk b/devel/bugzilla/options.mk
@@ -19,7 +19,7 @@ PKG_SUGGESTED_OPTIONS= sqlite
 ### Use mysql or postgresql backend
 ###
 .if !empty(PKG_OPTIONS:Mmysql)
-DEPENDS+= p5-DBD-mysql>=4.000:../../databases/p5-DBD-mysql
+DEPENDS+= p5-DBD-{mariadb,mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql
 DBDRIVER= mysql
 .elif !empty(PKG_OPTIONS:Msqlite)
 DEPENDS+= p5-DBD-SQLite>=1.54:../../databases/p5-DBD-SQLite

diff --git a/devel/bugzilla3/options.mk b/devel/bugzilla3/options.mk
@@ -19,7 +19,7 @@ PKG_SUGGESTED_OPTIONS= mysql
 ### Use mysql or postgresql backend
 ###
 .if !empty(PKG_OPTIONS:Mmysql)
-DEPENDS+= p5-DBD-mysql>=4.000:../../databases/p5-DBD-mysql
+DEPENDS+= p5-DBD-{mariadb,mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql
 DBDRIVER= mysql
 .elif !empty(PKG_OPTIONS:Mpgsql)
 DEPENDS+= p5-DBD-postgresql>=1.45:../../databases/p5-DBD-postgresql

diff --git a/devel/mantis/options.mk b/devel/mantis/options.mk
@@ -19,5 +19,5 @@ DEPENDS+= ${PHP_PKG_PREFIX}-jpgraph-[0-9]*:../../graphics/php-jpgraph
 .if !empty(PKG_OPTIONS:Mmysql)
 DEPENDS+= ${PHP_PKG_PREFIX}-mysqli-[0-9]*:../../databases/php-mysqli
 .elif !empty(PKG_OPTIONS:Mpgsql)
-DEPENDS+= ${PHP_PKG_PREFIX}-pgsql-[0-9]*:../../databases/php-pgsql
+DEPENDS+= ${PHP_PKG_PREFIX}-pgsql*-[0-9]*:../../databases/php-pgsql
 .endif
diff --git a/devel/rt-mysql/Makefile.common b/devel/rt-mysql/Makefile.common
@@ -55,7 +55,7 @@ REPLACE_PERL+= tools/insertdata \
 
 .if (${RT_DB_TYPE} == "mysql")
 PKGNAME= ${DISTNAME:S/-/./g:S/./-mysql-/}
-DEPENDS+= p5-DBD-mysql-[0-9]*:../../databases/p5-DBD-mysql
+DEPENDS+= p5-DBD-{mariadb,mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql
 RT_DB_HOST?= localhost
 RT_DB_PORT?=
 RT_DB_PATH?= ${PREFIX}/lib/mysql

diff --git a/devel/rt4/options.mk b/devel/rt4/options.mk
@@ -20,7 +20,7 @@ DEPENDS+= p5-HTML-Mason>=1.36:../../www/p5-HTML-Mason
 
 # Backend database dependencies
 .if !empty(PKG_OPTIONS:Mmysql)
-DEPENDS+= p5-DBD-mysql>=2.1018:../../databases/p5-DBD-mysql
+DEPENDS+= p5-DBD-{mariadb,mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql
 RT_DB_TYPE= mysql
 .elif !empty(PKG_OPTIONS:Mpgsql)
 DEPENDS+= p5-DBD-postgresql>=1.43:../../databases/p5-DBD-postgresql

diff --git a/mail/akonadi/options.mk b/mail/akonadi/options.mk
@@ -17,10 +17,10 @@ MYSQL_VERSIONS_ACCEPTED= 56
 .include "../../mk/mysql.buildlink3.mk"
 DEPENDS+= qt4-mysql-[0-9]*:../../x11/qt4-mysql
 CMAKE_ARGS+= -DAKONADI_BUILD_QSQLITE=off
-. if ${_MYSQL_VERSION} == "56"
+. if ${MYSQL_VERSION} == "56"
 . include "../../databases/mysql56-server/buildlink3.mk"
 . else
-PKG_FAIL_REASON+= "Unknown MySQL version: ${_MYSQL_VERSION}"
+PKG_FAIL_RESASON+= "Unknown MySQL version: ${MYSQL_VERSION}"
 . endif
 SUBST_CLASSES+= mysql
 SUBST_STAGE.mysql= pre-configure

diff --git a/mail/opendmarc/Makefile b/mail/opendmarc/Makefile
@@ -14,7 +14,7 @@ COMMENT= Open source DMARC library, MTA filter implementation and tools
 LICENSE= modified-bsd
 
 DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI
-DEPENDS+= p5-DBD-mysql-[0-9]*:../../databases/p5-DBD-mysql
+DEPENDS+= p5-DBD-{mariadb,mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql
 DEPENDS+= p5-Switch-[0-9]*:../../lang/p5-Switch
 DEPENDS+= p5-HTTP-Message-[0-9]*:../../www/p5-HTTP-Message
 

diff --git a/mail/roundcube/options.mk b/mail/roundcube/options.mk
@@ -24,7 +24,7 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pdo_mysql-[0-9]*:../../databases/php-pdo_mysql
 ### Use postgresql backend.
 ###
 .if !empty(PKG_OPTIONS:Mpgsql)
-DEPENDS+= ${PHP_PKG_PREFIX}-pdo_pgsql-[0-9]*:../../databases/php-pdo_pgsql
+DEPENDS+= ${PHP_PKG_PREFIX}-pdo_pgsql*-[0-9]*:../../databases/php-pdo_pgsql
 .endif
 
 ###

diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
@@ -96,7 +96,7 @@ RCD_SCRIPTS= archived bounced bulk sympa task_manager
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mmysql)
-DEPENDS+= p5-DBD-mysql>=2.0407:../../databases/p5-DBD-mysql
+DEPENDS+= p5-DBD-{mariadb,mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql
 .endif
 
 .if !empty(PKG_OPTIONS:Mpgsql)

diff --git a/meta-pkgs/bulk-medium/Makefile b/meta-pkgs/bulk-medium/Makefile
@@ -133,7 +133,7 @@ BUILD_DEPENDS+= libvorbis-[0-9]*:../../audio/libvorbis
 BUILD_DEPENDS+= gdbm-[0-9]*:../../databases/gdbm
 BUILD_DEPENDS+= p5-BDB-[0-9]*:../../databases/p5-BDB
 BUILD_DEPENDS+= p5-BerkeleyDB-[0-9]*:../../databases/p5-BerkeleyDB
-BUILD_DEPENDS+= p5-DBD-mysql-[0-9]*:../../databases/p5-DBD-mysql
+BUILD_DEPENDS+= p5-DBD-{mariadb,mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql
 BUILD_DEPENDS+= p5-DBD-postgresql-[0-9]*:../../databases/p5-DBD-postgresql
 BUILD_DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI
 BUILD_DEPENDS+= ${PYPKGPREFIX}-bsddb3-[0-9]*:../../databases/py-bsddb3

diff --git a/meta-pkgs/php56-extensions/Makefile b/meta-pkgs/php56-extensions/Makefile
@@ -44,9 +44,9 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pdo>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php
 # freetds seems x86-64 only
 # DEPENDS+= ${PHP_PKG_PREFIX}-pdo_dblib>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_dblib
 DEPENDS+= ${PHP_PKG_PREFIX}-pdo_mysql>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_mysql
-DEPENDS+= ${PHP_PKG_PREFIX}-pdo_pgsql>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_pgsql
+DEPENDS+= ${PHP_PKG_PREFIX}-pdo_pgsql{14,13,12,11,10,96}>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_pgsql
 DEPENDS+= ${PHP_PKG_PREFIX}-pdo_sqlite>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_sqlite
-DEPENDS+= ${PHP_PKG_PREFIX}-pgsql>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pgsql
+DEPENDS+= ${PHP_PKG_PREFIX}-pgsql{14,13,12,11,10,96}>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pgsql
 DEPENDS+= ${PHP_PKG_PREFIX}-sqlite3>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-sqlite3
 DEPENDS+= ${PHP_PKG_PREFIX}-posix>=${PHP_VERSION}<${NEXT_VERS}:../../devel/php-posix
 DEPENDS+= ${PHP_PKG_PREFIX}-pspell>=${PHP_VERSION}<${NEXT_VERS}:../../textproc/php-pspell

diff --git a/meta-pkgs/php74-extensions/Makefile b/meta-pkgs/php74-extensions/Makefile
@@ -41,9 +41,9 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pdo>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php
 # DEPENDS+= ${PHP_PKG_PREFIX}-pdo_dblib>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_dblib
 DEPENDS+= ${PHP_PKG_PREFIX}-pdo_mysql>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_mysql
 DEPENDS+= ${PHP_PKG_PREFIX}-sqlite3>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-sqlite3
-DEPENDS+= ${PHP_PKG_PREFIX}-pdo_pgsql>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_pgsql
+DEPENDS+= ${PHP_PKG_PREFIX}-pdo_pgsql{14,13,12,11,10,96}>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_pgsql
 DEPENDS+= ${PHP_PKG_PREFIX}-pdo_sqlite>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_sqlite
-DEPENDS+= ${PHP_PKG_PREFIX}-pgsql>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pgsql
+DEPENDS+= ${PHP_PKG_PREFIX}-pgsql{14,13,12,11,10,96}>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pgsql
 DEPENDS+= ${PHP_PKG_PREFIX}-posix>=${PHP_VERSION}<${NEXT_VERS}:../../devel/php-posix
 DEPENDS+= ${PHP_PKG_PREFIX}-pspell>=${PHP_VERSION}<${NEXT_VERS}:../../textproc/php-pspell
 DEPENDS+= ${PHP_PKG_PREFIX}-shmop>=${PHP_VERSION}<${NEXT_VERS}:../../devel/php-shmop

diff --git a/meta-pkgs/php80-extensions/Makefile b/meta-pkgs/php80-extensions/Makefile
@@ -40,9 +40,9 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pdo>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php
 # DEPENDS+= ${PHP_PKG_PREFIX}-pdo_dblib>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_dblib
 DEPENDS+= ${PHP_PKG_PREFIX}-pdo_mysql>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_mysql
 DEPENDS+= ${PHP_PKG_PREFIX}-sqlite3>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-sqlite3
-DEPENDS+= ${PHP_PKG_PREFIX}-pdo_pgsql>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_pgsql
+DEPENDS+= ${PHP_PKG_PREFIX}-pdo_pgsql{14,13,12,11,10,96}>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_pgsql
 DEPENDS+= ${PHP_PKG_PREFIX}-pdo_sqlite>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_sqlite
-DEPENDS+= ${PHP_PKG_PREFIX}-pgsql>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pgsql
+DEPENDS+= ${PHP_PKG_PREFIX}-pgsql{14,13,12,11,10,96}>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pgsql
 DEPENDS+= ${PHP_PKG_PREFIX}-posix>=${PHP_VERSION}<${NEXT_VERS}:../../devel/php-posix
 DEPENDS+= ${PHP_PKG_PREFIX}-pspell>=${PHP_VERSION}<${NEXT_VERS}:../../textproc/php-pspell
 DEPENDS+= ${PHP_PKG_PREFIX}-shmop>=${PHP_VERSION}<${NEXT_VERS}:../../devel/php-shmop

diff --git a/meta-pkgs/php81-extensions/Makefile b/meta-pkgs/php81-extensions/Makefile
@@ -40,9 +40,9 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pdo>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php
 # DEPENDS+= ${PHP_PKG_PREFIX}-pdo_dblib>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_dblib
 DEPENDS+= ${PHP_PKG_PREFIX}-pdo_mysql>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_mysql
 DEPENDS+= ${PHP_PKG_PREFIX}-sqlite3>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-sqlite3
-DEPENDS+= ${PHP_PKG_PREFIX}-pdo_pgsql>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_pgsql
+DEPENDS+= ${PHP_PKG_PREFIX}-pdo_pgsql{14,13,12,11,10,96}>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_pgsql
 DEPENDS+= ${PHP_PKG_PREFIX}-pdo_sqlite>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pdo_sqlite
-DEPENDS+= ${PHP_PKG_PREFIX}-pgsql>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pgsql
+DEPENDS+= ${PHP_PKG_PREFIX}-pgsql{14,13,12,11,10,96}>=${PHP_VERSION}<${NEXT_VERS}:../../databases/php-pgsql
 DEPENDS+= ${PHP_PKG_PREFIX}-posix>=${PHP_VERSION}<${NEXT_VERS}:../../devel/php-posix
 DEPENDS+= ${PHP_PKG_PREFIX}-pspell>=${PHP_VERSION}<${NEXT_VERS}:../../textproc/php-pspell
 DEPENDS+= ${PHP_PKG_PREFIX}-shmop>=${PHP_VERSION}<${NEXT_VERS}:../../devel/php-shmop

diff --git a/mk/mysql.buildlink3.mk b/mk/mysql.buildlink3.mk
@@ -22,45 +22,77 @@
 # Variables set by this file:
 #
 # MYSQL_VERSION
+# MYSQL_PKG_PREFIX
 
 .if !defined(MYSQL_VERSION_MK)
 MYSQL_VERSION_MK= # defined
 
 BUILD_DEFS+= MYSQL_VERSION_DEFAULT
 BUILD_DEFS_EFFECTS+= MYSQL_VERSION
+BUILD_DEFS_EFFECTS+= MYSQL_PKG_PREFIX
 
 _VARGROUPS+= mysql
 _USER_VARS.mysql= MYSQL_VERSION_DEFAULT
 _PKG_VARS.mysql= MYSQL_VERSIONS_ACCEPTED
 _SYS_VARS.mysql= MYSQL_VERSION MYSQL_VERSION_REQD MYSQL_VERSIONS_ALL
+_SYS_VARS.mysql+= MYSQL_PKG_PREFIX
 
 #
 # Set variables for all possible MySQL variants
 #
 MYSQL_VERSIONS_ALL= 80 57 56 mariadb106 mariadb105 mariadb104
+MYSQL_VERSIONS_ALL+= percona80 percona57 percona56
+MYSQL_VERSIONS_ALL+= percona80-cluster percona57-cluster
 
 MYSQL_PKGBASE.80= mysql-client-8.0.*
 MYSQL_PKGSRCDIR.80= ../../databases/mysql80-client
+MYSQL_PKG_PREFIX.80= mysql80
 
 MYSQL_PKGBASE.57= mysql-client-5.7.*
 MYSQL_PKGSRCDIR.57= ../../databases/mysql57-client
+MYSQL_PKG_PREFIX.57= mysql57
 
 MYSQL_PKGBASE.56= mysql-client-5.6.*
 MYSQL_PKGSRCDIR.56= ../../databases/mysql56-client
+MYSQL_PKG_PREFIX.56= mysql56
 
 MYSQL_PKGBASE.mariadb104= mariadb-client-10.4.*
 MYSQL_PKGSRCDIR.mariadb104= ../../databases/mariadb104-client
+MYSQL_PKG_PREFIX.mariadb104= mariadb104
 
 MYSQL_PKGBASE.mariadb105= mariadb-client-10.5.*
 MYSQL_PKGSRCDIR.mariadb105= ../../databases/mariadb105-client
+MYSQL_PKG_PREFIX.mariadb105= mariadb105
 
 MYSQL_PKGBASE.mariadb106= mariadb-client-10.6.*
 MYSQL_PKGSRCDIR.mariadb106= ../../databases/mariadb106-client
+MYSQL_PKG_PREFIX.mariadb106= mariadb106
+
+MYSQL_PKGBASE.percona80= percona-client-8.0.*
+MYSQL_PKGSRCDIR.percona80= ../../joyent/percona80-client
+MYSQL_PKG_PREFIX.percona80= percona80
+
+MYSQL_PKGBASE.percona57= percona-client-5.7.*
+MYSQL_PKGSRCDIR.percona57= ../../joyent/percona57-client
+MYSQL_PKG_PREFIX.percona57= percona57
+
+MYSQL_PKGBASE.percona56= percona-client-5.6.*
+MYSQL_PKGSRCDIR.percona56= ../../joyent/percona56-client
+MYSQL_PKG_PREFIX.percona56= percona56
+
+MYSQL_PKGBASE.percona80-cluster= percona-cluster-8.0.*
+MYSQL_PKGSRCDIR.percona80-cluster= ../../joyent/percona80-cluster
+MYSQL_PKG_PREFIX.percona80-cluster= percona80-cluster
+
+MYSQL_PKGBASE.percona57-cluster= percona-cluster-5.7.*
+MYSQL_PKGSRCDIR.percona57-cluster= ../../joyent/percona57-cluster
+MYSQL_PKG_PREFIX.percona57-cluster= percona57-cluster
 
 .for ver in ${MYSQL_VERSIONS_ALL}
 MYSQL_OK.${ver}= no
 MYSQL_INSTALLED.${ver}= no
 _SYS_VARS.mysql+= MYSQL_PKGBASE.${ver} MYSQL_PKGSRCDIR.${ver}
+_SYS_VARS.mysql+= MYSQL_PKG_PREFIX.${ver}
 .endfor
 
 .include "../../mk/bsd.prefs.mk"
@@ -71,7 +103,9 @@ _SYS_VARS.mysql+= MYSQL_PKGBASE.${ver} MYSQL_PKGSRCDIR.${ver}
 # be chosen.
 #
 MYSQL_VERSION_DEFAULT?= mariadb106
-MYSQL_VERSIONS_ACCEPTED?= 57 56 80 mariadb106 mariadb105 mariadb104
+MYSQL_VERSIONS_ACCEPTED?= 57 56 80 mariadb106 mariadb105 mariadb104 \
+ percona80 percona57 percona56 \
+ percona80-cluster percona57-cluster
 
 #
 # Previous versions of this file used shouty caps in the version names. We
@@ -131,4 +165,7 @@ MYSQL_VERSION= ${MYSQL_VERSIONS_ACCEPTED:[1]}
 PKG_FAIL_REASON+= "[mysql.buildlink3.mk] Invalid MySQL version '${MYSQL_VERSION}'."
 .endif
 
+MYSQL_PKG_PREFIX= ${MYSQL_PKG_PREFIX.${MYSQL_VERSION}}
+MULTI+= MYSQL_VERSION=${MYSQL_VERSION}
+
 .endif # MYSQL_VERSION_MK
diff --git a/net/dnscheck/Makefile b/net/dnscheck/Makefile
@@ -23,7 +23,7 @@ DEPENDS+= p5-Socket6>=0.19:../../net/p5-Socket6
 DEPENDS+= p5-IO-Socket-INET6>=2.51:../../net/p5-IO-Socket-INET6
 DEPENDS+= p5-Mail-RFC822-Address-[0-9]*:../../mail/p5-Mail-RFC822-Address
 DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI
-DEPENDS+= p5-DBD-mysql-[0-9]*:../../databases/p5-DBD-mysql
+DEPENDS+= p5-DBD-{mariadb,mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql
 DEPENDS+= p5-Config-Any-[0-9]*:../../devel/p5-Config-Any
 DEPENDS+= p5-File-ShareDir-[0-9]*:../../devel/p5-File-ShareDir
 DEPENDS+= p5-File-ShareDir-Install-[0-9]*:../../devel/p5-File-ShareDir-Install

diff --git a/net/icingaweb2/options.mk b/net/icingaweb2/options.mk
@@ -14,5 +14,5 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pdo_mysql-[0-9]*:../../databases/php-pdo_mysql
 
 .if !empty(PKG_OPTIONS:Mpgsql)
 DEPENDS+= ${PHP_PKG_PREFIX}-pdo-[0-9]*:../../databases/php-pdo
-DEPENDS+= ${PHP_PKG_PREFIX}-pdo_pgsql-[0-9]*:../../databases/php-pdo_pgsql
+DEPENDS+= ${PHP_PKG_PREFIX}-pdo_pgsql*-[0-9]*:../../databases/php-pdo_pgsql
 .endif
diff --git a/net/proftpd-mysql/Makefile b/net/proftpd-mysql/Makefile
@@ -3,7 +3,7 @@
 .include "../../net/proftpd/Makefile.module"
 
 PROFTPD_MOD= mysql
-PKGNAME= ${DISTNAME:S/proftpd/proftpd-${PROFTPD_MOD}/}
+PKGNAME= ${DISTNAME:S/proftpd/proftpd-${MYSQL_PKG_PREFIX}/}
 PKGREVISION= 1
 COMMENT= MySQL module for proftpd