summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2003-04-05 21:40:53 +0000
committerwiz <wiz@pkgsrc.org>2003-04-05 21:40:53 +0000
commitb5035828042d6a93b211d3458be22fa0c9d08c3f (patch)
tree8aa3f486e92532b25e3758b7419273f1ff7daf9a /editors
parent861749e706d227aa7ade6b1369be159392690af9 (diff)
downloadpkgsrc-b5035828042d6a93b211d3458be22fa0c9d08c3f.tar.gz
Add conflicts between jed and xjed.
Diffstat (limited to 'editors')
-rw-r--r--editors/jed/Makefile4
-rw-r--r--editors/xjed/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index c3d7a188952..c1eab344cbf 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2003/04/05 21:34:14 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2003/04/05 21:40:53 wiz Exp $
#
PKGNAME= jed-0.99.16
.include "../jed/Makefile.common"
COMMENT= Extensible folding editor with Emacs/WordStar/EDT emulations
+CONFLICTS= xjed-[0-9]*
+
CONFIGURE_ARGS+= --without-X
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/xjed/Makefile b/editors/xjed/Makefile
index 08291d5fdb5..261a2006ccf 100644
--- a/editors/xjed/Makefile
+++ b/editors/xjed/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2003/04/05 21:39:41 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/04/05 21:40:54 wiz Exp $
#
PKGNAME= xjed-0.99.16
.include "../jed/Makefile.common"
COMMENT= Extensible folding editor with Emacs/WordStar/EDT emulations, X11 version
+CONFLICTS= jed-[0-9]*
+
USE_X11= yes
CONFIGURE_ARGS+= --with-x