From 7f3e5b5893ac2433f586bafd11ede98e371aa0db Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Fri, 27 Nov 2009 13:28:11 +0000
Subject: Call the real shlibtool, not some non-existing copy. Bump revision.

---
 www/apache2/Makefile         |  4 ++--
 www/apache2/distinfo         |  4 ++--
 www/apache2/patches/patch-ac | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'www')

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index e7025d1d4f6..a49b0248b16 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.129 2009/08/12 04:18:27 taca Exp $
+# $NetBSD: Makefile,v 1.130 2009/11/27 13:28:11 joerg Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	apache-${APACHE_VERSION}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www
 
 HOMEPAGE=	http://httpd.apache.org/
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index 4cfbf475ddc..bbe408edb97 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.55 2009/09/04 18:55:33 wiz Exp $
+$NetBSD: distinfo,v 1.56 2009/11/27 13:28:11 joerg Exp $
 
 SHA1 (httpd-2.0.63.tar.bz2) = 20e2b64944e38e96491af788a37cb709d2c5b755
 RMD160 (httpd-2.0.63.tar.bz2) = f6a7de59860f627ac40b245fcf742fb07e1b4870
 Size (httpd-2.0.63.tar.bz2) = 4587670 bytes
 SHA1 (patch-aa) = bff1ef591f5361e7169ff9005dcf86437b9dac23
 SHA1 (patch-ab) = 387892276efd49fd081a187c1123de26fb6486ba
-SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad
+SHA1 (patch-ac) = a8196a399d81f97333347dd7234d9eae2bd038ea
 SHA1 (patch-ad) = 088d6ff0e7a8acfe70b4f85a6ce58d42c935fd13
 SHA1 (patch-ae) = dda7fbd2561486b15b8436c47ccf1d4f9afa5df0
 SHA1 (patch-af) = 8400ae084e31026e9d8143a0246aa3e65166f380
diff --git a/www/apache2/patches/patch-ac b/www/apache2/patches/patch-ac
index 9ae4e70c69e..feb36cc3c37 100644
--- a/www/apache2/patches/patch-ac
+++ b/www/apache2/patches/patch-ac
@@ -1,8 +1,17 @@
-$NetBSD: patch-ac,v 1.6 2005/10/17 10:37:11 tron Exp $
+$NetBSD: patch-ac,v 1.7 2009/11/27 13:28:11 joerg Exp $
 
---- configure.orig	2005-10-09 18:34:38.000000000 -0700
+--- configure.orig	2008-01-10 17:49:36.000000000 +0100
 +++ configure
-@@ -17086,7 +17086,6 @@ cat >>confdefs.h <<_ACEOF
+@@ -5253,7 +5253,7 @@ case $host in
+               LTCFLAGS="-prefer-non-pic -static"
+               ;;
+           *)
+-              SH_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool $(LTFLAGS)'
++              SH_LIBTOOL='shlibtool'
+               SHLTCFLAGS=""
+               LTCFLAGS=""
+               ;;
+@@ -18939,7 +18939,6 @@ cat >>confdefs.h <<_ACEOF
  _ACEOF
  
  
-- 
cgit v1.2.3