Pass DL_* flags to the compiler when linking httpd since it dlopens

shared modules.  Bump the PKGREVISION.

3 files changed, 26 insertions, 16 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 724098ba6c6..519e8198b40 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.57 2004/11/24 07:39:50 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2004/11/26 23:07:58 jlam Exp $
 
 .include "Makefile.common"
 
 PKGNAME=		apache-${APACHE_VERSION}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		www
 
 HOMEPAGE=		http://httpd.apache.org/
@@ -32,6 +32,7 @@ CONFIGURE_ARGS+=	--with-apr-util=${BUILDLINK_PREFIX.apr}
 .include "../../devel/apr/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 
 # Set the "Multi-Processing Model" used by Apache to handle requests.
 # Valid values are:
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index b84257937d0..a2b6bb84e45 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2004/10/02 15:47:02 reed Exp $
+$NetBSD: distinfo,v 1.31 2004/11/26 23:07:59 jlam Exp $
 
 SHA1 (httpd-2.0.52.tar.gz) = 2a22fde052adc7d7258f999cd7dd8a7592ff36e7
 Size (httpd-2.0.52.tar.gz) = 6918995 bytes
-SHA1 (patch-aa) = 341d546fa758ae65023ff13422a3a002a7f1686b
+SHA1 (patch-aa) = 8ff497da17144d191e633d59274bf2f7e0e7c08c
 SHA1 (patch-ad) = 27fa3655d6ba4840296e79fa6fd96cd9de79a33a
 SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
 SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215
diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa
index 6ae50b16f00..fe3d4c22985 100644
--- a/www/apache2/patches/patch-aa
+++ b/www/apache2/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.12 2004/07/14 08:28:51 adrianp Exp $
+$NetBSD: patch-aa,v 1.13 2004/11/26 23:07:59 jlam Exp $
 
---- Makefile.in.orig	Sat Dec 27 12:00:42 2003
-+++ Makefile.in	Sat Jul  3 18:13:46 2004
-@@ -14,7 +14,7 @@
+--- Makefile.in.orig	2004-08-26 09:01:18.000000000 -0400
++++ Makefile.in
+@@ -4,7 +4,7 @@ CLEAN_SUBDIRS = test
+ 
+ PROGRAM_NAME         = $(progname)
+ PROGRAM_SOURCES      = modules.c
+-PROGRAM_LDADD        = $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
++PROGRAM_LDADD        = $(HTTPD_LDFLAGS) $(DL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS) $(DL_LIBS)
+ PROGRAM_DEPENDENCIES = \
+   $(BUILTIN_LIBS) \
+   $(MPM_LIB) \
+@@ -14,7 +14,7 @@ PROGRAM_DEPENDENCIES = \
  PROGRAMS        = $(PROGRAM_NAME)
  TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)
  PHONY_TARGETS   = $(srcdir)/buildmark.c
@@ -11,7 +20,7 @@ $NetBSD: patch-aa,v 1.12 2004/07/14 08:28:51 adrianp Exp $
  	install-other install-cgi install-include install-suexec install-man \
  	install-build
  
-@@ -71,6 +71,7 @@
+@@ -71,6 +71,7 @@ install-conf:
  	    				< $$i; \
  	    		fi \
  	    	) > $(DESTDIR)$(sysconfdir)/$$i; \
@@ -19,7 +28,7 @@ $NetBSD: patch-aa,v 1.12 2004/07/14 08:28:51 adrianp Exp $
  	    	chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
  	    	file=`echo $$i|sed s/-std//`; \
  	    	if [ "$$file" = "httpd.conf" ]; then \
-@@ -79,13 +80,16 @@
+@@ -79,13 +80,16 @@ install-conf:
  	    	if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
  	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
  	    	fi; \
@@ -36,7 +45,7 @@ $NetBSD: patch-aa,v 1.12 2004/07/14 08:28:51 adrianp Exp $
  	fi
  
  install-build:
-@@ -93,8 +97,6 @@
+@@ -93,8 +97,6 @@ install-build:
  	@test -d $(DESTDIR)$(installbuilddir) || $(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir) 
  	@cp $(top_srcdir)/build/*.mk $(DESTDIR)$(installbuilddir); \
  	cp build/*.mk $(DESTDIR)$(installbuilddir); \
@@ -45,7 +54,7 @@ $NetBSD: patch-aa,v 1.12 2004/07/14 08:28:51 adrianp Exp $
  	cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir); \
  	cp $(top_builddir)/config.nice $(DESTDIR)$(installbuilddir);
  
-@@ -108,7 +110,7 @@
+@@ -108,7 +110,7 @@ dox::
  	doxygen $(top_srcdir)/docs/doxygen.conf
  
  install-htdocs:
@@ -54,7 +63,7 @@ $NetBSD: patch-aa,v 1.12 2004/07/14 08:28:51 adrianp Exp $
             echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
          else \
  	    echo Installing HTML documents ; \
-@@ -118,7 +120,7 @@
+@@ -118,7 +120,7 @@ install-htdocs:
  	fi
  
  install-error:
@@ -63,7 +72,7 @@ $NetBSD: patch-aa,v 1.12 2004/07/14 08:28:51 adrianp Exp $
             echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
          else \
  	    echo Installing error documents ; \
-@@ -128,7 +130,7 @@
+@@ -128,7 +130,7 @@ install-error:
  	fi
  
  install-icons:
@@ -72,7 +81,7 @@ $NetBSD: patch-aa,v 1.12 2004/07/14 08:28:51 adrianp Exp $
             echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
          else \
  	    echo Installing icons ; \
-@@ -138,7 +140,7 @@
+@@ -138,7 +140,7 @@ install-icons:
  	fi
  
  install-cgi:
@@ -81,7 +90,7 @@ $NetBSD: patch-aa,v 1.12 2004/07/14 08:28:51 adrianp Exp $
  	    echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
  	else \
  	   echo Installing CGIs ; \
-@@ -191,8 +193,6 @@
+@@ -191,8 +193,6 @@ install-man:
  	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
  	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
  	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8