From 51b97e6ace2a6b97bd68b1248ee867a87bb913e3 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sun, 1 May 2016 09:15:58 +0200
Subject: [PATCH] php: sync with apache; and serve from /srv/www by default.

---
 srcpkgs/php/patches/php.ini.patch | 2 +-
 srcpkgs/php/template              | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/php/patches/php.ini.patch b/srcpkgs/php/patches/php.ini.patch
index 8d09b9f2355..ce6f34cc453 100644
--- a/srcpkgs/php/patches/php.ini.patch
+++ b/srcpkgs/php/patches/php.ini.patch
@@ -5,7 +5,7 @@
  ; or per-virtualhost web server configuration file.
  ; http://php.net/open-basedir
 -;open_basedir =
-+open_basedir = /srv/http/:/srv/httpd/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/
++open_basedir = /srv/www/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/
  
  ; This directive allows you to disable certain functions for security reasons.
  ; It receives a comma-delimited list of function names.
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index e75c8b41a75..391fb0174cf 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template build file for 'php'
 pkgname=php
 version=7.0.6
-revision=1
+revision=2
 short_desc="An HTML-embedded scripting language"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="PHP"
@@ -164,10 +164,10 @@ php-cgi_package() {
 php-apache_package() {
 	short_desc+=' - Apache SAPI'
 	depends="php-${version}_${revision}"
-	conf_files="/etc/httpd/extra/php7_module.conf"
+	conf_files="/etc/apache/extra/php7_module.conf"
 	pkg_install() {
 		vinstall ${wrksrc}/build-apache/libs/libphp7.so 755 usr/libexec/httpd/modules
-		vinstall ${FILESDIR}/apache.conf 644 etc/httpd/extra php7_module.conf
+		vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra php7_module.conf
 	}
 }