summaryrefslogtreecommitdiff
path: root/www/apache22
diff options
context:
space:
mode:
authorsborrill <sborrill@pkgsrc.org>2007-02-25 00:02:35 +0000
committersborrill <sborrill@pkgsrc.org>2007-02-25 00:02:35 +0000
commitd90f8ad5635a27b686cae26b41ea770b5a70dc29 (patch)
tree67402da72ff8c05276df4579903626eca23f8af4 /www/apache22
parentad6c4b908e8d549e060e88de3a052d556a1b4a15 (diff)
downloadpkgsrc-d90f8ad5635a27b686cae26b41ea770b5a70dc29.tar.gz
apr-config is called apr-1-config now.
Diffstat (limited to 'www/apache22')
-rw-r--r--www/apache22/Makefile4
-rw-r--r--www/apache22/distinfo4
-rw-r--r--www/apache22/patches/patch-ai4
3 files changed, 6 insertions, 6 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 6f81a8f9280..c384a1ac719 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2007/02/02 18:06:27 sborrill Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/25 00:02:35 sborrill Exp $
.include "Makefile.common"
PKGNAME= apache-${APACHE_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= www
HOMEPAGE= http://httpd.apache.org/
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index 03f38716e0a..9d7782a7e15 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2007/02/02 18:06:27 sborrill Exp $
+$NetBSD: distinfo,v 1.4 2007/02/25 00:02:35 sborrill Exp $
SHA1 (httpd-2.2.4.tar.bz2) = 64ceae373434a986dc99b8ed953afa0d4fad85ce
RMD160 (httpd-2.2.4.tar.bz2) = bb6e8a7447fa8e8f629010f30b548068de518523
@@ -9,6 +9,6 @@ SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad
SHA1 (patch-ad) = 088d6ff0e7a8acfe70b4f85a6ce58d42c935fd13
SHA1 (patch-ae) = 86b307d6eefef232b6223afc3f69e64be40bd913
SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
-SHA1 (patch-ai) = bab6e2491264edde714c075efb037438216d6e14
+SHA1 (patch-ai) = 4ebc3bd580a298973928eb6d13d2ce745eac0312
SHA1 (patch-al) = 56b9f5c2f6fd01fe5067f9210e328cbf674c68f1
SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08
diff --git a/www/apache22/patches/patch-ai b/www/apache22/patches/patch-ai
index bc302fcdc9c..9260dba3181 100644
--- a/www/apache22/patches/patch-ai
+++ b/www/apache22/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.2 2007/02/02 18:06:27 sborrill Exp $
+$NetBSD: patch-ai,v 1.3 2007/02/25 00:02:35 sborrill Exp $
--- support/apxs.in.orig 2006-12-08 18:41:57.000000000 +0100
+++ support/apxs.in 2006-12-08 18:43:44.000000000 +0100
@@ -10,7 +10,7 @@ $NetBSD: patch-ai,v 1.2 2007/02/02 18:06:27 sborrill Exp $
-chomp($libtool);
+my $libtool = $ENV{'APR_LIBTOOL'};
+unless ($libtool) {
-+ $libtool = `@LOCALBASE@/bin/apr-config --installbuilddir`;
++ $libtool = `@LOCALBASE@/bin/apr-1-config --installbuilddir`;
+ chomp($libtool);
+ $libtool = "$libtool/libtool";
+}