diff options
| author | hubertf <hubertf> | 1999-02-20 22:48:24 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 1999-02-20 22:48:24 +0000 |
| commit | a4cbe4cb0445443d02c5d3c6f788d17367537b92 (patch) | |
| tree | f0ac98b899382f539e1e39385f1316edd18626bd /editors/emacs | |
| parent | 878b71762a717be3626e0baac746b75c52f812b6 (diff) | |
| download | pkgsrc-a4cbe4cb0445443d02c5d3c6f788d17367537b92.tar.gz | |
Fix CONFLICTS (remove redundancy, mostly)
Diffstat (limited to 'editors/emacs')
| -rw-r--r-- | editors/emacs/Makefile | 4 |
1 files changed, 1 insertions, 3 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 |