From e9fce1be0c0507d1e6fca64a72954abeb1282797 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Tue, 14 Jul 1998 22:56:40 +0000
Subject: Add "${CONFLICTS}".

---
 converters/kdesupport/Makefile | 4 +++-
 converters/uulib/Makefile      | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'converters')

diff --git a/converters/kdesupport/Makefile b/converters/kdesupport/Makefile
index 27b9fc820ad..38e2310dbdc 100644
--- a/converters/kdesupport/Makefile
+++ b/converters/kdesupport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/07/14 20:55:28 tron Exp $
+# $NetBSD: Makefile,v 1.9 1998/07/14 22:56:40 tron Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/11/05 04:19:46 asami Exp
 #
 
@@ -11,6 +11,8 @@ MAINTAINER=	tron@netbsd.org
 
 DEPENDS+=	qt-1.33:../../x11/qt
 
+CONFLICTS=	kdesupport-2.1b kdesupport-3.1b kdesupport-4.1b
+
 USE_X11=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=${PREFIX}" \
diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index 44e76c97628..a085f2aaefc 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/06/20 09:33:13 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/07/14 22:58:24 tron Exp $
 # FreeBSD Id: Makefile,v 1.14 1998/02/18 22:20:02 hoek Exp
 #
 
@@ -10,6 +10,9 @@ MASTER_SITES=	http://www.uni-frankfurt.de/~fp/uudeview/Apps/frank/  \
 
 MAINTAINER=	packages@netbsd.org
 
+# "kdesupport-2.1b" included "uu" library.
+CONFLICTS=	kdesupport-2.1b
+
 GNU_CONFIGURE=	yes
 
 ALL_TARGET=	libuu.a	libuu.so.1.0
-- 
cgit v1.2.3