Isolate php7.3 so it can be installed along side the php package

7 files changed, 193 insertions, 165 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd0591179a99..1b9ff396a930 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = php
+pkgbase = php73
 	pkgver = 7.3.12
 	pkgrel = 1
-	url = https://secure.php.net/
+	url = https://www.php.net/
 	arch = x86_64
 	license = PHP
 	checkdepends = procps-ng
@@ -42,118 +42,118 @@ pkgbase = php
 	sha256sums = aafe5e9861ad828860c6af8c88cdc1488314785962328eb1783607c1fdd855df
 	sha256sums = SKIP
 	sha256sums = 62e5ceea3c90a3c6eab1166488f876e766efcfd7d4e973c44060a9e72d51a98a
-	sha256sums = ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce
-	sha256sums = 7ae4870d54340ee5be5a4fbb61bf81d3bfa33fa3b8d59bafcfa17509e2775234
-	sha256sums = 640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5
-	sha256sums = 07627f57bbc5559a63bfc77e21edd4e2a5d3aa15fed4d9dfe00e877dd31b7c9f
+	sha256sums = 25c55dbd006ca1b03472a4a7e438cc512cc5d7c3ae6f3d5cb410c3da77c77f78
+	sha256sums = 3af13ba1043104947bda4e400711a6baed4bb8814e92ed54e04f1415d78f2dd2
+	sha256sums = c28997b08d3ea257a2435164e35d0340f42cd3306def6a94b6b8c0a2f5644def
+	sha256sums = cd3b12c1cd5860f77325ef5405b987eca9cd894cbc99bde6ea4bdbed78ff5d46
 	sha256sums = 3992491eebaf5b31f6b00095a7276d11682f9a8aaff473bfb25afbdcfa6eba32
 	sha256sums = 07c4648669dc05afc3c1ad5a4739768079c423b817eabf5296ca3d1ea5ffd163
 
-pkgname = php
+pkgname = php73
 	pkgdesc = A general-purpose scripting language that is especially suited to web development
 	depends = libxml2
 	depends = curl
 	depends = libzip
 	depends = pcre2
 	depends = argon2
-	provides = php-ldap=7.3.12
-	conflicts = php-ldap
-	replaces = php-ldap
-	backup = etc/php/php.ini
+	provides = php73-ldap=7.3.12
+	conflicts = php73-ldap
+	replaces = php73-ldap
+	backup = etc/php73/php.ini
 
-pkgname = php-cgi
+pkgname = php73-cgi
 	pkgdesc = CGI and FCGI SAPI for PHP
-	depends = php
+	depends = php73
 
-pkgname = php-apache
+pkgname = php73-apache
 	pkgdesc = Apache SAPI for PHP
-	depends = php
+	depends = php73
 	depends = apache
 	depends = libnsl
-	backup = etc/httpd/conf/extra/php7_module.conf
+	backup = etc/httpd/conf/extra/php73_module.conf
 
-pkgname = php-fpm
+pkgname = php73-fpm
 	pkgdesc = FastCGI Process Manager for PHP
-	depends = php
+	depends = php73
 	depends = systemd
 	options = !emptydirs
-	backup = etc/php/php-fpm.conf
-	backup = etc/php/php-fpm.d/www.conf
+	backup = etc/php73/php-fpm.conf
+	backup = etc/php73/php-fpm.d/www.conf
 
-pkgname = php-embed
+pkgname = php73-embed
 	pkgdesc = Embedded PHP SAPI library
-	depends = php
+	depends = php73
 	depends = systemd-libs
 	depends = libnsl
 	options = !emptydirs
 
-pkgname = php-phpdbg
+pkgname = php73-phpdbg
 	pkgdesc = Interactive PHP debugger
-	depends = php
+	depends = php73
 	options = !emptydirs
 
-pkgname = php-dblib
+pkgname = php73-dblib
 	pkgdesc = dblib module for PHP
-	depends = php
+	depends = php73
 	depends = freetds
 
-pkgname = php-enchant
+pkgname = php73-enchant
 	pkgdesc = enchant module for PHP
-	depends = php
+	depends = php73
 	depends = enchant
 
-pkgname = php-gd
+pkgname = php73-gd
 	pkgdesc = gd module for PHP
-	depends = php
+	depends = php73
 	depends = gd
 
-pkgname = php-imap
+pkgname = php73-imap
 	pkgdesc = imap module for PHP
-	depends = php
+	depends = php73
 	depends = c-client
 
-pkgname = php-intl
+pkgname = php73-intl
 	pkgdesc = intl module for PHP
-	depends = php
+	depends = php73
 	depends = icu
 
-pkgname = php-sodium
+pkgname = php73-sodium
 	pkgdesc = sodium module for PHP
-	depends = php
+	depends = php73
 	depends = libsodium
 
-pkgname = php-odbc
+pkgname = php73-odbc
 	pkgdesc = ODBC modules for PHP
-	depends = php
+	depends = php73
 	depends = unixodbc
 
-pkgname = php-pgsql
+pkgname = php73-pgsql
 	pkgdesc = PostgreSQL modules for PHP
-	depends = php
+	depends = php73
 	depends = postgresql-libs
 
-pkgname = php-pspell
+pkgname = php73-pspell
 	pkgdesc = pspell module for PHP
-	depends = php
+	depends = php73
 	depends = aspell
 
-pkgname = php-snmp
+pkgname = php73-snmp
 	pkgdesc = snmp module for PHP
-	depends = php
+	depends = php73
 	depends = net-snmp
 
-pkgname = php-sqlite
+pkgname = php73-sqlite
 	pkgdesc = sqlite module for PHP
-	depends = php
+	depends = php73
 	depends = sqlite
 
-pkgname = php-tidy
+pkgname = php73-tidy
 	pkgdesc = tidy module for PHP
-	depends = php
+	depends = php73
 	depends = tidy
 
-pkgname = php-xsl
+pkgname = php73-xsl
 	pkgdesc = xsl module for PHP
-	depends = php
+	depends = php73
 	depends = libxslt
 
diff --git a/PKGBUILD b/PKGBUILD
index 8d269e27bcc2..1a6b9cbbb947 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,52 @@
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=php
-pkgname=('php'
-         'php-cgi'
-         'php-apache'
-         'php-fpm'
-         'php-embed'
-         'php-phpdbg'
-         'php-dblib'
-         'php-enchant'
-         'php-gd'
-         'php-imap'
-         'php-intl'
-         'php-sodium'
-         'php-odbc'
-         'php-pgsql'
-         'php-pspell'
-         'php-snmp'
-         'php-sqlite'
-         'php-tidy'
-         'php-xsl')
+# Maintainer: Matt Harrison <matt@harrison.us.com>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgbase=php73
+_pkgbase=${pkgbase%73}
+pkgname=("${pkgbase}"
+         "${pkgbase}-cgi"
+         "${pkgbase}-apache"
+         "${pkgbase}-fpm"
+         "${pkgbase}-embed"
+         "${pkgbase}-phpdbg"
+         "${pkgbase}-dblib"
+         "${pkgbase}-enchant"
+         "${pkgbase}-gd"
+         "${pkgbase}-imap"
+         "${pkgbase}-intl"
+         "${pkgbase}-sodium"
+         "${pkgbase}-odbc"
+         "${pkgbase}-pgsql"
+         "${pkgbase}-pspell"
+         "${pkgbase}-snmp"
+         "${pkgbase}-sqlite"
+         "${pkgbase}-tidy"
+         "${pkgbase}-xsl")
 pkgver=7.3.12
 pkgrel=1
 arch=('x86_64')
 license=('PHP')
-url='https://secure.php.net/'
+url='https://www.php.net/'
 makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'libxslt' 'libzip' 'net-snmp'
              'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds' 'pcre2' 'libnsl')
 checkdepends=('procps-ng')
-source=("https://php.net/distributions/${pkgbase}-${pkgver}.tar.xz"{,.asc}
+source=("https://php.net/distributions/${_pkgbase}-${pkgver}.tar.xz"{,.asc}
         'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch'
         'enchant-2.patch' 'freetype.patch')
 sha256sums=('aafe5e9861ad828860c6af8c88cdc1488314785962328eb1783607c1fdd855df'
             'SKIP'
             '62e5ceea3c90a3c6eab1166488f876e766efcfd7d4e973c44060a9e72d51a98a'
-            'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
-            '7ae4870d54340ee5be5a4fbb61bf81d3bfa33fa3b8d59bafcfa17509e2775234'
-            '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
-            '07627f57bbc5559a63bfc77e21edd4e2a5d3aa15fed4d9dfe00e877dd31b7c9f'
+            '25c55dbd006ca1b03472a4a7e438cc512cc5d7c3ae6f3d5cb410c3da77c77f78'
+            '3af13ba1043104947bda4e400711a6baed4bb8814e92ed54e04f1415d78f2dd2'
+            'c28997b08d3ea257a2435164e35d0340f42cd3306def6a94b6b8c0a2f5644def'
+            'cd3b12c1cd5860f77325ef5405b987eca9cd894cbc99bde6ea4bdbed78ff5d46'
             '3992491eebaf5b31f6b00095a7276d11682f9a8aaff473bfb25afbdcfa6eba32'
             '07c4648669dc05afc3c1ad5a4739768079c423b817eabf5296ca3d1ea5ffd163')
 validpgpkeys=('CBAF69F173A0FEA4B537F470D66C9593118BCCB6'
               'F38252826ACD957EF380D39F2F7956BC5DA04B5D')
 
 prepare() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
+	cd ${srcdir}/${_pkgbase}-${pkgver}
 
 	patch -p0 -i ${srcdir}/apache.patch
 	patch -p0 -i ${srcdir}/php-fpm.patch
@@ -60,15 +62,19 @@ build() {
 	# http://site.icu-project.org/download/61#TOC-Migration-Issues
 	CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
 
-	local _phpconfig="--srcdir=../${pkgbase}-${pkgver} \
+	local _phpconfig="--srcdir=../${_pkgbase}-${pkgver} \
 		--config-cache \
 		--prefix=/usr \
 		--sbindir=/usr/bin \
-		--sysconfdir=/etc/php \
+		--sysconfdir=/etc/${pkgbase} \
 		--localstatedir=/var \
+		--libdir=/usr/lib/${pkgbase} \
+		--datarootdir=/usr/share/${pkgbase} \
+		--datadir=/usr/share/${pkgbase} \
+		--program-suffix=${pkgbase#php} \
 		--with-layout=GNU \
-		--with-config-file-path=/etc/php \
-		--with-config-file-scan-dir=/etc/php/conf.d \
+		--with-config-file-path=/etc/${pkgbase} \
+		--with-config-file-scan-dir=/etc/${pkgbase}/conf.d \
 		--disable-rpath \
 		--mandir=/usr/share/man \
 		--without-pear \
@@ -130,12 +136,12 @@ build() {
 		--enable-pcntl \
 		"
 
-	EXTENSION_DIR=/usr/lib/php/modules
+	EXTENSION_DIR=/usr/lib/${pkgbase}/modules
 	export EXTENSION_DIR
 
 	mkdir ${srcdir}/build
 	cd ${srcdir}/build
-	ln -s ../${pkgbase}-${pkgver}/configure
+	ln -s ../${_pkgbase}-${pkgver}/configure
 	./configure ${_phpconfig} \
 		--enable-cgi \
 		--enable-fpm \
@@ -166,7 +172,7 @@ build() {
 }
 
 check() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
+	cd ${srcdir}/${_pkgbase}-${pkgver}
 
 	# Check if sendmail was configured correctly (FS#47600)
 	${srcdir}/build/sapi/cli/php -n -r 'echo ini_get("sendmail_path");' | grep -q '/usr/bin/sendmail'
@@ -179,164 +185,186 @@ check() {
 	${srcdir}/build/sapi/cli/php -n run-tests.php -n -P {tests,Zend}
 }
 
-package_php() {
+package_php73() {
 	pkgdesc='A general-purpose scripting language that is especially suited to web development'
 	depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2')
-	replaces=('php-ldap')
-	conflicts=('php-ldap')
-	provides=("php-ldap=${pkgver}")
-	backup=('etc/php/php.ini')
+	replaces=('php73-ldap')
+	conflicts=('php73-ldap')
+	provides=("php73-ldap=${pkgver}")
+	backup=("etc/${pkgbase}/php.ini")
 
 	cd ${srcdir}/build
 	make -j1 INSTALL_ROOT=${pkgdir} install-{modules,cli,build,headers,programs,pharcmd}
-	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini
-	install -d -m755 ${pkgdir}/etc/php/conf.d/
+	install -D -m644 ${srcdir}/${_pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/${pkgbase}/php.ini
+	install -d -m755 ${pkgdir}/etc/${pkgbase}/conf.d/
 
 	# remove static modules
-	rm -f ${pkgdir}/usr/lib/php/modules/*.a
+	rm -f ${pkgdir}/usr/lib/${pkgbase}/modules/*.a
 	# remove modules provided by sub packages
-	rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,imap,intl,sodium,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
+	rm -f ${pkgdir}/usr/lib/${pkgbase}/modules/{enchant,gd,imap,intl,sodium,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
 	# remove empty directory
 	rmdir ${pkgdir}/usr/include/php/include
+
+	# move include directory
+	mv ${pkgdir}/usr/include/php ${pkgdir}/usr/include/${pkgbase}
+
+	# fix phar symlink
+	rm ${pkgdir}/usr/bin/phar
+	ln -sf phar.phar73 ${pkgdir}/usr/bin/phar73
+
+	# rename executables
+	mv ${pkgdir}/usr/bin/phar.phar ${pkgdir}/usr/bin/phar.phar73
+
+	# rename man pages
+	mv ${pkgdir}/usr/share/man/man1/{phar,phar73}.1
+	mv ${pkgdir}/usr/share/man/man1/phar.{phar,phar73}.1
+
+	# fix paths in executables
+	sed -i "/^includedir=/c \includedir=/usr/include/${pkgbase}" ${pkgdir}/usr/bin/phpize73
+	sed -i "/^include_dir=/c \include_dir=/usr/include/${pkgbase}" ${pkgdir}/usr/bin/php-config73
+
+	# make phpize use php-config73
+	sed -i "/^\[  --with-php-config=/c \[  --with-php-config=PATH  Path to php-config [php-config73]], php-config73, no)" ${pkgdir}/usr/lib/${pkgbase}/build/phpize.m4
 }
 
-package_php-cgi() {
+package_php73-cgi() {
 	pkgdesc='CGI and FCGI SAPI for PHP'
-	depends=('php')
+	depends=("${pkgbase}")
 
 	cd ${srcdir}/build
 	make -j1 INSTALL_ROOT=${pkgdir} install-cgi
 }
 
-package_php-apache() {
+package_php73-apache() {
 	pkgdesc='Apache SAPI for PHP'
-	depends=('php' 'apache' 'libnsl')
-	backup=('etc/httpd/conf/extra/php7_module.conf')
+	depends=("${pkgbase}" 'apache' 'libnsl')
+	backup=("etc/httpd/conf/extra/${pkgbase}_module.conf")
 
-	install -D -m755 ${srcdir}/build-apache/libs/libphp7.so ${pkgdir}/usr/lib/httpd/modules/libphp7.so
-	install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php7_module.conf
+	install -D -m755 ${srcdir}/build-apache/libs/libphp7.so ${pkgdir}/usr/lib/httpd/modules/lib${pkgbase}.so
+	install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/${pkgbase}_module.conf
 }
 
-package_php-fpm() {
+package_php73-fpm() {
 	pkgdesc='FastCGI Process Manager for PHP'
-	depends=('php' 'systemd')
-	backup=('etc/php/php-fpm.conf' 'etc/php/php-fpm.d/www.conf')
+	depends=("${pkgbase}" 'systemd')
+	backup=("etc/${pkgbase}/php-fpm.conf" "etc/${pkgbase}/php-fpm.d/www.conf")
 	options=('!emptydirs')
 
 	cd ${srcdir}/build
 	make -j1 INSTALL_ROOT=${pkgdir} install-fpm
-	install -D -m644 sapi/fpm/php-fpm.service ${pkgdir}/usr/lib/systemd/system/php-fpm.service
-	install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/php-fpm.conf
+	install -D -m644 sapi/fpm/php-fpm.service ${pkgdir}/usr/lib/systemd/system/${pkgbase}-fpm.service
+	install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}-fpm.conf
 }
 
-package_php-embed() {
+package_php73-embed() {
 	pkgdesc='Embedded PHP SAPI library'
-	depends=('php' 'systemd-libs' 'libnsl')
+	depends=("${pkgbase}" 'systemd-libs' 'libnsl')
 	options=('!emptydirs')
 
 	cd ${srcdir}/build
 	make -j1 INSTALL_ROOT=${pkgdir} PHP_SAPI=embed install-sapi
+	mv ${pkgdir}/usr/lib/libphp7.so ${pkgdir}/usr/lib/libphp-73.so
 }
 
-package_php-phpdbg() {
+package_php73-phpdbg() {
 	pkgdesc='Interactive PHP debugger'
-	depends=('php')
+	depends=("${pkgbase}")
 	options=('!emptydirs')
 
 	cd ${srcdir}/build-phpdbg
 	make -j1 INSTALL_ROOT=${pkgdir} install-phpdbg
 }
 
-package_php-dblib() {
+package_php73-dblib() {
 	pkgdesc='dblib module for PHP'
-	depends=('php' 'freetds')
+	depends=("${pkgbase}" 'freetds')
 
-	install -D -m755 ${srcdir}/build/modules/pdo_dblib.so ${pkgdir}/usr/lib/php/modules/pdo_dblib.so
+	install -D -m755 ${srcdir}/build/modules/pdo_dblib.so ${pkgdir}/usr/lib/${pkgbase}/modules/pdo_dblib.so
 }
 
-package_php-enchant() {
+package_php73-enchant() {
 	pkgdesc='enchant module for PHP'
-	depends=('php' 'enchant')
+	depends=("${pkgbase}" 'enchant')
 
-	install -D -m755 ${srcdir}/build/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so
+	install -D -m755 ${srcdir}/build/modules/enchant.so ${pkgdir}/usr/lib/${pkgbase}/modules/enchant.so
 }
 
-package_php-gd() {
+package_php73-gd() {
 	pkgdesc='gd module for PHP'
-	depends=('php' 'gd')
+	depends=("${pkgbase}" 'gd')
 
-	install -D -m755 ${srcdir}/build/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
+	install -D -m755 ${srcdir}/build/modules/gd.so ${pkgdir}/usr/lib/${pkgbase}/modules/gd.so
 }
 
-package_php-imap() {
+package_php73-imap() {
 	pkgdesc='imap module for PHP'
-	depends=('php' 'c-client')
+	depends=("${pkgbase}" 'c-client')
 
-	install -D -m755 ${srcdir}/build/modules/imap.so ${pkgdir}/usr/lib/php/modules/imap.so
+	install -D -m755 ${srcdir}/build/modules/imap.so ${pkgdir}/usr/lib/${pkgbase}/modules/imap.so
 }
 
-package_php-intl() {
+package_php73-intl() {
 	pkgdesc='intl module for PHP'
-	depends=('php' 'icu')
+	depends=("${pkgbase}" 'icu')
 
-	install -D -m755 ${srcdir}/build/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so
+	install -D -m755 ${srcdir}/build/modules/intl.so ${pkgdir}/usr/lib/${pkgbase}/modules/intl.so
 }
 
-package_php-sodium() {
+package_php73-sodium() {
 	pkgdesc='sodium module for PHP'
-	depends=('php' 'libsodium')
+	depends=("${pkgbase}" 'libsodium')
 
-	install -D -m755 ${srcdir}/build/modules/sodium.so ${pkgdir}/usr/lib/php/modules/sodium.so
+	install -D -m755 ${srcdir}/build/modules/sodium.so ${pkgdir}/usr/lib/${pkgbase}/modules/sodium.so
 }
 
-package_php-odbc() {
+package_php73-odbc() {
 	pkgdesc='ODBC modules for PHP'
-	depends=('php' 'unixodbc')
+	depends=("${pkgbase}" 'unixodbc')
 
-	install -D -m755 ${srcdir}/build/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so
-	install -D -m755 ${srcdir}/build/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so
+	install -D -m755 ${srcdir}/build/modules/odbc.so ${pkgdir}/usr/lib/${pkgbase}/modules/odbc.so
+	install -D -m755 ${srcdir}/build/modules/pdo_odbc.so ${pkgdir}/usr/lib/${pkgbase}/modules/pdo_odbc.so
 }
 
-package_php-pgsql() {
+package_php73-pgsql() {
 	pkgdesc='PostgreSQL modules for PHP'
-	depends=('php' 'postgresql-libs')
+	depends=("${pkgbase}" 'postgresql-libs')
 
-	install -D -m755 ${srcdir}/build/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so
-	install -D -m755 ${srcdir}/build/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so
+	install -D -m755 ${srcdir}/build/modules/pgsql.so ${pkgdir}/usr/lib/${pkgbase}/modules/pgsql.so
+	install -D -m755 ${srcdir}/build/modules/pdo_pgsql.so ${pkgdir}/usr/lib/${pkgbase}/modules/pdo_pgsql.so
 }
 
-package_php-pspell() {
+package_php73-pspell() {
 	pkgdesc='pspell module for PHP'
-	depends=('php' 'aspell')
+	depends=("${pkgbase}" 'aspell')
 
-	install -D -m755 ${srcdir}/build/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so
+	install -D -m755 ${srcdir}/build/modules/pspell.so ${pkgdir}/usr/lib/${pkgbase}/modules/pspell.so
 }
 
-package_php-snmp() {
+package_php73-snmp() {
 	pkgdesc='snmp module for PHP'
-	depends=('php' 'net-snmp')
+	depends=("${pkgbase}" 'net-snmp')
 
-	install -D -m755 ${srcdir}/build/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so
+	install -D -m755 ${srcdir}/build/modules/snmp.so ${pkgdir}/usr/lib/${pkgbase}/modules/snmp.so
 }
 
-package_php-sqlite() {
+package_php73-sqlite() {
 	pkgdesc='sqlite module for PHP'
-	depends=('php' 'sqlite')
+	depends=("${pkgbase}" 'sqlite')
 
-	install -D -m755 ${srcdir}/build/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so
-	install -D -m755 ${srcdir}/build/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so
+	install -D -m755 ${srcdir}/build/modules/sqlite3.so ${pkgdir}/usr/lib/${pkgbase}/modules/sqlite3.so
+	install -D -m755 ${srcdir}/build/modules/pdo_sqlite.so ${pkgdir}/usr/lib/${pkgbase}/modules/pdo_sqlite.so
 }
 
-package_php-tidy() {
+package_php73-tidy() {
 	pkgdesc='tidy module for PHP'
-	depends=('php' 'tidy')
+	depends=("${pkgbase}" 'tidy')
 
-	install -D -m755 ${srcdir}/build/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so
+	install -D -m755 ${srcdir}/build/modules/tidy.so ${pkgdir}/usr/lib/${pkgbase}/modules/tidy.so
 }
 
-package_php-xsl() {
+package_php73-xsl() {
 	pkgdesc='xsl module for PHP'
-	depends=('php' 'libxslt')
+	depends=("${pkgbase}" 'libxslt')
 
-	install -D -m755 ${srcdir}/build/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so
+	install -D -m755 ${srcdir}/build/modules/xsl.so ${pkgdir}/usr/lib/${pkgbase}/modules/xsl.so
 }
diff --git a/apache.conf b/apache.conf
index b516b5e66ffa..56bb1440a3c4 100644
--- a/apache.conf
+++ b/apache.conf
@@ -1,7 +1,7 @@
-# Required modules: dir_module, php7_module
+# Required modules: dir_module, php73_module
 
 <IfModule dir_module>
-	<IfModule php7_module>
+	<IfModule php73_module>
 		DirectoryIndex index.php index.html
 		<FilesMatch "\.php$">
 			SetHandler application/x-httpd-php
diff --git a/generate_patches b/generate_patches
index 19b8a76ac5a1..8ec5a36d9632 100755
--- a/generate_patches
+++ b/generate_patches
@@ -4,26 +4,26 @@
 
 makepkg -o --nodeps --noprepare --skipinteg
 
-pushd src/${pkgbase}-${pkgver}
+pushd src/${_pkgbase}-${pkgver}
 
 sed '/APACHE_THREADED_MPM=/d' -i.orig sapi/apache2handler/config.m4
 
 sed 's/.conf.default/.conf/g' -i.orig sapi/fpm/Makefile.frag
 
 sed \
-	-e 's#run/php-fpm.pid#/run/php-fpm/php-fpm.pid#' \
+	-e 's#run/php-fpm.pid#/run/php73-fpm/php-fpm.pid#' \
 	-e 's#^;error_log =.*#error_log = syslog#' \
 	-i.orig sapi/fpm/php-fpm.conf.in
 
 sed \
-	-e 's#^listen =.*#listen = /run/php-fpm/php-fpm.sock#' \
+	-e 's#^listen =.*#listen = /run/php73-fpm/php-fpm.sock#' \
 	-e 's#^;listen.owner =#listen.owner =#' \
 	-e 's#^;listen.group =#listen.group =#' \
 	-e 's#^;chdir =.*#;chdir = /srv/http#' \
 	-i.orig sapi/fpm/www.conf.in
 
 sed \
-	-e 's#^PIDFile=.*#PIDFile=/run/php-fpm/php-fpm.pid#' \
+	-e 's#^PIDFile=.*#PIDFile=/run/php73-fpm/php-fpm.pid#' \
 	-i.orig sapi/fpm/php-fpm.service.in
 
 extensions=";extension=bcmath\n;extension=bz2\n;extension=calendar\nextension=curl\n;extension=dba\n;extension=enchant\n;extension=exif\n;extension=ftp\n;extension=gd\n;extension=gettext\n;extension=gmp\n;extension=iconv\n;extension=imap\n;extension=intl\n;extension=sodium\n;extension=ldap\n;extension=mysqli\n;extension=odbc\n;zend_extension=opcache\n;extension=pdo_dblib\n;extension=pdo_mysql\n;extension=pdo_odbc\n;extension=pdo_pgsql\n;extension=pdo_sqlite\n;extension=pgsql\n;extension=pspell\n;extension=shmop\n;extension=snmp\n;extension=soap\n;extension=sockets\n;extension=sqlite3\n;extension=sysvmsg\n;extension=sysvsem\n;extension=sysvshm\n;extension=tidy\n;extension=xmlrpc\n;extension=xsl\nextension=zip\n"
@@ -32,7 +32,7 @@ sed \
 	-r ":a;N;\$!ba;s/; Notes for Windows environments :\n.+;?extension=\w+\n/${extensions}/g" \
 	-i.orig php.ini-production
 sed \
-	-e 's#^;extension_dir = "\./"$#extension_dir = "/usr/lib/php/modules/"#g' \
+	-e 's#^;extension_dir = "\./"$#extension_dir = "/usr/lib/php73/modules/"#g' \
 	-i php.ini-production
 
 diff -u sapi/apache2handler/config.m4.orig sapi/apache2handler/config.m4 | filterdiff --clean --remove-timestamps > ../../apache.patch
diff --git a/php-fpm.patch b/php-fpm.patch
index 5b59de3d7227..2babe4c11081 100644
--- a/php-fpm.patch
+++ b/php-fpm.patch
@@ -18,7 +18,7 @@
  ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
  ; Default Value: none
 -;pid = run/php-fpm.pid
-+;pid = /run/php-fpm/php-fpm.pid
++;pid = /run/php73-fpm/php-fpm.pid
  
  ; Error log file
  ; If it's set to "syslog", log is sent to syslogd instead of being written
@@ -37,7 +37,7 @@
  ;   '/path/to/unix/socket' - to listen on a unix socket.
  ; Note: This value is mandatory.
 -listen = 127.0.0.1:9000
-+listen = /run/php-fpm/php-fpm.sock
++listen = /run/php73-fpm/php-fpm.sock
  
  ; Set listen(2) backlog.
  ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
@@ -68,7 +68,7 @@
  [Service]
  Type=@php_fpm_systemd@
 -PIDFile=@EXPANDED_LOCALSTATEDIR@/run/php-fpm.pid
-+PIDFile=/run/php-fpm/php-fpm.pid
++PIDFile=/run/php73-fpm/php-fpm.pid
  ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf
  ExecReload=/bin/kill -USR2 $MAINPID
  PrivateTmp=true
diff --git a/php-fpm.tmpfiles b/php-fpm.tmpfiles
index 801e74f1e620..dfee161d3e12 100644
--- a/php-fpm.tmpfiles
+++ b/php-fpm.tmpfiles
@@ -1 +1 @@
-d /run/php-fpm 755 root root
+d /run/php73-fpm 755 root root
diff --git a/php.ini.patch b/php.ini.patch
index ce3583410f07..1f843ea97f28 100644
--- a/php.ini.patch
+++ b/php.ini.patch
@@ -5,7 +5,7 @@
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
 -;extension_dir = "./"
-+extension_dir = "/usr/lib/php/modules/"
++extension_dir = "/usr/lib/php73/modules/"
  ; On windows:
  ;extension_dir = "ext"