From f0c411226c401d5fdb4f719bf808d3e92b3f2d05 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Thu, 30 Dec 2004 11:37:59 +0000
Subject: [PATCH] okay, conflicting with a dependency is not good.

---
 databases/p5-DBD-CSV/Makefile  | 3 ++-
 databases/p5-DBD-CSV/pkg/PLIST | 3 +--
 databases/p5-DBI/Makefile      | 4 ++--
 databases/p5-DBI/pkg/PLIST     | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/databases/p5-DBD-CSV/Makefile b/databases/p5-DBD-CSV/Makefile
index 1910ef49e2e..ebf388e01ef 100644
--- a/databases/p5-DBD-CSV/Makefile
+++ b/databases/p5-DBD-CSV/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2004/12/30 01:01:37 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2004/12/30 11:37:59 espie Exp $
 
 COMMENT=	"perl DBI driver for CSV files"
 
+BROKEN=		"can't install on top of DBD-1.45"
 DISTNAME=	DBD-CSV-0.2002
 PKGNAME=	p5-${DISTNAME}p0
 CATEGORIES=	databases perl5 
diff --git a/databases/p5-DBD-CSV/pkg/PLIST b/databases/p5-DBD-CSV/pkg/PLIST
index 9c23bfc43c6..e7b93cebb0b 100644
--- a/databases/p5-DBD-CSV/pkg/PLIST
+++ b/databases/p5-DBD-CSV/pkg/PLIST
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2004/12/30 01:01:37 espie Exp $
-@conflict p5-DBI-*
+@comment $OpenBSD: PLIST,v 1.5 2004/12/30 11:37:59 espie Exp $
 ${P5SITE}/Bundle/DBD/
 ${P5SITE}/Bundle/DBD/CSV.pm
 ${P5SITE}/DBD/
diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile
index d6f90b779e9..ad58ac7aa17 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.37 2004/12/30 01:01:37 espie Exp $
+# $OpenBSD: Makefile,v 1.38 2004/12/30 11:37:59 espie Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
 COMMENT=	"unified perl interface for database access"
 
 DISTNAME=	DBI-1.45
-PKGNAME=	p5-${DISTNAME}p0
+PKGNAME=	p5-${DISTNAME}p1
 CATEGORIES=	databases perl5
 
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBI/}
diff --git a/databases/p5-DBI/pkg/PLIST b/databases/p5-DBI/pkg/PLIST
index 9e2ca8923eb..cafa10f0221 100644
--- a/databases/p5-DBI/pkg/PLIST
+++ b/databases/p5-DBI/pkg/PLIST
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.24 2004/12/30 01:01:37 espie Exp $
-@conflict p5-DBD-CSV-*
+@comment $OpenBSD: PLIST,v 1.25 2004/12/30 11:37:59 espie Exp $
 bin/dbiprof
 bin/dbiproxy
 ${P5ARCH}/