From b53bd7cb835f1fdef4f77b20a740252ad205406f Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sun, 22 Oct 2000 18:43:58 +0000
Subject: [PATCH] One of the ickiest points of multi packages is the correct
 handling of package conflicts.

openldap-client -> openldapclient. This will have to do, until we have
much better package tools.
---
 databases/openldap/Makefile         | 4 ++--
 databases/openldap/pkg/PLIST        | 3 ++-
 databases/openldap/pkg/PLIST-client | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index b3e380000df..846bcb8edec 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2000/10/22 14:03:04 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2000/10/22 18:43:58 espie Exp $
 
 MULTI_PACKAGES=	-client
 SUBPACKAGE?=
@@ -9,7 +9,7 @@ CATEGORIES=	databases net
 NEED_VERSION=	1.338
 
 .if ${SUBPACKAGE} == "-client"
-PKGNAME=	openldap-client-${VERSION}
+PKGNAME=	openldapclient-${VERSION}
 .else
 PKGNAME=	openldap-${VERSION}
 .endif
diff --git a/databases/openldap/pkg/PLIST b/databases/openldap/pkg/PLIST
index caf0435bbf2..d3d07222697 100644
--- a/databases/openldap/pkg/PLIST
+++ b/databases/openldap/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2000/10/05 15:54:37 jakob Exp $
+@comment $OpenBSD: PLIST,v 1.3 2000/10/22 18:43:59 espie Exp $
+@pkgcfl openldapclient-*
 bin/ldapadd
 bin/ldapdelete
 bin/ldapmodify
diff --git a/databases/openldap/pkg/PLIST-client b/databases/openldap/pkg/PLIST-client
index fdebfc46111..159d0f9328a 100644
--- a/databases/openldap/pkg/PLIST-client
+++ b/databases/openldap/pkg/PLIST-client
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST-client,v 1.1.1.1 2000/10/04 21:22:25 jakob Exp $
+@comment $OpenBSD: PLIST-client,v 1.2 2000/10/22 18:44:00 espie Exp $
+@pkgcfl openldap-*
 bin/ldapadd
 bin/ldapdelete
 bin/ldapmodify