[pkgsrc/trunk]: pkgsrc/www/apache Fix httpd linkage on DragonFly: -Wl,-E is n...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d741333c2d23
branches:  trunk
changeset: 505899:d741333c2d23
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jan 09 00:51:03 2006 +0000

description:
Fix httpd linkage on DragonFly: -Wl,-E is needed, otherwise ap-php
can't use ap_block_alarms. Bump revision.

Problem noticed by Justin Sherrill on DragonFly's bugs list.

diffstat:

 www/apache/Makefile         |   4 ++--
 www/apache/distinfo         |   5 +++--
 www/apache/patches/patch-al |  19 +++++++++++++++++--
 www/apache/patches/patch-aq |  14 ++++++++++++++
 4 files changed, 36 insertions(+), 6 deletions(-)

diffs (87 lines):

diff -r 7ef0ba204df3 -r d741333c2d23 www/apache/Makefile
--- a/www/apache/Makefile       Sun Jan 08 23:00:00 2006 +0000
+++ b/www/apache/Makefile       Mon Jan 09 00:51:03 2006 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.179 2006/01/05 22:32:40 joerg Exp $
+# $NetBSD: Makefile,v 1.180 2006/01/09 00:51:03 joerg Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
 
 DISTNAME=              apache_1.3.34
 PKGNAME=               ${DISTNAME:S/_/-/}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            www
 MASTER_SITES=          ${MASTER_SITE_APACHE:=httpd/} \
                        ${MASTER_SITE_APACHE:=httpd/old/}
diff -r 7ef0ba204df3 -r d741333c2d23 www/apache/distinfo
--- a/www/apache/distinfo       Sun Jan 08 23:00:00 2006 +0000
+++ b/www/apache/distinfo       Mon Jan 09 00:51:03 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.48 2005/12/15 12:57:30 tron Exp $
+$NetBSD: distinfo,v 1.49 2006/01/09 00:51:03 joerg Exp $
 
 SHA1 (apache_1.3.34.tar.gz) = df082b73f1220555dc416c0c5afa746e30a9e0de
 RMD160 (apache_1.3.34.tar.gz) = e39dfc57b7f9164aa76641de3fa74f0314c9ec9e
@@ -20,7 +20,8 @@
 SHA1 (patch-ai) = e2e48f48bec8cba85345e31541d4e4ddcc30e799
 SHA1 (patch-aj) = ac7337b51d7d4ca25cef4020961736404ec79f01
 SHA1 (patch-ak) = 1be52fb5fca6c05c7cf489de541e0d52383ee43a
-SHA1 (patch-al) = f9d329ca9465af0254f76d732f80ed4bf57a846a
+SHA1 (patch-al) = 9e0ce66bab4503399f119269fb89bfed95e0c045
 SHA1 (patch-am) = b8551fca1ec8a62b3b420435479a896a7de1dfe0
 SHA1 (patch-ao) = 9ec5f32b2e9cf4c423b5d819fc76f652b27c6c29
 SHA1 (patch-ap) = 90ac139c91dcc45abb04e9496273f2ef4742d260
+SHA1 (patch-aq) = aee36110e604f990a1b017268810a28358c90178
diff -r 7ef0ba204df3 -r d741333c2d23 www/apache/patches/patch-al
--- a/www/apache/patches/patch-al       Sun Jan 08 23:00:00 2006 +0000
+++ b/www/apache/patches/patch-al       Mon Jan 09 00:51:03 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.6 2005/08/22 16:19:00 reed Exp $
+$NetBSD: patch-al,v 1.7 2006/01/09 00:51:03 joerg Exp $
 
 --- src/Configure.orig 2005-08-22 08:43:51.000000000 -0700
 +++ src/Configure      2005-08-22 08:46:05.000000000 -0700
-@@ -465,6 +465,14 @@
+@@ -465,6 +465,14 @@ case "$PLAT" in
        DBM_LIB=""
        DB_LIB=""
        ;;
@@ -17,3 +17,18 @@
      *-openbsd*)
        OS='OpenBSD'
        DBM_LIB=""
+@@ -1110,6 +1118,14 @@ if [ "x$using_shlib" = "x1" ] ; then
+           esac
+           LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
+           ;;
++      *-dragonfly*)
++          LD_SHLIB="gcc"
++          CFLAGS_SHLIB="-fPIC -DPIC"
++          LDFLAGS_SHLIB="-shared"
++          LDFLAGS_SHLIB_EXPORT="-Wl,-E"
++          LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
++          SHLIB_SUFFIX_DEPTH=2
++          ;;
+       *-netbsd*)
+           CFLAGS_SHLIB="-fPIC -DPIC"
+           if echo __ELF__ | ${CC} -E - | grep -q __ELF__; then
diff -r 7ef0ba204df3 -r d741333c2d23 www/apache/patches/patch-aq
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/apache/patches/patch-aq       Mon Jan 09 00:51:03 2006 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-aq,v 1.5 2006/01/09 00:51:03 joerg Exp $
+
+--- src/helpers/GuessOS.orig   2006-01-09 00:27:33.000000000 +0000
++++ src/helpers/GuessOS
+@@ -172,6 +172,9 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+       FREEBSDVERS=`echo ${RELEASE}|sed -e 's/[-(].*//'`
+       echo "${MACHINE}-whatever-freebsd${FREEBSDVERS}"; exit 0
+       ;;
++    DragonFly:*)
++      echo "${MACHINE}-whatever-dragonfly"; exit 0
++      ;;
+ 
+     NetBSD:*:*:*486*)
+       echo "i486-whatever-netbsd"; exit 0