diff options
| author | hubertf <hubertf@pkgsrc.org> | 1999-02-20 22:48:24 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 1999-02-20 22:48:24 +0000 |
| commit | 2a95ad9c6be52511880e6ee241b087af70706624 (patch) | |
| tree | f0ac98b899382f539e1e39385f1316edd18626bd /editors | |
| parent | 2821cb11104fb7319e84b4cd1808cf56f3604a54 (diff) | |
| download | pkgsrc-2a95ad9c6be52511880e6ee241b087af70706624.tar.gz | |
Fix CONFLICTS (remove redundancy, mostly)
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs/Makefile | 4 | ||||
| -rw-r--r-- | editors/hexedit/Makefile | 4 | ||||
| -rw-r--r-- | editors/pico/Makefile | 4 | ||||
| -rw-r--r-- | editors/xemacs20/Makefile | 4 |
4 files changed, 4 insertions, 12 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 57439d9a036..b0ade126161 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 1999/02/04 14:54:25 frueauf Exp $ +# $NetBSD: Makefile,v 1.25 1999/02/20 22:48:27 hubertf Exp $ # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp # @@ -9,8 +9,6 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html -CONFLICTS= emacs-20.2 - GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS+=--with-pop --with-x --with-x-toolkit=lucid diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile index df0f6f4bdaf..e185ad44d8b 100644 --- a/editors/hexedit/Makefile +++ b/editors/hexedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1999/02/06 20:32:43 frueauf Exp $ +# $NetBSD: Makefile,v 1.5 1999/02/20 22:48:27 hubertf Exp $ # DISTNAME= hexedit-1.1.0 @@ -12,8 +12,6 @@ HOMEPAGE= http://www.chez.com/prigaux/hexedit.html DEPENDS+= ncurses-1.9.9g:../../devel/ncurses -CONFLICTS= hexedit-* - GNU_CONFIGURE= yes CONFIGURE_ENV+= LIBS="-L${PREFIX}/lib" INSTALL=/usr/bin/install diff --git a/editors/pico/Makefile b/editors/pico/Makefile index f3b909d4723..091b739becf 100644 --- a/editors/pico/Makefile +++ b/editors/pico/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 1998/11/13 15:56:24 tv Exp $ +# $NetBSD: Makefile,v 1.14 1999/02/20 22:48:28 hubertf Exp $ # DISTNAME= pine4.05 @@ -11,8 +11,6 @@ HOMEPAGE= http://www.washington.edu/pine/ USE_LIBTOOL= yes -CONFLICTS= pico-2.9 pine-3.96 pico-3.0 pine-4.02 pico-3.2 - do-build: cd ${WRKSRC} && ./build neb CC="${LIBTOOL} ${CC}" PREFIX=${PREFIX} diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile index 270ec039bcc..da5959a9703 100644 --- a/editors/xemacs20/Makefile +++ b/editors/xemacs20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 1999/01/20 16:56:00 hubertf Exp $ +# $NetBSD: Makefile,v 1.39 1999/02/20 22:48:28 hubertf Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1997/09/03 19:27:57 gj Exp # @@ -23,8 +23,6 @@ DEPENDS+= Xaw3d-1.5:../../x11/Xaw3d DEPENDS+= png-1.0.2:../../graphics/png DEPENDS+= gdbm-1.7.3:../../databases/gdbm -CONFLICTS+= xemacs-20.3 - NOT_FOR_ARCHS= alpha mips #fails purespace dumping HAS_CONFIGURE= yes |