CVS commit: pkgsrc/editors/emacs25-nox11

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Sep 21 12:21:51 UTC 2016

Modified Files:
        pkgsrc/editors/emacs25-nox11: Makefile

Log Message:
Fix CONFLICTS pattern, pointed by @yatasan on twitter


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/emacs25-nox11/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/emacs25-nox11/Makefile
diff -u pkgsrc/editors/emacs25-nox11/Makefile:1.1 pkgsrc/editors/emacs25-nox11/Makefile:1.2
--- pkgsrc/editors/emacs25-nox11/Makefile:1.1   Sun Sep 18 13:38:22 2016
+++ pkgsrc/editors/emacs25-nox11/Makefile       Wed Sep 21 12:21:51 2016
@@ -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