Update apache{,6} to 1.3.20nb1. Changes from version 1.3.20 are:

On NetBSD, we need to link libgcc.a whole-archive so that certain symbols
from the C++ implementation (__get_eh_context, etc.) referenced by DSOs
written in C++ will resolve correctly.  This makes php4-sablot work with
mod_php4.so (from ap-php4) on ELF platforms when loaded by Apache's httpd.

4 files changed, 62 insertions, 2 deletions

diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 1288badae1c..2d9872b1f44 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2001/10/09 13:20:17 martti Exp $
+# $NetBSD: Makefile,v 1.37 2001/10/16 04:11:06 jlam Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -78,6 +78,15 @@ APACHE_CUSTOM_CFLAGS+=	-DBUFFERED_LOGS
 APACHE_CUSTOM_CFLAGS+=	-O6 -fomit-frame-pointer -fexpensive-optimizations
 .endif
 
+# On NetBSD, we need to link libgcc.a whole-archive so that certain symbols
+# from the C++ implementation (__get_eh_context, etc.) referenced by DSOs
+# written in C++ will resolve correctly.
+#
+.if (${OPSYS} == "NetBSD")
+LINK_LIBGCC_LDFLAGS=	-Wl,-whole-archive -lgcc -Wl,-no-whole-archive
+MAKE_ENV+=		LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
+.endif
+
 .if (${OPSYS} == "SunOS")
 DEPENDS+=		db-2.7.7:../../databases/db
 LDFLAGS+=		-Wl,-R/usr/ucblib -L/usr/ucblib			\
diff --git a/www/apache6/distinfo b/www/apache6/distinfo
index eda7ce922bf..309496da7f8 100644
--- a/www/apache6/distinfo
+++ b/www/apache6/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/10/09 13:20:17 martti Exp $
+$NetBSD: distinfo,v 1.6 2001/10/16 04:11:06 jlam Exp $
 
 SHA1 (apache_1.3.20.tar.gz) = c791b6513b253035c04e76f4e1882ad847134a12
 Size (apache_1.3.20.tar.gz) = 1973138 bytes
@@ -13,3 +13,5 @@ SHA1 (patch-ae) = 2e4e7aab1cff7ddc82697946eeb8d13cd3aa1df0
 SHA1 (patch-af) = 8115ea5b59fc86e7354effd25dc22525e7627802
 SHA1 (patch-ah) = 553f8f2bf4bf7278adb46ff8749be154f10e39d3
 SHA1 (patch-ai) = 51d71dfd6706eda420293f2a9f81d8982f789753
+SHA1 (patch-aj) = 9070bd6b504701432302ef89a84b9270e646f833
+SHA1 (patch-ak) = 8f790a692ed9b2dd6943be43fa1cf7629c673955
diff --git a/www/apache6/patches/patch-aj b/www/apache6/patches/patch-aj
new file mode 100644
index 00000000000..39351144dbf
--- /dev/null
+++ b/www/apache6/patches/patch-aj
@@ -0,0 +1,36 @@
+$NetBSD: patch-aj,v 1.5 2001/10/16 04:11:06 jlam Exp $
+
+--- htdocs/index.html.fr.orig	Tue May  1 06:31:10 2001
++++ htdocs/index.html.fr	Sat Jun  9 01:48:28 2001
+@@ -36,12 +36,27 @@
+ <HR WIDTH="50%" SIZE="8">
+ 
+ <p>La <A HREF="manual/">documentation</A> Apache est incluse dans cette
+-distribution.</p>
++distribution. Si l'extension SSL <STRONG>mod_ssl</STRONG> a \xe9t\xe9
++install\xe9e, lisez alors attentivement la 
++<A HREF="manual/mod/mod_ssl/index.html">documentation SSL</A>.</p>
+ 
+-<p>Le webmaster de ce site peut librement utiliser l'image ci-dessous sur un
+-site web utilisant le logiciel Apache. Merci d'avoir choisi Apache&nbsp;!</p>
++<p>Des informations sur le syst\xe8me d'exploitation multi-plateforme NetBSD
++peuvent &ecirc;tre trouv\xe9es sur
++<A HREF="http://www.netbsd.org/">la homepage du projet NetBSD</A>.</p> 
+ 
+-<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV>
++<p>Le webmaster de ce site peut librement utiliser les images ci-dessous sur un
++site web utilisant les logiciels Apache et NetBSD. Merci d'avoir choisi
++<A HREF="http://www.apache.org/">Apache</A> sur
++<A HREF="http://www.netbsd.org/">NetBSD</A>&nbsp;!</p>
++
++<DIV ALIGN="CENTER">
++ <A HREF="http://www.apache.org/">
++  <IMG SRC="apache_pb.gif" BORDER="0" ALT="Powered by Apache">
++ </A>
++ <A HREF="http://www.netbsd.org/">
++  <IMG SRC="sitedrivenby.gif" BORDER="0" ALT="Site driven by NetBSD">
++ </A>
++</DIV>
+ 
+ </BODY>
+ </HTML>
diff --git a/www/apache6/patches/patch-ak b/www/apache6/patches/patch-ak
new file mode 100644
index 00000000000..d4d262229bc
--- /dev/null
+++ b/www/apache6/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.5 2001/10/16 04:11:07 jlam Exp $
+
+--- src/Makefile.tmpl.orig	Sun Oct 14 22:14:29 2001
++++ src/Makefile.tmpl
+@@ -2,7 +2,7 @@
+ CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
+ LIBS=$(EXTRA_LIBS) $(LIBS1)
+ INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
+-LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
++LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) $(LINK_LIBGCC_LDFLAGS)
+ 
+ OBJS= \
+   modules.o \