Make all the ap-* packages work with apache6 as well as apache

(except for ap-ssl, of course)

12 files changed, 24 insertions, 24 deletions

diff --git a/www/ap-DBI/Makefile b/www/ap-DBI/Makefile
index 96cb5e51a27..437477500c0 100644
--- a/www/ap-DBI/Makefile
+++ b/www/ap-DBI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:21:42 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/05/20 05:23:26 jonb Exp $
 #
 
 DISTNAME=       ApacheDBI-0.87
@@ -10,7 +10,7 @@ MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 Apache modules for DBI connections
 
 DEPENDS+=	ap-perl-*:../../www/ap-perl
-DEPENDS+=	apache-1.3.*:../../www/apache
+DEPENDS+=	apache{,6}-1.3.*:../../www/apache
 
 USE_PERL5=	# defined
 PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Apache/DBI/.packlist
diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile
index 4a1214dd0ee..bc012854b09 100644
--- a/www/ap-auth-cookie/Makefile
+++ b/www/ap-auth-cookie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/04/30 03:46:32 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2001/05/20 05:23:26 jonb Exp $
 #
 # There are a few more mod_auth_cookie's out there doing slightly
 # different things.  This one pkg would be a good place to dump them all in
@@ -15,7 +15,7 @@ MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	ftp://ftp.kciLink.com/pub/mod_auth_cookie.txt
 COMMENT=	Cookie-based authentication for Apache
 
-DEPENDS+=	apache-1.3.*:../../www/apache
+DEPENDS+=	apache{,6}-1.3.*:../../www/apache
 # For "apxs":
 BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
 
diff --git a/www/ap-auth-ldap/Makefile b/www/ap-auth-ldap/Makefile
index 6ac3384b054..672f76b8a26 100644
--- a/www/ap-auth-ldap/Makefile
+++ b/www/ap-auth-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/04/30 03:46:32 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/05/20 05:23:26 jonb Exp $
 
 DISTNAME=	auth_ldap-1.5.2
 PKGNAME=	ap-auth-ldap-1.5.2
@@ -9,7 +9,7 @@ MAINTAINER=	kleink@netbsd.org
 HOMEPAGE=	http://www.rudedog.org/auth_ldap/
 COMMENT=	Module to allow apache authentication against an LDAP directory
 
-DEPENDS+=	apache-1.3.*:../../www/apache
+DEPENDS+=	apache{,6}-1.3.*:../../www/apache
 DEPENDS+=	openldap-1.2.*:../../databases/openldap
 
 # For "apxs":
diff --git a/www/ap-auth-postgresql/Makefile b/www/ap-auth-postgresql/Makefile
index 64ef279c6ee..f5ed11f4982 100644
--- a/www/ap-auth-postgresql/Makefile
+++ b/www/ap-auth-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/05/14 15:04:51 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/05/20 05:23:27 jonb Exp $
 
 DISTNAME=	AuthPG-1.2b2
 PKGNAME=	ap-auth-postgresql-1.2b2
@@ -9,7 +9,7 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://home.bawi.org/~minskim/authpg/
 COMMENT=	Module to allow apache authentication against a Postgresql database
 
-DEPENDS+=	apache-1.3.*:../../www/apache
+DEPENDS+=	apache{,6}-1.3.*:../../www/apache
 DEPENDS+=	postgresql-{6.5.3*,7.0*,lib-*}:../../databases/postgresql-lib
 # For "apxs":
 BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
diff --git a/www/ap-csacek/Makefile b/www/ap-csacek/Makefile
index 8dd2468eb91..40000c75694 100644
--- a/www/ap-csacek/Makefile
+++ b/www/ap-csacek/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/05/19 17:46:20 jdolecek Exp $
+# $NetBSD: Makefile,v 1.11 2001/05/20 05:23:27 jonb Exp $
 #
 
 DISTNAME=	csacek-2.1.6
@@ -12,7 +12,7 @@ MAINTAINER=	jdolecek@netbsd.org
 HOMEPAGE=	http://www.csacek.cz/
 COMMENT=	on-fly code set recoder
 
-DEPENDS+=	apache*-1.3*:../../www/apache
+DEPENDS+=	apache{,6}-1.3*:../../www/apache
 # For "apxs":
 BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
 
diff --git a/www/ap-dav/Makefile b/www/ap-dav/Makefile
index d49b859813c..ae5dd3c810c 100644
--- a/www/ap-dav/Makefile
+++ b/www/ap-dav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/16 02:11:54 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/05/20 05:23:27 jonb Exp $
 
 DISTNAME=		mod_dav-1.0.2-1.3.6
 PKGNAME=		ap-dav-1.0.2
@@ -9,7 +9,7 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.webdav.org/mod_dav/
 COMMENT=		Apache WebDAV module
 
-DEPENDS+=		apache>=1.3.9:../../www/apache
+DEPENDS+=		apache{,6}>=1.3.9:../../www/apache
 # For "apxs":
 BUILD_DEPENDS=		perl>=${PERL5_REQD}:../../lang/perl5
 
diff --git a/www/ap-dtcl/Makefile b/www/ap-dtcl/Makefile
index b87f11cda45..5a0f05ebc16 100644
--- a/www/ap-dtcl/Makefile
+++ b/www/ap-dtcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/04/30 03:46:33 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/05/20 05:23:27 jonb Exp $
 
 DISTNAME=	mod_dtcl-0.8.12
 PKGNAME=	ap-dtcl-0.8.12
@@ -10,7 +10,7 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://tcl.apache.org/
 COMMENT=	Simple, fast Tcl server side scripting for apache
 
-DEPENDS+=	apache-1.3.*:../../www/apache
+DEPENDS+=	apache{,6}-1.3.*:../../www/apache
 DEPENDS+=	tcl>=8.3.2:../../lang/tcl
 # For "apxs":
 BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
diff --git a/www/ap-fastcgi/Makefile b/www/ap-fastcgi/Makefile
index 174aa4de6a9..05b81c6a54a 100644
--- a/www/ap-fastcgi/Makefile
+++ b/www/ap-fastcgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/04/30 03:46:33 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/05/20 05:23:27 jonb Exp $
 #
 
 DISTNAME=	mod_fastcgi_2.2.10
@@ -10,7 +10,7 @@ MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	http://www.fastcgi.com/
 COMMENT=	New, improved CGI-like interface module for Apache
 
-DEPENDS+=	apache-1.3.*:../../www/apache
+DEPENDS+=	apache{,6}-1.3.*:../../www/apache
 # For "apxs":
 BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
 
diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile
index 66e1e61773f..24fb50a9599 100644
--- a/www/ap-jk/Makefile
+++ b/www/ap-jk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/05/12 15:01:45 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/05/20 05:23:28 jonb Exp $
 
 DISTNAME=	jakarta-tomcat-3.2.1-src
 PKGNAME=	ap-jk-3.2.1
@@ -9,7 +9,7 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://jakarta.apache.org/
 COMMENT=	improved connector for accessing Jakarta Tomcat or JServ from Apache
 
-DEPENDS+=	apache-*:../../www/apache
+DEPENDS+=	apache{,6}-*:../../www/apache
 
 USE_JAVA=	yes
 # For "apxs":
diff --git a/www/ap-jserv/Makefile b/www/ap-jserv/Makefile
index 0599ef85e7d..22d3fae4c40 100644
--- a/www/ap-jserv/Makefile
+++ b/www/ap-jserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/04/30 03:46:34 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/05/20 05:23:28 jonb Exp $
 
 DISTNAME=	ApacheJServ-1.1.2
 PKGNAME=	ap-jserv-1.1.2
@@ -9,7 +9,7 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://java.apache.org/
 COMMENT=	older Java Servlet engine for Apache Server
 
-DEPENDS+=	apache>=1.3.9:../../www/apache
+DEPENDS+=	apache{,6}>=1.3.9:../../www/apache
 # yes, this needs _exactly_ version 2.0
 DEPENDS+=	jsdk-2.0:../../www/jsdk20
 # For "apxs":
diff --git a/www/ap-php3/Makefile b/www/ap-php3/Makefile
index 36c88c57664..3689cc97194 100644
--- a/www/ap-php3/Makefile
+++ b/www/ap-php3/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2001/02/17 17:21:51 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/05/20 05:23:28 jonb Exp $
 #
 
 PKGNAME=	ap-${DISTNAME}
 
 COMMENT=	PHP3 server module for Apache
 
-DEPENDS+=	apache-1.3.*:../../www/apache
+DEPENDS+=	apache{,6}-1.3.*:../../www/apache
 
 USE_PERL5=	# defined
 
diff --git a/www/ap-php4/Makefile b/www/ap-php4/Makefile
index 5fc7a4e5559..3104c45496e 100644
--- a/www/ap-php4/Makefile
+++ b/www/ap-php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/05/14 14:12:27 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/05/20 05:23:28 jonb Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -10,7 +10,7 @@ PHP_MODULE_VERS=	${PHP_BASE_VERS}${PHP_PKG_VERS}
 COMMENT=		PHP4: Hypertext Preprocessor (Apache module)
 
 DEPENDS+=		php-${PHP_VERS}:../../www/php4
-DEPENDS+=		apache>=1.3:../../www/apache
+DEPENDS+=		apache{,6}>=1.3:../../www/apache
 
 # For "apxs":
 BUILD_DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5