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

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/editors/emacs-snapshot/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/editors/emacs-snapshot/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- pkgsrc/editors/emacs-snapshot/Makefile	2015/04/25 14:20:41	1.57
+++ pkgsrc/editors/emacs-snapshot/Makefile	2015/06/14 15:46:21	1.58
@@ -1,7 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2015/04/25 14:20:41 tnn Exp $
-
-PKGREVISION=	10
-CONFLICTS+=	emacs${_EMACS_VERSION_MAJOR}-nox11-[0-9]*
+# $NetBSD: Makefile,v 1.58 2015/06/14 15:46:21 mef Exp $
 
 .include "../../editors/emacs-snapshot/Makefile.common"