From 2e05b0f65a05ac902532b2b324e9d437054b644a Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xssn.at>
Date: Mon, 1 Mar 2010 16:33:59 +0100
Subject: update

Signed-off-by: Florian Pritz <bluewind@xssn.at>
---
 apache/PKGBUILD | 14 ++++++--------
 apache/httpd    | 44 ++++++++++++++++++--------------------------
 murmur/PKGBUILD |  5 +++++
 3 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/apache/PKGBUILD b/apache/PKGBUILD
index 9615c82..4142d78 100644
--- a/apache/PKGBUILD
+++ b/apache/PKGBUILD
@@ -18,10 +18,12 @@ backup=(etc/httpd/conf/httpd.conf
 depends=('openssl' 'zlib' 'apr-util' 'pcre')
 optdepends=('lynx: apachectl status')
 source=("http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2"
-        'httpd.logrotate' 'httpd' 'arch.layout')
+        'httpd.logrotate'
+	'httpd'
+	'arch.layout')
 md5sums=('a5226203aaf97e5b941c41a71c112704'
          'f4d627c64024c1b7b95efb5ffbaa625e'
-         '3fb8b616e0b5f0118420edd26d8536bb'
+         '9e001fbb082a08113e7f4bc431085c11'
          '3d659d41276ba3bfcb20c231eb254e0c')
 
 build() {
@@ -79,10 +81,6 @@ build() {
 	# cleanup
 	rm -rf ${pkgdir}/usr/share/httpd/manual
 	rm -rf ${pkgdir}/etc/httpd/conf/original
-	rm -rf ${pkgdir}/srv/http
-	rmdir ${pkgdir}/usr/bin
+	rm -rf ${pkgdir}/srv/
+	rm -rf ${pkgdir}/usr/bin
 }
-md5sums=('a5226203aaf97e5b941c41a71c112704'
-         'f4d627c64024c1b7b95efb5ffbaa625e'
-         'ac992b7d9f6dfc71a75e56a8e33f6ca8'
-         '3d659d41276ba3bfcb20c231eb254e0c')
diff --git a/apache/httpd b/apache/httpd
index 46ead71..65ccb6e 100755
--- a/apache/httpd
+++ b/apache/httpd
@@ -5,59 +5,51 @@ daemon_name=httpd
 . /etc/rc.conf
 . /etc/rc.d/functions
 
+APACHECTL=/usr/sbin/apachectl
 
 case "$1" in
   start)
     stat_busy "Starting Apache Web Server"
-    # RUN
-    /usr/sbin/apachectl start &>/dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
+    [ ! -d /var/run/httpd ] && install -d /var/run/httpd
+    if $APACHECTL start &>/dev/null ; then
       add_daemon $daemon_name
       stat_done
+    else
+      stat_fail
+      exit 1
     fi
     ;;
 
   stop)
     stat_busy "Stopping Apache Web Server"
-    # KILL
-    /usr/sbin/apachectl stop &>/dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
+    if $APACHECTL stop &>/dev/null ; then
       rm_daemon $daemon_name
       stat_done
+    else
+      stat_fail
+      exit 1
     fi
     ;;
 
   reload)
-    apachectl -t || exit 1
     stat_busy "Reloading Apache Web Server"
-    /usr/sbin/apachectl graceful &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
+    if $APACHECTL graceful &>/dev/null ; then
       add_daemon $daemon_name
       stat_done
+    else
+      stat_fail
+      exit 1
     fi
     ;;
 
   restart)
-    apachectl -t || exit 1
     stat_busy "Restarting Apache Web Server"
-    /usr/sbin/apachectl restart &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
+    if $APACHECTL restart &>/dev/null ; then
       add_daemon $daemon_name
       stat_done
+    else
+      stat_fail
+      exit 1
     fi
     ;;
 
diff --git a/murmur/PKGBUILD b/murmur/PKGBUILD
index a906c62..f9ce48a 100644
--- a/murmur/PKGBUILD
+++ b/murmur/PKGBUILD
@@ -55,3 +55,8 @@ md5sums=('94b59aef3233b91705fa8cfcdd04d3e1'
          '11c1cc875e8021739ec2087252cf0533'
          'eddea4cdbd0bde4b960a67e16b5d5478'
          'c56726cb267ead68f37f35c28e36e6fa')
+md5sums=('94b59aef3233b91705fa8cfcdd04d3e1'
+         'f13b927a1a18115199f8305c8aad330e'
+         '11c1cc875e8021739ec2087252cf0533'
+         'eddea4cdbd0bde4b960a67e16b5d5478'
+         'c56726cb267ead68f37f35c28e36e6fa')
-- 
cgit v1.2.3-24-g4f1b