* Fix the build against expat as the apache xml headers are not correct for

  the library routines we will use when loaded into httpd.
* This package won't work with apache-2.*, so ensure that it won't match
  the apache dependency.

5 files changed, 104 insertions, 7 deletions

diff --git a/www/ap-dav/Makefile b/www/ap-dav/Makefile
index ae5dd3c810c..cbafb669adc 100644
--- a/www/ap-dav/Makefile
+++ b/www/ap-dav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/05/20 05:23:27 jonb Exp $
+# $NetBSD: Makefile,v 1.3 2002/02/28 18:28:14 jlam Exp $
 
 DISTNAME=		mod_dav-1.0.2-1.3.6
 PKGNAME=		ap-dav-1.0.2
@@ -9,12 +9,13 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.webdav.org/mod_dav/
 COMMENT=		Apache WebDAV module
 
-DEPENDS+=		apache{,6}>=1.3.9:../../www/apache
-# For "apxs":
-BUILD_DEPENDS=		perl>=${PERL5_REQD}:../../lang/perl5
+# Ugly mess that says apache>=1.3.9 and apache<=2.0.
+BUILDLINK_DEPENDS.apache=	{apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*}
 
-GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--with-apxs="${LOCALBASE}/sbin/apxs"
+DEPENDS+=		${BUILDLINK_DEPENDS.apache}:../../www/apache
+
+USE_BUILDLINK_ONLY=	YES
+GNU_CONFIGURE=		YES
 
 AP_MODULE_DIR=		${PREFIX}/lib/httpd
 DOCDIR=			${PREFIX}/share/doc/mod_dav
@@ -26,4 +27,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE.html ${HTMLDIR}
 
+.include "../../textproc/expat/buildlink.mk"
+.include "../../www/apache/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-dav/distinfo b/www/ap-dav/distinfo
index 38c29d8f3c6..acd84a0a30c 100644
--- a/www/ap-dav/distinfo
+++ b/www/ap-dav/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/05/16 02:11:54 jlam Exp $
+$NetBSD: distinfo,v 1.2 2002/02/28 18:28:14 jlam Exp $
 
 SHA1 (mod_dav-1.0.2-1.3.6.tar.gz) = 0771e843bcfeeb44fa90d09c4edb42d2ee83dd04
 Size (mod_dav-1.0.2-1.3.6.tar.gz) = 170197 bytes
+SHA1 (patch-aa) = cdb41bff71decd48c08ff6484273e16124c886d4
+SHA1 (patch-ab) = bbcc72040b092ff20db11e5fe582217882377119
+SHA1 (patch-ac) = 27e51d07cce202ece94cd404f1709668b2da2586
diff --git a/www/ap-dav/patches/patch-aa b/www/ap-dav/patches/patch-aa
new file mode 100644
index 00000000000..c59da60a782
--- /dev/null
+++ b/www/ap-dav/patches/patch-aa
@@ -0,0 +1,39 @@
+$NetBSD: patch-aa,v 1.1 2002/02/28 18:28:15 jlam Exp $
+
+--- configure.in.orig	Thu Oct 19 04:54:17 2000
++++ configure.in
+@@ -29,15 +29,6 @@
+         CPPFLAGS="$CPPFLAGS -traditional-cpp"
+ fi
+ 
+-#
+-# Check for /usr/pkg/{lib,include} which is where NetBSD puts binary
+-# and source packages.  This should be harmless on other OSs.
+-#
+-if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
+-       CFLAGS="$CFLAGS -I/usr/pkg/include"
+-       LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
+-fi
+-
+ AC_HEADER_STDC
+ 
+ AC_MSG_CHECKING(for static Apache module support)
+@@ -140,10 +131,17 @@
+                             default search.],
+ [
+   if test "$withval" != "no" ; then
+-    if test -f "$withval/include/xmlparse.h" ; then
++    if test -f "$withval/include/expat.h" ; then
+         XML_DIR=$withval
+         XML_INCLUDE="$withval/include"
+         XML_LIB="$withval/lib"
++    fi
++    if test "$XML_DIR" = "" ; then
++      if test -f "$withval/include/xmlparse.h" ; then
++          XML_DIR=$withval
++          XML_INCLUDE="$withval/include"
++          XML_LIB="$withval/lib"
++      fi
+     fi
+     if test "$XML_DIR" = "" ; then
+       if test -f "$withval/include/xml/xmlparse.h" ; then
diff --git a/www/ap-dav/patches/patch-ab b/www/ap-dav/patches/patch-ab
new file mode 100644
index 00000000000..3a6efd9b7b2
--- /dev/null
+++ b/www/ap-dav/patches/patch-ab
@@ -0,0 +1,39 @@
+$NetBSD: patch-ab,v 1.1 2002/02/28 18:28:16 jlam Exp $
+
+--- configure.orig	Thu Oct 19 04:54:26 2000
++++ configure
+@@ -808,15 +808,6 @@
+         CPPFLAGS="$CPPFLAGS -traditional-cpp"
+ fi
+ 
+-#
+-# Check for /usr/pkg/{lib,include} which is where NetBSD puts binary
+-# and source packages.  This should be harmless on other OSs.
+-#
+-if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
+-       CFLAGS="$CFLAGS -I/usr/pkg/include"
+-       LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
+-fi
+-
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+ echo "configure:822: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+@@ -1110,10 +1101,17 @@
+   withval="$with_expat"
+   
+   if test "$withval" != "no" ; then
+-    if test -f "$withval/include/xmlparse.h" ; then
++    if test -f "$withval/include/expat.h" ; then
++        XML_DIR=$withval
++        XML_INCLUDE="$withval/include"
++        XML_LIB="$withval/lib"
++    fi
++    if test "$XML_DIR" = "" ; then
++      if test -f "$withval/include/xmlparse.h" ; then
+         XML_DIR=$withval
+         XML_INCLUDE="$withval/include"
+         XML_LIB="$withval/lib"
++      fi
+     fi
+     if test "$XML_DIR" = "" ; then
+       if test -f "$withval/include/xml/xmlparse.h" ; then
diff --git a/www/ap-dav/patches/patch-ac b/www/ap-dav/patches/patch-ac
new file mode 100644
index 00000000000..52772887946
--- /dev/null
+++ b/www/ap-dav/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2002/02/28 18:28:16 jlam Exp $
+
+--- dav_xmlparse.c.orig	Tue Oct 17 04:48:16 2000
++++ dav_xmlparse.c
+@@ -18,7 +18,7 @@
+ */
+ 
+ /* James Clark's Expat parser */
+-#include <xmlparse.h>
++#include <expat.h>
+ 
+ #include "httpd.h"
+ #include "http_protocol.h"