From 7385e856056a845810373564608f2999fd5f2746 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sat, 5 May 2001 22:20:35 +0000
Subject: [PATCH] +pm3, +cvsup register conflicts with cvsup-bin packages.

---
 lang/Makefile               | 3 ++-
 net/Makefile                | 7 +++++--
 net/cvsup-bin-old/pkg/PLIST | 3 ++-
 net/cvsup-bin/pkg/PLIST     | 3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lang/Makefile b/lang/Makefile
index de596da68a9..9a41667cb28 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2001/05/05 21:28:07 espie Exp $
+# $OpenBSD: Makefile,v 1.44 2001/05/05 22:20:35 espie Exp $
 # $FreeBSD: Makefile,v 1.89 1997/11/24 09:24:06 tg Exp $
 #
 
@@ -55,6 +55,7 @@
 #    SUBDIR += perl5
 #    SUBDIR += pgcc
 #    SUBDIR += pgcc-current
+     SUBDIR += pm3
      SUBDIR += python,
      SUBDIR += python,threads
      SUBDIR += python,tk,threads,no_tools
diff --git a/net/Makefile b/net/Makefile
index 02f24e817ea..d836505e9ed 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.137 2001/05/05 21:28:10 espie Exp $
+# $OpenBSD: Makefile,v 1.138 2001/05/05 22:20:37 espie Exp $
 # $FreeBSD: Makefile,v 1.129 1997/11/20 13:47:40 itojun Exp $
 #
 
@@ -21,7 +21,10 @@
      SUBDIR += courtney
      SUBDIR += curl
      SUBDIR += curl,kerberos
-#    SUBDIR += cvsup
+     SUBDIR += cvsup
+     SUBDIR += cvsup,no_x11
+     SUBDIR += cvsup,static
+     SUBDIR += cvsup,static,no_x11
      SUBDIR += cvsup-bin
      SUBDIR += cvsup-bin,no_x11
      SUBDIR += cvsup-bin-old
diff --git a/net/cvsup-bin-old/pkg/PLIST b/net/cvsup-bin-old/pkg/PLIST
index 306bbfa2ed8..4767ae329e0 100644
--- a/net/cvsup-bin-old/pkg/PLIST
+++ b/net/cvsup-bin-old/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2000/08/29 19:57:18 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.3 2001/05/05 22:20:40 espie Exp $
+@pkgcfl cvsup-[0-9]*
 bin/cvpasswd
 bin/cvsup
 man/cat1/cvpasswd.0
diff --git a/net/cvsup-bin/pkg/PLIST b/net/cvsup-bin/pkg/PLIST
index ef086597e97..a7b40a57110 100644
--- a/net/cvsup-bin/pkg/PLIST
+++ b/net/cvsup-bin/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2000/08/29 19:57:18 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.3 2001/05/05 22:20:38 espie Exp $
+@pkgcfl cvsup-[0-9]*
 bin/cvpasswd
 bin/cvsup
 libexec/cvsup