Sat Mar 2 17:52:33 2013 UTC ()
Don't strip -Wl flag on the apxs command line. Bump revision.


(joerg)
diff -r1.203 -r1.204 pkgsrc/www/apache/Makefile
diff -r1.62 -r1.63 pkgsrc/www/apache/distinfo
diff -r1.11 -r1.12 pkgsrc/www/apache/patches/patch-ai
cvs diff -r1.203 -r1.204 pkgsrc/www/apache/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache/Attic/Makefile 2012/10/28 06:30:09 1.203
+++ pkgsrc/www/apache/Attic/Makefile 2013/03/02 17:52:33 1.204
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.203 2012/10/28 06:30:09 asau Exp $ 1# $NetBSD: Makefile,v 1.204 2013/03/02 17:52:33 joerg Exp $
2# 2#
3# This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of 3# This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
4# code hooks that allow mod_ssl to be compiled separately later, if desired). 4# code hooks that allow mod_ssl to be compiled separately later, if desired).
5 5
6DISTNAME= apache_1.3.42 6DISTNAME= apache_1.3.42
7PKGNAME= ${DISTNAME:S/_/-/} 7PKGNAME= ${DISTNAME:S/_/-/}
8PKGREVISION= 3 8PKGREVISION= 4
9CATEGORIES= www 9CATEGORIES= www
10MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ 10MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
11 ${MASTER_SITE_APACHE:=httpd/old/} 11 ${MASTER_SITE_APACHE:=httpd/old/}
12DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${NETBSD_LOGO} ${MODSSL_DIST} 12DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${NETBSD_LOGO} ${MODSSL_DIST}
13 13
14MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
15HOMEPAGE= http://httpd.apache.org/ 15HOMEPAGE= http://httpd.apache.org/
16COMMENT= Apache HTTP (Web) server 16COMMENT= Apache HTTP (Web) server
17 17
18NETBSD_LOGO= sitedrivenby.gif 18NETBSD_LOGO= sitedrivenby.gif
19SITES.${NETBSD_LOGO}= http://www.NetBSD.org/images/logos/ 19SITES.${NETBSD_LOGO}= http://www.NetBSD.org/images/logos/
20 20
21MODSSL_VERSION= 2.8.31 21MODSSL_VERSION= 2.8.31
cvs diff -r1.62 -r1.63 pkgsrc/www/apache/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/apache/Attic/distinfo 2012/05/29 20:23:12 1.62
+++ pkgsrc/www/apache/Attic/distinfo 2013/03/02 17:52:33 1.63
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: distinfo,v 1.62 2012/05/29 20:23:12 joerg Exp $ 1$NetBSD: distinfo,v 1.63 2013/03/02 17:52:33 joerg Exp $
2 2
3SHA1 (apache_1.3.42.tar.gz) = b3f8575d855132bc243d79af59ae2a318e7e2c53 3SHA1 (apache_1.3.42.tar.gz) = b3f8575d855132bc243d79af59ae2a318e7e2c53
4RMD160 (apache_1.3.42.tar.gz) = a1573bd04e17cad5d67388cfe08b7f26e06a9ee1 4RMD160 (apache_1.3.42.tar.gz) = a1573bd04e17cad5d67388cfe08b7f26e06a9ee1
5Size (apache_1.3.42.tar.gz) = 2661241 bytes 5Size (apache_1.3.42.tar.gz) = 2661241 bytes
6SHA1 (mod_ssl-2.8.31-1.3.41.tar.gz) = f2d2210041332fc1d4b7243a856d4d81f961d306 6SHA1 (mod_ssl-2.8.31-1.3.41.tar.gz) = f2d2210041332fc1d4b7243a856d4d81f961d306
7RMD160 (mod_ssl-2.8.31-1.3.41.tar.gz) = c3083c29710c4537ca8c79ddd8c1992eb95cbfee 7RMD160 (mod_ssl-2.8.31-1.3.41.tar.gz) = c3083c29710c4537ca8c79ddd8c1992eb95cbfee
8Size (mod_ssl-2.8.31-1.3.41.tar.gz) = 820067 bytes 8Size (mod_ssl-2.8.31-1.3.41.tar.gz) = 820067 bytes
9SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658 9SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
10RMD160 (sitedrivenby.gif) = 2e350e6531a800da8796207509c12fb590d0affa 10RMD160 (sitedrivenby.gif) = 2e350e6531a800da8796207509c12fb590d0affa
11Size (sitedrivenby.gif) = 8519 bytes 11Size (sitedrivenby.gif) = 8519 bytes
12SHA1 (patch-aa) = 54c32338f0dd6f37f28e3ef37b26d2867f90280d 12SHA1 (patch-aa) = 54c32338f0dd6f37f28e3ef37b26d2867f90280d
13SHA1 (patch-ab) = 084d52bb2afbacf18b9d0793293d8ae333c67802 13SHA1 (patch-ab) = 084d52bb2afbacf18b9d0793293d8ae333c67802
14SHA1 (patch-ac) = b961c90a58a94f48daff417af146df98d5ec428c 14SHA1 (patch-ac) = b961c90a58a94f48daff417af146df98d5ec428c
15SHA1 (patch-ad) = c02cd1af3c4b5e0d49aaa7f0eff20a8d76a633aa 15SHA1 (patch-ad) = c02cd1af3c4b5e0d49aaa7f0eff20a8d76a633aa
16SHA1 (patch-ae) = 1654cdaa58622b7572ab9190928854e80e8c88c7 16SHA1 (patch-ae) = 1654cdaa58622b7572ab9190928854e80e8c88c7
17SHA1 (patch-af) = 4eb5041f2ae8f1d434abbcab416d25739a0979e8 17SHA1 (patch-af) = 4eb5041f2ae8f1d434abbcab416d25739a0979e8
18SHA1 (patch-ag) = e29d1d4934a7490e9c51e338375d4d1cc9e93304 18SHA1 (patch-ag) = e29d1d4934a7490e9c51e338375d4d1cc9e93304
19SHA1 (patch-ah) = 7c7ad1c09a1c849129313bb272106a1dcd2abf7b 19SHA1 (patch-ah) = 7c7ad1c09a1c849129313bb272106a1dcd2abf7b
20SHA1 (patch-ai) = 80e35b111e3cbdebf5dc7a8265f454caab791f50 20SHA1 (patch-ai) = 249dd6367c8a0d31568dd09acf2be6dc49ce9673
21SHA1 (patch-aj) = ac7337b51d7d4ca25cef4020961736404ec79f01 21SHA1 (patch-aj) = ac7337b51d7d4ca25cef4020961736404ec79f01
22SHA1 (patch-ak) = 1be52fb5fca6c05c7cf489de541e0d52383ee43a 22SHA1 (patch-ak) = 1be52fb5fca6c05c7cf489de541e0d52383ee43a
23SHA1 (patch-al) = 07eb4aab03e646184379d13cdf7176e95f1c1ac8 23SHA1 (patch-al) = 07eb4aab03e646184379d13cdf7176e95f1c1ac8
24SHA1 (patch-am) = 76bbb4ae3a8cce666bf91fb605f72572350f23a1 24SHA1 (patch-am) = 76bbb4ae3a8cce666bf91fb605f72572350f23a1
25SHA1 (patch-an) = 45a5bf946628b1e1b2e60c217214965390f7b3d7 25SHA1 (patch-an) = 45a5bf946628b1e1b2e60c217214965390f7b3d7
26SHA1 (patch-ao) = 96b97e1faf6828a6880c39eb246d07c4a56bfe12 26SHA1 (patch-ao) = 96b97e1faf6828a6880c39eb246d07c4a56bfe12
27SHA1 (patch-aq) = 1fda54aae47edb675549095adac2eb0378d1f60c 27SHA1 (patch-aq) = 1fda54aae47edb675549095adac2eb0378d1f60c
28SHA1 (patch-ar) = 29276bc264b9d2ce7dea4a196ac3bd55e6853f53 28SHA1 (patch-ar) = 29276bc264b9d2ce7dea4a196ac3bd55e6853f53
29SHA1 (patch-as) = ef4143e0c809af5792f282ebbd405e7bda339484 29SHA1 (patch-as) = ef4143e0c809af5792f282ebbd405e7bda339484
30SHA1 (patch-at) = 85b7ff5b51014881e6187656660cf23f6d3283c0 30SHA1 (patch-at) = 85b7ff5b51014881e6187656660cf23f6d3283c0
31SHA1 (patch-au) = f70d13e093a277bcb0945330f3684d8a5158a5e6 31SHA1 (patch-au) = f70d13e093a277bcb0945330f3684d8a5158a5e6
cvs diff -r1.11 -r1.12 pkgsrc/www/apache/patches/Attic/patch-ai (expand / switch to unified diff)

--- pkgsrc/www/apache/patches/Attic/patch-ai 2008/02/23 05:16:34 1.11
+++ pkgsrc/www/apache/patches/Attic/patch-ai 2013/03/02 17:52:33 1.12
@@ -1,14 +1,27 @@ @@ -1,14 +1,27 @@
1$NetBSD: patch-ai,v 1.11 2008/02/23 05:16:34 obache Exp $ 1$NetBSD: patch-ai,v 1.12 2013/03/02 17:52:33 joerg Exp $
2 2
3--- src/support/apxs.pl.orig 2008-02-23 04:22:56.000000000 +0000 3--- src/support/apxs.pl.orig 2008-02-23 04:22:56.000000000 +0000
4+++ src/support/apxs.pl 4+++ src/support/apxs.pl
5@@ -424,8 +424,7 @@ if ($opt_i or $opt_e) { 5@@ -371,11 +371,7 @@ if ($opt_c) {
 6 $opt = '';
 7 my ($opt_Wl, $opt_L, $opt_l);
 8 foreach $opt_Wl (@opt_W) {
 9- if ($CFG_LD_SHLIB !~ m/gcc$/) {
 10- $opt .= " $1" if ($opt_Wl =~ m|^\s*l,(.*)$|);
 11- } else {
 12- $opt .= " -W$opt_Wl";
 13- }
 14+ $opt .= " -W$opt_Wl";
 15 }
 16 foreach $opt_L (@opt_L) {
 17 if ($^O ne "MSWin32") {
 18@@ -424,8 +420,7 @@ if ($opt_i or $opt_e) {
6 if ($^O ne "MSWin32") { 19 if ($^O ne "MSWin32") {
7 $t =~ s|^.+/([^/]+)$|$1|; 20 $t =~ s|^.+/([^/]+)$|$1|;
8 if ($opt_i) { 21 if ($opt_i) {
9- push(@cmds, "cp $f $CFG_LIBEXECDIR/$t"); 22- push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
10- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); 23- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
11+ push(@cmds, "@INSTALL@ $f $CFG_LIBEXECDIR/$t"); 24+ push(@cmds, "@INSTALL@ $f $CFG_LIBEXECDIR/$t");
12 } 25 }
13 } 26 }
14 else { 27 else {