Tue Mar 11 03:48:52 UTC 2014

2 files changed, 31 insertions, 22 deletions

diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD
index 1e9ace8d7..fd7b03f4e 100644
--- a/extra/apache/PKGBUILD
+++ b/extra/apache/PKGBUILD
@@ -1,30 +1,40 @@
-# $Id: PKGBUILD 207109 2014-03-06 21:41:15Z anatolik $
+# $Id: PKGBUILD 207472 2014-03-10 15:55:51Z anatolik $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apache
 pkgver=2.4.7
-pkgrel=1
+pkgrel=2
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'
 license=('APACHE')
-backup=(etc/httpd/conf/httpd.conf
-        etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
-        etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
-        etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
-	etc/httpd/conf/extra/proxy-html.conf
-	etc/httpd/conf/{mime.types,magic}
-        etc/logrotate.d/httpd)
-depends=('openssl' 'zlib' 'apr-util' 'pcre' 'systemd')
-optdepends=('lynx: apachectl status')
+backup=(
+    etc/httpd/conf/httpd.conf
+    etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
+    etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
+    etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
+    etc/httpd/conf/extra/proxy-html.conf
+    etc/httpd/conf/{mime.types,magic}
+    etc/logrotate.d/httpd
+)
+depends=('zlib' 'apr-util' 'pcre')
+makedepends=('libxml2' 'lua' 'openssl')
+optdepends=(
+    'lua: for mod_lua support'
+    'openssl: for mod_ssl support'
+    'libxml2: for mod_xml2enc support' 
+    'lynx: apachectl status'
+)
 install=apache.install
-source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
-        apache.tmpfiles.conf
-        httpd.logrotate
-        httpd.service
-        arch.layout)
+source=(
+    http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
+    apache.tmpfiles.conf
+    httpd.logrotate
+    httpd.service
+    arch.layout
+)
 sha256sums=('64368d8301836815ae237f2b62d909711c896c1bd34573771e0ee5ad808ce71b'
             'SKIP'
             '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
@@ -57,10 +67,11 @@ build() {
       --enable-ldap --enable-authnz-ldap \
       --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \
       --enable-ssl --with-ssl \
-      --enable-deflate --enable-cgid \
+      --enable-deflate --enable-cgi --enable-cgid \
       --enable-proxy --enable-proxy-connect \
       --enable-proxy-http --enable-proxy-ftp \
-      --enable-dbd \
+      --enable-dbd --enable-imagemap --enable-ident --enable-cern-meta \
+      --enable-lua --enable-xml2enc \
       --with-apr=/usr/bin/apr-1-config \
       --with-apr-util=/usr/bin/apu-1-config \
       --with-pcre=/usr
@@ -73,11 +84,9 @@ package() {
 
   make DESTDIR="${pkgdir}" install
    
-  install -D -m755 httpd "${pkgdir}/usr/bin/httpd"
   install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd"
   install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf"
   install -D -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/httpd.service"	
-
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
   # symlinks for /etc/httpd
diff --git a/extra/apache/apache.install b/extra/apache/apache.install
index d85194623..3ca8cfcee 100644
--- a/extra/apache/apache.install
+++ b/extra/apache/apache.install
@@ -1,9 +1,9 @@
 post_install() {
-  systemd-tmpfiles --create apache.conf
+  type -P systemd-tmpfiles >/dev/null && systemd-tmpfiles --create apache.conf
 }
 
 post_upgrade() {
-  systemd-tmpfiles --create apache.conf
+  type -P systemd-tmpfiles >/dev/null && systemd-tmpfiles --create apache.conf
 
   if [[ $2 == 2\.2\.* ]]; then
     # it is a major upgrade, show a useful link to upgrade instructions