First fixes, why package all PHP, instead of only the one package we want

2 files changed, 24 insertions, 267 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c33a1af9407..3e44411268e7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,7 @@
 # Generated by mksrcinfo v8
-# Tue May 29 06:49:32 UTC 2018
+# Tue May 29 06:59:46 UTC 2018
 pkgbase = php
+	pkgdesc = A general-purpose scripting language that is especially suited to web development, patched version to not error on large files on 32 bits system
 	pkgver = 7.2.6
 	pkgrel = 1
 	url = http://www.php.net
@@ -31,8 +32,18 @@ pkgbase = php
 	makedepends = freetds
 	makedepends = pcre
 	makedepends = libnsl
-	provides = php
+	depends = libxml2
+	depends = curl
+	depends = libzip
+	depends = pcre
+	depends = argon2
+	provides = php=7.2.6
+	provides = php-ldap=7.2.6
 	conflicts = php
+	conflicts = php-ldap
+	replaces = php
+	replaces = php-ldap
+	backup = etc/php/php.ini
 	source = https://php.net/distributions/php-7.2.6.tar.xz
 	source = https://php.net/distributions/php-7.2.6.tar.xz.asc
 	source = apache.patch
@@ -54,99 +65,3 @@ pkgbase = php
 
 pkgname = php-32-fopen
 
-pkgname = php-cgi
-	pkgdesc = CGI and FCGI SAPI for PHP
-	depends = php
-
-pkgname = php-apache
-	pkgdesc = Apache SAPI for PHP
-	depends = php
-	depends = apache
-	depends = libnsl
-	backup = etc/httpd/conf/extra/php7_module.conf
-
-pkgname = php-fpm
-	pkgdesc = FastCGI Process Manager for PHP
-	depends = php
-	depends = systemd
-	options = !emptydirs
-	backup = etc/php/php-fpm.conf
-	backup = etc/php/php-fpm.d/www.conf
-
-pkgname = php-embed
-	pkgdesc = Embedded PHP SAPI library
-	depends = php
-	depends = libsystemd
-	depends = libnsl
-	options = !emptydirs
-
-pkgname = php-phpdbg
-	pkgdesc = Interactive PHP debugger
-	depends = php
-	options = !emptydirs
-
-pkgname = php-dblib
-	pkgdesc = dblib module for PHP
-	depends = php
-	depends = freetds
-
-pkgname = php-enchant
-	pkgdesc = enchant module for PHP
-	depends = php
-	depends = enchant
-
-pkgname = php-gd
-	pkgdesc = gd module for PHP
-	depends = php
-	depends = gd
-
-pkgname = php-imap
-	pkgdesc = imap module for PHP
-	depends = php
-	depends = c-client
-
-pkgname = php-intl
-	pkgdesc = intl module for PHP
-	depends = php
-	depends = icu
-
-pkgname = php-sodium
-	pkgdesc = sodium module for PHP
-	depends = php
-	depends = libsodium
-
-pkgname = php-odbc
-	pkgdesc = ODBC modules for PHP
-	depends = php
-	depends = unixodbc
-
-pkgname = php-pgsql
-	pkgdesc = PostgreSQL modules for PHP
-	depends = php
-	depends = postgresql-libs
-
-pkgname = php-pspell
-	pkgdesc = pspell module for PHP
-	depends = php
-	depends = aspell
-
-pkgname = php-snmp
-	pkgdesc = snmp module for PHP
-	depends = php
-	depends = net-snmp
-
-pkgname = php-sqlite
-	pkgdesc = sqlite module for PHP
-	depends = php
-	depends = sqlite
-
-pkgname = php-tidy
-	pkgdesc = tidy module for PHP
-	depends = php
-	depends = tidy
-
-pkgname = php-xsl
-	pkgdesc = xsl module for PHP
-	depends = php
-	depends = libxslt
-
diff --git a/PKGBUILD b/PKGBUILD
index 53449a56d953..f8c6ca9c7e7f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,25 +3,7 @@
 # Maintainer of forked PHP package: Marc Cousin <cousinmarc@gmail.com>
 
 pkgbase=php
-pkgname=('php-32-fopen'
-         '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')
+pkgname='php-32-fopen'
 pkgver=7.2.6
 pkgrel=1
 arch=('x86' 'armv7h')
@@ -30,8 +12,6 @@ url='http://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' 'pcre' 'libnsl')
 checkdepends=('procps-ng')
-provides=('php')
-conflicts=('php')
 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')
@@ -47,6 +27,13 @@ sha512sums=('1d49fc6e47d2e86d4fd62396e558965502f44cc8f72459bb0d406e157298cac6770
 validpgpkeys=('B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F'
               '1729F83938DA44E27BA0F4D3DBDB397470D12172')
 
+pkgdesc='A general-purpose scripting language that is especially suited to web development, patched version to not error on large files on 32 bits system'
+depends=('libxml2' 'curl' 'libzip' 'pcre' 'argon2')
+replaces=('php' 'php-ldap')
+conflicts=('php' 'php-ldap')
+provides=("php=${pkgver}" "php-ldap=${pkgver}")
+backup=('etc/php/php.ini')
+
 prepare() {
 	cd ${srcdir}/${pkgbase}-${pkgver}
 
@@ -180,18 +167,13 @@ check() {
 	export NO_INTERACTION=1
 	export SKIP_ONLINE_TESTS=1
 	export SKIP_SLOW_TESTS=1
-
+        # Test don't pass on my armv7h... if ever someone finds the cause, keep
+        # it to be able to reactivate it quickly
 	#${srcdir}/build/sapi/cli/php -n run-tests.php -n -P {tests,Zend}
 	echo 1
 }
 
-package_php() {
-	pkgdesc='A general-purpose scripting language that is especially suited to web development, patched version to not error on large files on 32 bits system'
-	depends=('libxml2' 'curl' 'libzip' 'pcre' 'argon2')
-	replaces=('php-ldap')
-	conflicts=('php-ldap')
-	provides=("php-ldap=${pkgver}")
-	backup=('etc/php/php.ini')
+package() {
 
 	cd ${srcdir}/build
 	make -j1 INSTALL_ROOT=${pkgdir} install-{modules,cli,build,headers,programs,pharcmd}
@@ -206,143 +188,3 @@ package_php() {
 	rmdir ${pkgdir}/usr/include/php/include
 }
 
-package_php-cgi() {
-	pkgdesc='CGI and FCGI SAPI for PHP'
-	depends=('php')
-
-	cd ${srcdir}/build
-	make -j1 INSTALL_ROOT=${pkgdir} install-cgi
-}
-
-package_php-apache() {
-	pkgdesc='Apache SAPI for PHP'
-	depends=('php' 'apache' 'libnsl')
-	backup=('etc/httpd/conf/extra/php7_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
-}
-
-package_php-fpm() {
-	pkgdesc='FastCGI Process Manager for PHP'
-	depends=('php' 'systemd')
-	backup=('etc/php/php-fpm.conf' 'etc/php/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
-}
-
-package_php-embed() {
-	pkgdesc='Embedded PHP SAPI library'
-	depends=('php' 'libsystemd' 'libnsl')
-	options=('!emptydirs')
-
-	cd ${srcdir}/build
-	make -j1 INSTALL_ROOT=${pkgdir} PHP_SAPI=embed install-sapi
-}
-
-package_php-phpdbg() {
-	pkgdesc='Interactive PHP debugger'
-	depends=('php')
-	options=('!emptydirs')
-
-	cd ${srcdir}/build-phpdbg
-	make -j1 INSTALL_ROOT=${pkgdir} install-phpdbg
-}
-
-package_php-dblib() {
-	pkgdesc='dblib module for PHP'
-	depends=('php' 'freetds')
-
-	install -D -m755 ${srcdir}/build/modules/pdo_dblib.so ${pkgdir}/usr/lib/php/modules/pdo_dblib.so
-}
-
-package_php-enchant() {
-	pkgdesc='enchant module for PHP'
-	depends=('php' 'enchant')
-
-	install -D -m755 ${srcdir}/build/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so
-}
-
-package_php-gd() {
-	pkgdesc='gd module for PHP'
-	depends=('php' 'gd')
-
-	install -D -m755 ${srcdir}/build/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
-}
-
-package_php-imap() {
-	pkgdesc='imap module for PHP'
-	depends=('php' 'c-client')
-
-	install -D -m755 ${srcdir}/build/modules/imap.so ${pkgdir}/usr/lib/php/modules/imap.so
-}
-
-package_php-intl() {
-	pkgdesc='intl module for PHP'
-	depends=('php' 'icu')
-
-	install -D -m755 ${srcdir}/build/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so
-}
-
-package_php-sodium() {
-	pkgdesc='sodium module for PHP'
-	depends=('php' 'libsodium')
-
-	install -D -m755 ${srcdir}/build/modules/sodium.so ${pkgdir}/usr/lib/php/modules/sodium.so
-}
-
-package_php-odbc() {
-	pkgdesc='ODBC modules for PHP'
-	depends=('php' '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
-}
-
-package_php-pgsql() {
-	pkgdesc='PostgreSQL modules for PHP'
-	depends=('php' '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
-}
-
-package_php-pspell() {
-	pkgdesc='pspell module for PHP'
-	depends=('php' 'aspell')
-
-	install -D -m755 ${srcdir}/build/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so
-}
-
-package_php-snmp() {
-	pkgdesc='snmp module for PHP'
-	depends=('php' 'net-snmp')
-
-	install -D -m755 ${srcdir}/build/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so
-}
-
-package_php-sqlite() {
-	pkgdesc='sqlite module for PHP'
-	depends=('php' '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
-}
-
-package_php-tidy() {
-	pkgdesc='tidy module for PHP'
-	depends=('php' 'tidy')
-
-	install -D -m755 ${srcdir}/build/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so
-}
-
-package_php-xsl() {
-	pkgdesc='xsl module for PHP'
-	depends=('php' 'libxslt')
-
-	install -D -m755 ${srcdir}/build/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so
-}