[pkgsrc/trunk]: pkgsrc/www/apache2 Modify the apxs(8) script to use ${APR_LIB...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba20be1cb7cf
branches:  trunk
changeset: 484907:ba20be1cb7cf
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Nov 30 23:21:43 2004 +0000

description:
Modify the apxs(8) script to use ${APR_LIBTOOL} as the libtool to
build modules if APR_LIBTOOL is defined in the environment.  Force
the use of the libtool wrapper by module packages by setting APR_LIBTOOL
in apache2/buildlink3.mk.  Bump the PKGREVISION.

diffstat:

 www/apache2/Makefile         |   4 ++--
 www/apache2/buildlink3.mk    |   6 ++++--
 www/apache2/distinfo         |   3 ++-
 www/apache2/patches/patch-ai |  20 ++++++++++++++++++++
 4 files changed, 28 insertions(+), 5 deletions(-)

diffs (75 lines):

diff -r c93fd8d118b9 -r ba20be1cb7cf www/apache2/Makefile
--- a/www/apache2/Makefile      Tue Nov 30 21:21:32 2004 +0000
+++ b/www/apache2/Makefile      Tue Nov 30 23:21:43 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.58 2004/11/26 23:07:58 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2004/11/30 23:21:43 jlam Exp $
 
 .include "Makefile.common"
 
 PKGNAME=               apache-${APACHE_VERSION}
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            www
 
 HOMEPAGE=              http://httpd.apache.org/
diff -r c93fd8d118b9 -r ba20be1cb7cf www/apache2/buildlink3.mk
--- a/www/apache2/buildlink3.mk Tue Nov 30 21:21:32 2004 +0000
+++ b/www/apache2/buildlink3.mk Tue Nov 30 23:21:43 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/11/23 20:17:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/11/30 23:21:44 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+
@@ -20,7 +20,9 @@
 .  endif
 .endif # APACHE_BUILDLINK3_MK
 
-USE_PERL5?=    build   # for "apxs"
+USE_PERL5?=    build                   # for "apxs"
+CONFIGURE_ENV+=        APR_LIBTOOL=${LIBTOOL}  # make apxs use the libtool we specify
+MAKE_ENV+=     APR_LIBTOOL=${LIBTOOL}
 APXS?=         ${BUILDLINK_PREFIX.apache}/sbin/apxs
 
 .if !empty(APACHE_BUILDLINK3_MK:M+)
diff -r c93fd8d118b9 -r ba20be1cb7cf www/apache2/distinfo
--- a/www/apache2/distinfo      Tue Nov 30 21:21:32 2004 +0000
+++ b/www/apache2/distinfo      Tue Nov 30 23:21:43 2004 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.31 2004/11/26 23:07:59 jlam Exp $
+$NetBSD: distinfo,v 1.32 2004/11/30 23:21:44 jlam Exp $
 
 SHA1 (httpd-2.0.52.tar.gz) = 2a22fde052adc7d7258f999cd7dd8a7592ff36e7
 Size (httpd-2.0.52.tar.gz) = 6918995 bytes
 SHA1 (patch-aa) = 8ff497da17144d191e633d59274bf2f7e0e7c08c
 SHA1 (patch-ad) = 27fa3655d6ba4840296e79fa6fd96cd9de79a33a
 SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
+SHA1 (patch-ai) = d728490b66032d8bb2aa8d4ccdeca3d45f7c2b08
 SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215
 SHA1 (patch-al) = 29cc52616c50b7ec998339cca386112a8f1611cc
 SHA1 (patch-am) = ff60a7b69ad949363ebec194141e9b95cb796426
diff -r c93fd8d118b9 -r ba20be1cb7cf www/apache2/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/apache2/patches/patch-ai      Tue Nov 30 23:21:43 2004 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ai,v 1.6 2004/11/30 23:21:44 jlam Exp $
+
+--- support/apxs.in.orig       2004-02-09 15:59:49.000000000 -0500
++++ support/apxs.in
+@@ -337,9 +337,12 @@ if (! -x "$apu_bindir/apu-config") {
+     exit(1);
+ }
+ 
+-my $libtool = `$apr_bindir/apr-config --installbuilddir`;
+-chomp($libtool);
+-$libtool = "$libtool/libtool";
++my $libtool = $ENV{'APR_LIBTOOL'};
++unless ($libtool) {
++      $libtool = `$apr_bindir/apr-config --installbuilddir`;
++      chomp($libtool);
++      $libtool = "$libtool/libtool";
++}
+ 
+ my $apr_includedir = `$apr_bindir/apr-config --includes`;
+ chomp($apr_includedir);