From d78bffaa6b8ea6f196f3e478d3a6bfe218dafd5d Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Thu, 28 Feb 2002 18:28:14 +0000
Subject: * 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.

---
 www/ap-dav/Makefile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'www/ap-dav/Makefile')

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"
-- 
cgit v1.2.3