[pkgsrc/trunk]: pkgsrc/editors/emacs25-nox11 Fix CONFLICTS pattern, pointed b...

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/56e218075717
branches:  trunk
changeset: 353006:56e218075717
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Wed Sep 21 12:21:51 2016 +0000

description:
Fix CONFLICTS pattern, pointed by @yatasan on twitter

diffstat:

 editors/emacs25-nox11/Makefile |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (14 lines):

diff -r 93a66e23fbf2 -r 56e218075717 editors/emacs25-nox11/Makefile
--- a/editors/emacs25-nox11/Makefile    Wed Sep 21 11:55:01 2016 +0000
+++ b/editors/emacs25-nox11/Makefile    Wed Sep 21 12:21:51 2016 +0000
@@ -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