Update www/ap-dav to 1.0.3. Major bugfixes and changes from

version 1.0.2 include:

  * ignore Depth: Infinity for non-collection resources in a PROPFIND;
    this prevents a bogus error when someone has not used the
    "DAVDepthInfinity On" directive
  * fix for Web Folders not recognizing the last-modified date in
    PROPFIND responses (Joe Orton)
  * tweak to also allow recognition of the creationdate
  * fix copying of collection properties during a Depth:0 operation
    (Keith Wannamaker)
  * return 507 (Insufficient Space) for quota errors (on Linux, at
    least) (Joe)
  * fix moving/copying of a collection over a non-collection (found by
    Joe's interop testing tool)
  * LOCK with a missing intermediate collection now returns a standard
    409 (Conflict) response rather than 500 (Internal Server Error)
    (Keith, reported by Dan Brotsky)
  * fix problems with empty URIs in xmlns attributes (fixes from Joe
    and Greg, reported by Julian Reschke)

7 files changed, 44 insertions, 70 deletions

diff --git a/www/ap-dav/Makefile b/www/ap-dav/Makefile
index cbafb669adc..df57baa8621 100644
--- a/www/ap-dav/Makefile
+++ b/www/ap-dav/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/02/28 18:28:14 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/06 15:35:04 jlam Exp $
 
-DISTNAME=		mod_dav-1.0.2-1.3.6
-PKGNAME=		ap-dav-1.0.2
+DISTNAME=		mod_dav-1.0.3-1.3.6
+PKGNAME=		ap-dav-1.0.3
 CATEGORIES=		www
 MASTER_SITES=		http://www.webdav.org/mod_dav/
 
@@ -16,6 +16,7 @@ DEPENDS+=		${BUILDLINK_DEPENDS.apache}:../../www/apache
 
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_DIR}
 
 AP_MODULE_DIR=		${PREFIX}/lib/httpd
 DOCDIR=			${PREFIX}/share/doc/mod_dav
@@ -25,6 +26,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/libdav.so ${AP_MODULE_DIR}/mod_dav.so
 	${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR}
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE.html ${HTMLDIR}
 
 .include "../../textproc/expat/buildlink.mk"
diff --git a/www/ap-dav/PLIST b/www/ap-dav/PLIST
index cc7c7f0537c..ebe5cc16351 100644
--- a/www/ap-dav/PLIST
+++ b/www/ap-dav/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:15:40 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/03/06 15:35:04 jlam Exp $
 lib/httpd/mod_dav.so
 share/doc/html/mod_dav/LICENSE.html
+share/doc/mod_dav/README
 share/doc/mod_dav/INSTALL
 @dirrm share/doc/mod_dav
 @dirrm share/doc/html/mod_dav
diff --git a/www/ap-dav/distinfo b/www/ap-dav/distinfo
index acd84a0a30c..54a943b8033 100644
--- a/www/ap-dav/distinfo
+++ b/www/ap-dav/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2002/02/28 18:28:14 jlam Exp $
+$NetBSD: distinfo,v 1.3 2002/03/06 15:35:04 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
+SHA1 (mod_dav-1.0.3-1.3.6.tar.gz) = cf1baa75c14131f96299be3fdf26d1fa91e6c7e3
+Size (mod_dav-1.0.3-1.3.6.tar.gz) = 185284 bytes
+SHA1 (patch-aa) = 1c5cf37e8b8f750bb4b02bf0bce2e3a3ce5033a2
+SHA1 (patch-ab) = 9da9919f52e309135637977c4ea200b8273d47b1
+SHA1 (patch-ad) = 5c08ec68748b6fabb5cb5361ef04fb760cd76008
diff --git a/www/ap-dav/patches/patch-aa b/www/ap-dav/patches/patch-aa
index c59da60a782..214a4bd1c2f 100644
--- a/www/ap-dav/patches/patch-aa
+++ b/www/ap-dav/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2002/02/28 18:28:15 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2002/03/06 15:35:05 jlam Exp $
 
---- configure.in.orig	Thu Oct 19 04:54:17 2000
+--- configure.in.orig	Sat Nov  3 09:48:13 2001
 +++ configure.in
-@@ -29,15 +29,6 @@
+@@ -24,15 +24,6 @@
          CPPFLAGS="$CPPFLAGS -traditional-cpp"
  fi
  
@@ -18,22 +18,3 @@ $NetBSD: patch-aa,v 1.1 2002/02/28 18:28:15 jlam Exp $
  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
index 3a6efd9b7b2..a356182000e 100644
--- a/www/ap-dav/patches/patch-ab
+++ b/www/ap-dav/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2002/02/28 18:28:16 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2002/03/06 15:35:06 jlam Exp $
 
---- configure.orig	Thu Oct 19 04:54:26 2000
+--- configure.orig	Mon Nov  5 00:04:50 2001
 +++ configure
-@@ -808,15 +808,6 @@
+@@ -1720,15 +1720,6 @@
          CPPFLAGS="$CPPFLAGS -traditional-cpp"
  fi
  
@@ -15,25 +15,6 @@ $NetBSD: patch-ab,v 1.1 2002/02/28 18:28:16 jlam Exp $
 -       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
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/www/ap-dav/patches/patch-ac b/www/ap-dav/patches/patch-ac
deleted file mode 100644
index 52772887946..00000000000
--- a/www/ap-dav/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$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"
diff --git a/www/ap-dav/patches/patch-ad b/www/ap-dav/patches/patch-ad
new file mode 100644
index 00000000000..06d291404f9
--- /dev/null
+++ b/www/ap-dav/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2002/03/06 15:35:07 jlam Exp $
+
+--- Makefile.in.orig	Sat Nov  3 10:00:21 2001
++++ Makefile.in
+@@ -20,6 +20,8 @@
+ # the correct directory by placing generated includes first.
+ ALL_CFLAGS = $(CPPFLAGS) @INCLUDE@ @CFLAGS@ $(INCLUDE) $(CFLAGS)
+ 
++LDFLAGS = @LDFLAGS@
++
+ SRCS = \
+ 	dav_props.c \
+ 	dav_util.c \
+@@ -50,7 +52,7 @@
+ 
+ # For DSO installs with APXS
+ libdav.so: $(OBJS)
+-	$(APXS) -c -o $@ $(APXS_CFLAGS) $(OBJS) $(APXS_EXP) $(LIBS)
++	$(APXS) -c -o $@ $(APXS_CFLAGS) $(LDFLAGS) $(OBJS) $(APXS_EXP) $(LIBS)
+ 
+ # For static installs
+ libdav.a: $(OBJS)