From df928bdfdac5f0df64554587050571a5c91eb580 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Wed, 25 Sep 2002 18:39:36 +0000
Subject: We have databases/p5-Apache-DBI-0.88, so we don't need
 www/ap-DBI-0.87 [which is an older version of the same source]. Remove it.
 Noted by Andrew Brown in connection with PR 18280.

---
 www/Makefile                        |  3 +--
 www/ap-DBI/DESCR                    | 19 -------------------
 www/ap-DBI/Makefile                 | 22 ----------------------
 www/ap-DBI/PLIST                    |  1 -
 www/ap-DBI/distinfo                 |  4 ----
 www/p5-Apache-DBILogConfig/Makefile |  6 +++---
 www/p5-Template-Toolkit/Makefile    |  4 ++--
 7 files changed, 6 insertions(+), 53 deletions(-)
 delete mode 100644 www/ap-DBI/DESCR
 delete mode 100644 www/ap-DBI/Makefile
 delete mode 100644 www/ap-DBI/PLIST
 delete mode 100644 www/ap-DBI/distinfo

(limited to 'www')

diff --git a/www/Makefile b/www/Makefile
index cf5aed99be0..536ee36ad8b 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.213 2002/09/24 13:55:50 wiz Exp $
+# $NetBSD: Makefile,v 1.214 2002/09/25 18:39:36 wiz Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -7,7 +7,6 @@ SUBDIR+=	Mosaic
 SUBDIR+=	adzap
 SUBDIR+=	amaya
 SUBDIR+=	analog
-SUBDIR+=	ap-DBI
 SUBDIR+=	ap-Embperl
 SUBDIR+=	ap-aolserver
 SUBDIR+=	ap-auth-cookie
diff --git a/www/ap-DBI/DESCR b/www/ap-DBI/DESCR
deleted file mode 100644
index 80eae06bb7a..00000000000
--- a/www/ap-DBI/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
-This is version 0.87 of Apache::AuthDBI.pm and Apache::DBI.pm.
-
-These modules are supposed to be used with the Apache server together with 
-an embedded perl interpreter like mod_perl. They provide support for basic 
-authentication and authorization as well as support for persistent database 
-connections via Perl's Database Independent Interface (DBI). 
-
-o AuthDBI.pm provides authentication and authorization: 
-
-  - optional shared cache for passwords to minimize database load 
-  - configurable cleanup-handler deletes outdated entries from the cache 
-
-o DBI.pm provides persistent database connections: 
-
-  - connections can be established during server-startup 
-  - configurable rollback to ensure data integrity 
-  - configurable verification of the connections to avoid time-outs. 
-
-The modules have been developed on RH 6.0 with apache_1.3.6 and mod_perl-1.21.
diff --git a/www/ap-DBI/Makefile b/www/ap-DBI/Makefile
deleted file mode 100644
index 75a5b9ce2e7..00000000000
--- a/www/ap-DBI/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2002/08/25 21:51:44 jlam Exp $
-#
-
-DISTNAME=       ApacheDBI-0.87
-PKGNAME=        ap-DBI-0.87
-CATEGORIES=	www databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/MERGL/}
-
-MAINTAINER=	packages@netbsd.org
-COMMENT=	perl5 Apache modules for DBI connections
-
-DEPENDS+=	ap-perl-[0-9]*:../../www/ap-perl
-DEPENDS+=	apache{,6}-1.3.*:../../www/apache
-
-USE_BUILDLINK2=	YES
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Apache/DBI/.packlist
-
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-DBI/PLIST b/www/ap-DBI/PLIST
deleted file mode 100644
index 210408acf44..00000000000
--- a/www/ap-DBI/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:15:28 zuntum Exp $
diff --git a/www/ap-DBI/distinfo b/www/ap-DBI/distinfo
deleted file mode 100644
index 7588095ab4a..00000000000
--- a/www/ap-DBI/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:02:30 skrll Exp $
-
-SHA1 (ApacheDBI-0.87.tar.gz) = ca67b7e70a438fe98580215856cf11c2b9c26728
-Size (ApacheDBI-0.87.tar.gz) = 25316 bytes
diff --git a/www/p5-Apache-DBILogConfig/Makefile b/www/p5-Apache-DBILogConfig/Makefile
index 9d634b9ea8b..49495865e6e 100644
--- a/www/p5-Apache-DBILogConfig/Makefile
+++ b/www/p5-Apache-DBILogConfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/07/05 07:14:45 tron Exp $
+# $NetBSD: Makefile,v 1.6 2002/09/25 18:39:36 wiz Exp $
 #
 
 DISTNAME=	Apache-DBILogConfig-0.01
@@ -8,9 +8,9 @@ CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
 
 MAINTAINER=	packages@NetBSD.org
-COMMENT=	A database-independent Apache database logger
+COMMENT=	database-independent Apache database logger
 
-DEPENDS+=	ap-DBI-[0-9]*:../../www/ap-DBI
+DEPENDS+=	p5-Apache-DBI>=0.87:../../databases/p5-Apache-DBI
 DEPENDS+=	p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index 5f50deae34b..19622bcb09a 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/05/29 15:10:59 uebayasi Exp $
+# $NetBSD: Makefile,v 1.6 2002/09/25 18:39:37 wiz Exp $
 #
 
 DISTNAME=	Template-Toolkit-2.07
@@ -11,7 +11,7 @@ MAINTAINER=	packages@NetBSD.org
 HOMEPAGE=	http://www.template-toolkit.org/
 COMMENT=	perl5 text template and dynamic web page intergration toolkit
 
-DEPENDS+=	ap-DBI>=0.87:../../www/ap-DBI
+DEPENDS+=	p5-Apache-DBI>=0.87:../../databases/p5-Apache-DBI
 DEPENDS+=	p5-AppConfig>=1.52:../../devel/p5-AppConfig
 DEPENDS+=	p5-Date-Calc>=4.3:../../devel/p5-Date-Calc
 DEPENDS+=	p5-DBI>=1.18:../../databases/p5-DBI
-- 
cgit v1.2.3