diff options
| author | wiz <wiz> | 2003-04-05 21:40:53 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2003-04-05 21:40:53 +0000 |
| commit | 3597f945648c9e9308f96f4eaee97157e2a7f2d7 (patch) | |
| tree | 8aa3f486e92532b25e3758b7419273f1ff7daf9a | |
| parent | eac7d2ddec3ab6a8ad04ea95b0b55db2f77debeb (diff) | |
| download | pkgsrc-3597f945648c9e9308f96f4eaee97157e2a7f2d7.tar.gz | |
Add conflicts between jed and xjed.
| -rw-r--r-- | editors/jed/Makefile | 4 | ||||
| -rw-r--r-- | editors/xjed/Makefile | 4 |
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 |