Merge packages from the buildlink2 branch back into the main trunk that

have been converted to USE_BUILDLINK2.

4 files changed, 8 insertions, 50 deletions

diff --git a/www/ap-dav/Makefile b/www/ap-dav/Makefile
index 35b82e9004a..233df7d6b1f 100644
--- a/www/ap-dav/Makefile
+++ b/www/ap-dav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/08/13 22:19:48 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 21:51:45 jlam Exp $
 
 DISTNAME=		mod_dav-1.0.3-1.3.6
 PKGNAME=		ap-dav-1.0.3
@@ -12,11 +12,10 @@ COMMENT=		Apache WebDAV module
 # 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]*}
 
-DEPENDS+=		${BUILDLINK_DEPENDS.apache}:../../www/apache
-
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+APACHE_MODULE=		YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat}
 
 AP_MODULE_DIR=		${PREFIX}/lib/httpd
 DOCDIR=			${PREFIX}/share/doc/mod_dav
@@ -29,6 +28,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE.html ${HTMLDIR}
 
-.include "../../textproc/expat/buildlink.mk"
-.include "../../www/apache/buildlink.mk"
+.include "../../textproc/expat/buildlink2.mk"
+.include "../../www/apache/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-dav/distinfo b/www/ap-dav/distinfo
index 54a943b8033..9e28a4502a9 100644
--- a/www/ap-dav/distinfo
+++ b/www/ap-dav/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/03/06 15:35:04 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 21:51:46 jlam Exp $
 
 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
deleted file mode 100644
index 214a4bd1c2f..00000000000
--- a/www/ap-dav/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/03/06 15:35:05 jlam Exp $
-
---- configure.in.orig	Sat Nov  3 09:48:13 2001
-+++ configure.in
-@@ -24,15 +24,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)
diff --git a/www/ap-dav/patches/patch-ab b/www/ap-dav/patches/patch-ab
deleted file mode 100644
index a356182000e..00000000000
--- a/www/ap-dav/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/03/06 15:35:06 jlam Exp $
-
---- configure.orig	Mon Nov  5 00:04:50 2001
-+++ configure
-@@ -1720,15 +1720,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_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'