Merge remote-tracking branch 'x/master'

* x/master:
  apache: update to 2.2.22.

srcpkgs/apache-mpm-event/template

@@ -10,7 +10,6 @@ unset post_install pre_configure run_depends
 # Override some vars.
 pkgname=apache-mpm-event
 configure_args="${configure_args} --enable-modules= --prefix=/usr --with-mpm=event"
-revision=3
 short_desc="Apache HTTP Server - event driven model"
 long_desc="
  Each Apache Multi-Processing Module provides a different flavor of web

srcpkgs/apache-mpm-worker/template

@@ -10,7 +10,6 @@ unset post_install pre_configure run_depends
 # Override some vars.
 pkgname=apache-mpm-worker
 configure_args="${configure_args} --enable-modules= --prefix=/usr --with-mpm=worker"
-revision=3
 short_desc="Apache HTTP Server - high speed threaded mode"
 long_desc="
  Each Apache Multi-Processing Module provides a different flavor of web

srcpkgs/apache/apache-devel.template

@@ -13,14 +13,9 @@ Add_dependency run apr-util-devel
 Add_dependency run apache
 Add_dependency run perl			">=0"
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/sbin ${DESTDIR}/usr/share/man/man8
-	mkdir -p ${DESTDIR}/usr/share/apache-httpd
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/share/apache-httpd/build \
-		${DESTDIR}/usr/share/apache-httpd
-	mv ${SRCPKGDESTDIR}/usr/sbin/apxs ${DESTDIR}/usr/sbin
-	mv ${SRCPKGDESTDIR}/usr/share/man/man8/apxs* \
-		${DESTDIR}/usr/share/man/man8
+do_install() {
+	vmove usr/include usr
+	vmove usr/share/apache-httpd/build usr/share/apache-httpd
+	vmove usr/sbin/apxs usr/sbin
+	vmove "usr/share/man/man1/apxs*" usr/share/man/man1
 }

srcpkgs/apache/template

@@ -1,6 +1,6 @@
 # Template file for 'apache'
 pkgname=apache
-version=2.2.21
+version=2.2.22
 wrksrc=httpd-${version}
 distfiles="http://www.apache.org/dist/httpd/httpd-${version}.tar.bz2"
 build_style=gnu-configure
@@ -19,12 +19,11 @@ configure_args="--prefix= --enable-pie --enable-modules=all
 --enable-dav --enable-info --enable-cgi --enable-cgid --enable-dav-fs
 --enable-dav-lock --enable-vhost-alias --enable-imagemap --enable-so
 --enable-rewrite --with-pcre=/usr --enable-layout=XBPS --sysconfdir=/etc/httpd"
-revision=4
 short_desc="The Number One HTTP Server On The Internet"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://httpd.apache.org/"
 license="Apache-2.0"
-checksum=18d5591fe48cfbac44fc20316036ffe17456df60bc3a2aaad238d56c6445577f
+checksum=dcdc9f1dc722f84798caf69d69dca78daa5e09a4269060045aeca7e4f44cb231
 long_desc="
  The Apache HTTP Server Project is an effort to develop and maintain an
  open-source HTTP server for modern operating systems including UNIX and