Proper depends

2 files changed, 70 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cb33e99a6959..a20efeece336 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 6.0.1
-# Fri Jan 21 17:52:37 UTC 2022
+# Mon Jan 24 19:31:47 UTC 2022
 pkgbase = php72
 	pkgdesc = PHP 7.2.34 compiled as to not conflict with mainline php
 	pkgver = 7.2.34
-	pkgrel = 9
+	pkgrel = 10
 	url = http://www.php.net
 	arch = x86_64
 	license = PHP
@@ -222,7 +222,6 @@ pkgname = php72-mysql
 	pkgdesc = MySQL modules for php72
 	depends = php72=7.2.34
 	depends = php72-pdo=7.2.34
-	depends = php72-openssl=7.2.34
 
 pkgname = php72-phar
 	pkgdesc = phar module for php72
@@ -304,10 +303,6 @@ pkgname = php72-gd
 	pkgdesc = gd module for php72
 	depends = php72=7.2.34
 	depends = gd
-	depends = libxpm
-	depends = libpng
-	depends = libjpeg
-	depends = libvpx
 
 pkgname = php72-exif
 	pkgdesc = exif module for php72
@@ -399,7 +394,6 @@ pkgname = php72-soap
 pkgname = php72-ftp
 	pkgdesc = FTP module for php72
 	depends = php72=7.2.34
-	depends = openssl-1.0
 	depends = openssl
 
 pkgname = php72-curl
@@ -411,7 +405,6 @@ pkgname = php72-snmp
 	pkgdesc = snmp module for php72
 	depends = php72=7.2.34
 	depends = net-snmp
-	depends = openssl-1.0
 	depends = openssl
 
 pkgname = php72-ldap
@@ -422,12 +415,11 @@ pkgname = php72-ldap
 
 pkgname = php72-imap
 	pkgdesc = imap module for php72
+	depends = php72=7.2.34
 	depends = pam
 	depends = krb5
 	depends = c-client
 	depends = libxcrypt
-	depends = php72=7.2.34
-	depends = openssl-1.0
 	depends = openssl
 
 pkgname = php72-sodium
diff --git a/PKGBUILD b/PKGBUILD
index 3af23fe51caf..090004c8bd19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@
 _phpbase="72"
 _suffix=""
 pkgver="7.2.34"
-pkgrel="9"
+pkgrel="10"
 pkgbase="php72"
 pkgdesc="PHP 7.2.34 compiled as to not conflict with mainline php"
 _cppflags=" -DU_USING_ICU_NAMESPACE=1  -DU_DEFINE_FALSE_AND_TRUE=1 "
@@ -218,6 +218,60 @@ _sapi_depends=(
     "libedit"
     "argon2"
 )
+_ext_depends_snmp=(
+    "php72=7.2.34"
+    "net-snmp"
+    "openssl"
+)
+_ext_depends_ftp=(
+    "php72=7.2.34"
+    "openssl"
+)
+_ext_depends_intl=(
+    "php72=7.2.34"
+    "icu"
+)
+_ext_depends_imap=(
+    "php72=7.2.34"
+    "pam"
+    "krb5"
+    "c-client"
+    "libxcrypt"
+    "openssl"
+)
+_ext_depends_gd=(
+    "php72=7.2.34"
+    "gd"
+)
+_ext_depends_mysql=(
+    "php72=7.2.34"
+    "php72-pdo=7.2.34"
+)
+_ext_depends_dba=(
+    "php72=7.2.34"
+    "db"
+    "lmdb"
+)
+_ext_depends_odbc=(
+    "php72=7.2.34"
+    "unixodbc"
+    "php72-pdo=7.2.34"
+)
+_ext_depends_pgsql=(
+    "php72=7.2.34"
+    "postgresql-libs"
+    "php72-pdo=7.2.34"
+)
+_ext_depends_firebird=(
+    "php72=7.2.34"
+    "libfbclient"
+    "php72-pdo=7.2.34"
+)
+_ext_depends_sqlite=(
+    "php72=7.2.34"
+    "sqlite"
+    "php72-pdo=7.2.34"
+)
 _phpconfig="\
     --prefix=/usr \
     --sbindir=/usr/bin \
@@ -1072,13 +1126,7 @@ package_php72-xsl() {
 # MySQL
 package_php72-mysql() {
     pkgdesc="MySQL modules for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}")
-    if ((_build_shared_pdo)); then
-        depends+=("php${_phpbase}-pdo${_suffix}=${pkgver}")
-    fi
-    if ((_build_shared_openssl)); then
-        depends+=("php${_phpbase}-openssl${_suffix}=${pkgver}")
-    fi
+    depends=("${_ext_depends_mysql[@]}")
     _install_module mysqlnd
     _install_module mysql
     _install_module mysqli
@@ -1088,10 +1136,7 @@ package_php72-mysql() {
 # pdo_sqlite + sqlite3
 package_php72-sqlite() {
     pkgdesc="sqlite module for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}" 'sqlite')
-    if ((_build_shared_pdo)); then
-        depends+=("php${_phpbase}-pdo${_suffix}=${pkgver}")
-    fi
+    depends=("${_ext_depends_sqlite[@]}")
     _install_module sqlite3
     _install_module pdo_sqlite
 }
@@ -1099,10 +1144,7 @@ package_php72-sqlite() {
 # ODBC
 package_php72-odbc() {
     pkgdesc="ODBC modules for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}" 'unixodbc')
-    if ((_build_shared_pdo)); then
-        depends+=("php${_phpbase}-pdo${_suffix}=${pkgver}")
-    fi
+    depends=("${_ext_depends_odbc[@]}")
     _install_module odbc
     _install_module pdo_odbc
 }
@@ -1110,10 +1152,7 @@ package_php72-odbc() {
 # PostgreSQL
 package_php72-pgsql() {
     pkgdesc="PostgreSQL modules for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}" 'postgresql-libs')
-    if ((_build_shared_pdo)); then
-        depends+=("php${_phpbase}-pdo${_suffix}=${pkgver}")
-    fi
+    depends=("${_ext_depends_pgsql[@]}")
     _install_module pgsql
     _install_module pdo_pgsql
 }
@@ -1128,10 +1167,7 @@ package_php72-interbase() {
 # firebird
 package_php72-firebird() {
     pkgdesc="pdo_firebird module for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}" "libfbclient")
-    if ((_build_shared_pdo)); then
-        depends+=("php${_phpbase}-pdo${_suffix}=${pkgver}")
-    fi
+    depends=("${_ext_depends_firebird[@]}")
     _install_module pdo_firebird
 }
 
@@ -1152,10 +1188,7 @@ package_php72-mssql() {
 # Dba
 package_php72-dba() {
     pkgdesc="dba module for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}" 'db')
-    if ((_build_uses_lmdb)); then
-        depends+=('lmdb')
-    fi
+    depends=("${_ext_depends_dba[@]}")
     _install_module dba
 }
 
@@ -1166,12 +1199,10 @@ package_php72-dba() {
 # Intl
 package_php72-intl() {
     pkgdesc="intl module for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}")
+    depends=("${_ext_depends_intl[@]}")
     if ((_build_with_custom_icu)); then
         # Patch to proper path inside intl.so
         patchelf --set-rpath "/usr/lib/${pkgbase}/icu${_pkgver_icu}/lib" "build-cli/modules/intl.so"
-    else
-        depends+=('icu')
     fi
     _install_module intl
 }
@@ -1212,13 +1243,7 @@ package_php72-calendar() {
 # GD
 package_php72-gd() {
     pkgdesc="gd module for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}" 'gd')
-    if ((_build_bundled_gd)); then
-        depends+=('libxpm' 'libpng' 'libjpeg')
-    fi
-    if ((_phpbase >= 55 && _phpbase < 72)); then
-        depends+=('libvpx');
-    fi
+    depends=("${_ext_depends_gd[@]}")
     _install_module gd
 }
 
@@ -1312,12 +1337,7 @@ package_php72-soap() {
 # FTP
 package_php72-ftp() {
     pkgdesc="FTP module for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}")
-    if ((_build_openssl_v10_patch)); then
-        depends+=("openssl-1.0")
-    else
-        depends+=("openssl")
-    fi
+    depends=("${_ext_depends_ftp[@]}")
     _install_module ftp
 }
 
@@ -1331,12 +1351,7 @@ package_php72-ldap() {
 # SNMP
 package_php72-snmp() {
     pkgdesc="snmp module for ${pkgbase}"
-    depends=("${pkgbase}=${pkgver}" 'net-snmp')
-    if ((_build_openssl_v10_patch)); then
-        depends+=('openssl-1.0');
-    else
-        depends+=('openssl');
-    fi
+    depends=("${_ext_depends_snmp[@]}")
     _install_module snmp
 }
 
@@ -1350,12 +1365,7 @@ package_php72-xmlrpc() {
 # Imap
 package_php72-imap() {
     pkgdesc="imap module for ${pkgbase}"
-    depends=('pam' 'krb5' 'c-client' 'libxcrypt' "${pkgbase}=${pkgver}");
-    if ((_build_openssl_v10_patch)); then
-        depends+=("openssl-1.0")
-    else
-        depends+=("openssl")
-    fi
+    depends=("${_ext_depends_imap[@]}")
    _install_module imap
 }
 
@@ -1449,10 +1459,7 @@ package_php72-sysvshm() {
 # Ffi
 package_php72-ffi() {
     pkgdesc="ffi module for ${pkgbase}"
-    depends=(
-        'libffi'
-        "${pkgbase}=${pkgver}"
-    )
+    depends=("${pkgbase}=${pkgver}" 'libffi')
    _install_module ffi
 }