[pkgsrc/trunk]: pkgsrc/www/apache Link with CC like other platforms. Fixes mo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/724967fe0910
branches:  trunk
changeset: 604361:724967fe0910
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue May 29 20:23:12 2012 +0000

description:
Link with CC like other platforms. Fixes module build with Clang.

diffstat:

 www/apache/Makefile         |   4 ++--
 www/apache/distinfo         |   4 ++--
 www/apache/patches/patch-al |  18 +++++++++++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diffs (72 lines):

diff -r bd7aec80b595 -r 724967fe0910 www/apache/Makefile
--- a/www/apache/Makefile       Tue May 29 20:18:28 2012 +0000
+++ b/www/apache/Makefile       Tue May 29 20:23:12 2012 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.200 2012/01/18 14:48:32 adam Exp $
+# $NetBSD: Makefile,v 1.201 2012/05/29 20:23:12 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.42
 PKGNAME=               ${DISTNAME:S/_/-/}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            www
 MASTER_SITES=          ${MASTER_SITE_APACHE:=httpd/} \
                        ${MASTER_SITE_APACHE:=httpd/old/}
diff -r bd7aec80b595 -r 724967fe0910 www/apache/distinfo
--- a/www/apache/distinfo       Tue May 29 20:18:28 2012 +0000
+++ b/www/apache/distinfo       Tue May 29 20:23:12 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.61 2011/08/04 11:45:20 joerg Exp $
+$NetBSD: distinfo,v 1.62 2012/05/29 20:23:12 joerg Exp $
 
 SHA1 (apache_1.3.42.tar.gz) = b3f8575d855132bc243d79af59ae2a318e7e2c53
 RMD160 (apache_1.3.42.tar.gz) = a1573bd04e17cad5d67388cfe08b7f26e06a9ee1
@@ -20,7 +20,7 @@
 SHA1 (patch-ai) = 80e35b111e3cbdebf5dc7a8265f454caab791f50
 SHA1 (patch-aj) = ac7337b51d7d4ca25cef4020961736404ec79f01
 SHA1 (patch-ak) = 1be52fb5fca6c05c7cf489de541e0d52383ee43a
-SHA1 (patch-al) = aa6add3b91ee87846dd9cbbe5fd563b606fdcfb8
+SHA1 (patch-al) = 07eb4aab03e646184379d13cdf7176e95f1c1ac8
 SHA1 (patch-am) = 76bbb4ae3a8cce666bf91fb605f72572350f23a1
 SHA1 (patch-an) = 45a5bf946628b1e1b2e60c217214965390f7b3d7
 SHA1 (patch-ao) = 96b97e1faf6828a6880c39eb246d07c4a56bfe12
diff -r bd7aec80b595 -r 724967fe0910 www/apache/patches/patch-al
--- a/www/apache/patches/patch-al       Tue May 29 20:18:28 2012 +0000
+++ b/www/apache/patches/patch-al       Tue May 29 20:23:12 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.9 2008/02/23 05:16:34 obache Exp $
+$NetBSD: patch-al,v 1.10 2012/05/29 20:23:12 joerg Exp $
 
 --- src/Configure.orig 2008-02-23 04:22:55.000000000 +0000
 +++ src/Configure
@@ -17,7 +17,7 @@
      *-openbsd*)
        OS='OpenBSD'
        DBM_LIB=""
-@@ -1111,6 +1119,14 @@ if [ "x$using_shlib" = "x1" ] ; then
+@@ -1111,15 +1119,19 @@ if [ "x$using_shlib" = "x1" ] ; then
            esac
            LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
            ;;
@@ -30,5 +30,17 @@
 +          SHLIB_SUFFIX_DEPTH=2
 +          ;;
        *-netbsd*)
++          LD_SHLIB="cc"
            CFLAGS_SHLIB="-fPIC -DPIC"
-           if echo __ELF__ | ${CC} -E - | grep -q __ELF__; then
+-          if echo __ELF__ | ${CC} -E - | grep -q __ELF__; then
+-              LDFLAGS_SHLIB="-Bshareable"
+-              LDFLAGS_SHLIB_EXPORT=""
+-          else
+-              LDFLAGS_SHLIB="-shared"
+-              LDFLAGS_SHLIB_EXPORT="-Wl,-E"
+-          fi
++          LDFLAGS_SHLIB="-shared"
++          LDFLAGS_SHLIB_EXPORT="-Wl,-E"
+           LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
+           SHLIB_SUFFIX_DEPTH=2
+           ;;