summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2016-09-21 12:21:51 +0000
committerryoon <ryoon@pkgsrc.org>2016-09-21 12:21:51 +0000
commitf3463baad7cd91122a68169170a36afb93cadabf (patch)
tree40c1c73b578ad0e2229318dbb00f7142bf4802d5 /editors
parent0dd6487e6b23f2c5b1b1c98b82c31cac5f44499b (diff)
downloadpkgsrc-f3463baad7cd91122a68169170a36afb93cadabf.tar.gz
Fix CONFLICTS pattern, pointed by @yatasan on twitter
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs25-nox11/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/emacs25-nox11/Makefile b/editors/emacs25-nox11/Makefile
index 54c8878140b..29f20b1d46b 100644
--- a/editors/emacs25-nox11/Makefile
+++ b/editors/emacs25-nox11/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2016/09/18 13:38:22 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2016/09/21 12:21:51 ryoon Exp $
PKGNAME= ${DISTNAME:S/emacs/emacs25/:S/-/-nox11-/}
-CONFLICTS+= emacs24-[0-9]*
+CONFLICTS+= emacs25-[0-9]*
FILESDIR= ${.CURDIR}/../../editors/emacs25/files
PATCHDIR= ${.CURDIR}/../../editors/emacs25/patches