summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>1998-07-14 22:56:40 +0000
committertron <tron@pkgsrc.org>1998-07-14 22:56:40 +0000
commitb51b76e2be329e938f9814ba34d691319d38324b (patch)
tree9449a23a1752c1f75fe2ec7e3c3b67bede68e731 /converters
parent7bae408426e27fc87b3a07a4c4d1790c15ebbe4a (diff)
downloadpkgsrc-b51b76e2be329e938f9814ba34d691319d38324b.tar.gz
Add "${CONFLICTS}".
Diffstat (limited to 'converters')
-rw-r--r--converters/kdesupport/Makefile4
-rw-r--r--converters/uulib/Makefile5
2 files changed, 7 insertions, 2 deletions
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