diff options
| author | wiz <wiz> | 2000-12-16 13:56:40 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2000-12-16 13:56:40 +0000 |
| commit | e227ba88f3f43e0a4f2164af38a854e89f70f762 (patch) | |
| tree | 6b0177dac7d7b13b2aa61adbfee3f5cc10bb65b7 /editors | |
| parent | 70ab511d2df59297e202dc154a37a3e8172bbb49 (diff) | |
| download | pkgsrc-e227ba88f3f43e0a4f2164af38a854e89f70f762.tar.gz | |
emacs and mule install files with the same name in info -- make
them CONFLICT.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs/Makefile | 4 | ||||
| -rw-r--r-- | editors/mule/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index cff891bba97..b7aa3089f7a 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2000/06/24 17:03:37 minoura Exp $ +# $NetBSD: Makefile,v 1.40 2000/12/16 13:56:40 wiz Exp $ # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp DISTNAME= emacs-20.7 @@ -8,6 +8,8 @@ MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html +CONFLICTS= mule-* + GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/editors/mule/Makefile b/editors/mule/Makefile index 3c3e3eefc10..4a5d4e2d4bc 100644 --- a/editors/mule/Makefile +++ b/editors/mule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/11/21 05:21:08 kei Exp $ +# $NetBSD: Makefile,v 1.2 2000/12/16 13:56:40 wiz Exp $ DISTNAME= mule-2.3 CATEGORIES= editors @@ -7,6 +7,8 @@ MASTER_SITES= ftp://ftp.m17n.org/pub/mule/ MAINTAINER= kei@netbsd.org HOMEPAGE= http://www.m17n.org/mule/MulePage.en.html +CONFLICTS= emacs-* + .include "../../mk/bsd.prefs.mk" .if !defined(USE_WNN4) || ${USE_WNN4} == YES |