# HG changeset patch
# User Eric Joseph-Alexandre <erjo@slitaz.org>
# Date 1374060684 -7200
# Node ID 390a5a938ba6a649140318b341fda2593c6a0353
# Parent  62b209782f2dc1a6df5500487486d0e70f081acb
(Up: Apache (2.4.4)

diff -r 62b209782f2d -r 390a5a938ba6 apache-dev/receipt
--- a/apache-dev/receipt	Wed Jul 17 13:30:02 2013 +0200
+++ b/apache-dev/receipt	Wed Jul 17 13:31:24 2013 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="apache-dev"
-VERSION="2.2.22"
+VERSION="2.4.4"
 CATEGORY="development"
 SHORT_DESC="HTTP server development files."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 62b209782f2d -r 390a5a938ba6 apache-doc/receipt
--- a/apache-doc/receipt	Wed Jul 17 13:30:02 2013 +0200
+++ b/apache-doc/receipt	Wed Jul 17 13:31:24 2013 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="apache-doc"
-VERSION="2.2.22"
+VERSION="2.4.4"
 CATEGORY="development"
 SHORT_DESC="HTTP server documentation files."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 62b209782f2d -r 390a5a938ba6 apache/receipt
--- a/apache/receipt	Wed Jul 17 13:30:02 2013 +0200
+++ b/apache/receipt	Wed Jul 17 13:31:24 2013 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="apache"
-VERSION="2.2.22"
+VERSION="2.4.4"
 CATEGORY="network"
 SHORT_DESC="Secure, efficient and extensible HTTP server."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -23,8 +23,11 @@
 	cd $src
 	grep -q Slitaz config.layout || \
 		cat $stuff/slitaz.layout >> config.layout
-	./configure --mandir=/usr/share/man --enable-mods-shared=all \
-		--enable-proxy --enable-ssl \
+	./configure --mandir=/usr/share/man \
+		--with-program-name=apache \
+		--enable-mods-shared=all \
+		--enable-proxy \
+		--enable-ssl \
 		--enable-layout=Slitaz $CONFIGURE_ARGS &&
 	make $MAKEFLAGS && make DESTDIR=$DESTDIR install
 }
@@ -52,8 +55,8 @@
 		-e 's|#Include /etc/apache/extra/httpd-ssl.conf|Include /etc/apache/extra/httpd-ssl.conf|' \
 		-e 's|/etc/apache/server.crt|/etc/ssl/apache/apache.pem|' \
 		-e 's|/etc/apache/server.key|/etc/ssl/apache/apache.pem|' \
-		$fs/etc/apache/httpd.conf $fs/etc/apache/extra/httpd-ssl.conf
-	echo "Include /etc/apache/conf.d" >> $fs/etc/apache/httpd.conf
+		$fs/etc/apache/apache.conf $fs/etc/apache/extra/httpd-ssl.conf
+	echo "Include /etc/apache/conf.d" >> $fs/etc/apache/apache.conf
 }
 
 # Pre and post install commands for Tazpkg.
diff -r 62b209782f2d -r 390a5a938ba6 apache/stuff/apache
--- a/apache/stuff/apache	Wed Jul 17 13:30:02 2013 +0200
+++ b/apache/stuff/apache	Wed Jul 17 13:31:24 2013 +0200
@@ -8,13 +8,13 @@
 
 NAME=Apache
 DESC="Apache Web Server"
-DAEMON=/usr/bin/httpd
+DAEMON=/usr/bin/apache
 OPTIONS=
-PIDFILE=/var/run/apache/httpd.pid
+PIDFILE=/var/run/apache/apache.pid
 
 case "$1" in
   start)
-    if active_pidfile $PIDFILE httpd ; then
+    if active_pidfile $PIDFILE apache ; then
       echo "$NAME already running."
       exit 1
     fi
@@ -23,7 +23,7 @@
     status
     ;;
   stop)
-    if ! active_pidfile $PIDFILE httpd ; then
+    if ! active_pidfile $PIDFILE apache ; then
       echo "$NAME is not running."
       exit 1
     fi
@@ -33,7 +33,7 @@
     status
     ;;
   reload)
-    if ! active_pidfile $PIDFILE httpd ; then
+    if ! active_pidfile $PIDFILE apache ; then
       echo "$NAME is not running."
       exit 1
     fi
@@ -42,7 +42,7 @@
     status
     ;;
   restart)
-    if ! active_pidfile $PIDFILE httpd ; then
+    if ! active_pidfile $PIDFILE apache ; then
       echo "$NAME is not running."
       exit 1
     fi
diff -r 62b209782f2d -r 390a5a938ba6 apache/stuff/slitaz.layout
--- a/apache/stuff/slitaz.layout	Wed Jul 17 13:30:02 2013 +0200
+++ b/apache/stuff/slitaz.layout	Wed Jul 17 13:31:24 2013 +0200
@@ -13,10 +13,10 @@
     iconsdir:        /usr/share/apache/icons
     htdocsdir:       /var/www
     manualdir:       /usr/share/doc/apache
-    cgidir:          /var/www/cgi-bin
+    cgidir:          /var/lib/apache/cgi-bin
     includedir:      /usr/include
     localstatedir:   /var/lib/apache
     runtimedir:      /var/run/apache
     logfiledir:      /var/log/apache
-    proxycachedir:   /var/lib/apache/proxy
+    proxycachedir:   /var/cache/apache/proxy
 </Layout>