diff options
| author | dholland <dholland> | 2013-03-24 15:15:09 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2013-03-24 15:15:09 +0000 |
| commit | b3ae8d1cf47c59c85bc3a00d9018b480dd78dce7 (patch) | |
| tree | 2e6961422370dbdff6c2d2b677d7186553195ed6 /editors | |
| parent | 5930f6b6cf4d3fd50a950acaa8676cb7347d390a (diff) | |
| download | pkgsrc-b3ae8d1cf47c59c85bc3a00d9018b480dd78dce7.tar.gz | |
Remove another wrong CONFLICTS. sigh
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs24/Makefile.common | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/editors/emacs24/Makefile.common b/editors/emacs24/Makefile.common index 5b7c64e5eef..3ae7a0aea95 100644 --- a/editors/emacs24/Makefile.common +++ b/editors/emacs24/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2013/03/15 22:44:59 wiz Exp $ +# $NetBSD: Makefile.common,v 1.5 2013/03/24 15:15:09 dholland Exp $ # # used by editors/emacs24/Makefile # used by editors/emacs24-nox11/Makefile @@ -16,8 +16,6 @@ LICENSE= gnu-gpl-v3 WRKSRC= ${WRKDIR}/${DISTNAME:S/b$//} MAKE_JOBS_SAFE= no -CONFLICTS+= emacs-nox11-[0-9]* - GNU_CONFIGURE= yes INFO_FILES= yes USE_TOOLS+= autoconf automake gmake makeinfo gzip |