diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-01 15:13:07 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-01 15:13:07 -0300 |
| commit | 11dd742b39ac10b320183f78d2cf81e4680f9a4e (patch) | |
| tree | d6150b2fd3f3127e1aa88e173e17a4f1ad205f75 /extra/apache | |
| parent | 1365d8aac05d2f167d0a1678cc291bbec3efff5c (diff) | |
| parent | c40a217db5f63be3aa88a32ad77ec93efb40d95c (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/mhwaveedit/PKGBUILD
extra/apr/PKGBUILD
extra/xorg-server/PKGBUILD
kde-unstable/calligra/PKGBUILD
libre/unarchiver/PKGBUILD
Diffstat (limited to 'extra/apache')
| -rw-r--r-- | extra/apache/PKGBUILD | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index 95e752b63..48aa125fe 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 123392 2011-05-10 21:15:00Z foutrelis $ +# $Id: PKGBUILD 125827 2011-05-30 09:46:57Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apache -pkgver=2.2.17 -pkgrel=3 +pkgver=2.2.19 +pkgrel=1 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64' 'mips64el') options=('!libtool') @@ -35,7 +35,7 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 httpd.logrotate httpd arch.layout) -md5sums=('16eadc59ea6b38af33874d300973202e' +md5sums=('832f96a6ec4b8fc7cf49b9efd4e89060' 'f1d9d41360908ceb2374da55ae99197a' 'cdfa04985a0efa850976aef01c2a0c40' '0930d2d0612eb0a53a0d00aea7e8687f' @@ -66,6 +66,9 @@ build() { for mpm in prefork worker itk; do if [ "${mpm}" = "itk" ]; then + # Fix patch to apply with latest Apache version + sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch" + mkdir -p server/mpm/experimental/itk cp -r server/mpm/prefork/* server/mpm/experimental/itk/ mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c |