From ff602b32d07e6572460785d80cbb2ce1ceaa3ffe Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 1 Feb 2012 20:38:21 +0100 Subject: [PATCH] apache: update to 2.2.22. --- srcpkgs/apache-mpm-event/template | 1 - srcpkgs/apache-mpm-worker/template | 1 - srcpkgs/apache/apache-devel.template | 15 +++++---------- srcpkgs/apache/template | 5 ++--- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/srcpkgs/apache-mpm-event/template b/srcpkgs/apache-mpm-event/template index 84345ab1ef0..b27370ccbb7 100644 --- a/srcpkgs/apache-mpm-event/template +++ b/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 diff --git a/srcpkgs/apache-mpm-worker/template b/srcpkgs/apache-mpm-worker/template index cff9257c000..104178f0d64 100644 --- a/srcpkgs/apache-mpm-worker/template +++ b/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 diff --git a/srcpkgs/apache/apache-devel.template b/srcpkgs/apache/apache-devel.template index 6d8ea4d0914..6d682936a39 100644 --- a/srcpkgs/apache/apache-devel.template +++ b/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 } diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index 4edd4d5762b..0114508323c 100644 --- a/srcpkgs/apache/template +++ b/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 " 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