Sun Jan 1 02:06:46 2017 UTC ()
Use the package "editors/emacs25" and not "editors/emacs-snapshot" for
the new default "emacs25".


(tron)
diff -r1.40 -r1.41 pkgsrc/editors/emacs/Makefile.common
cvs diff -r1.40 -r1.41 pkgsrc/editors/emacs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/emacs/Makefile.common 2013/02/23 23:36:49 1.40
+++ pkgsrc/editors/emacs/Makefile.common 2017/01/01 02:06:46 1.41
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.40 2013/02/23 23:36:49 dholland Exp $ 1# $NetBSD: Makefile.common,v 1.41 2017/01/01 02:06:46 tron Exp $
2# 2#
3# used by editors/emacs/Makefile 3# used by editors/emacs/Makefile
4# used by editors/emacs-nox11/Makefile 4# used by editors/emacs-nox11/Makefile
5 5
6CATEGORIES= editors 6CATEGORIES= editors
7MASTER_SITES= # empty 7MASTER_SITES= # empty
8DISTFILES= # empty 8DISTFILES= # empty
9 9
10MAINTAINER= dholland@NetBSD.org 10MAINTAINER= dholland@NetBSD.org
11COMMENT= Meta-package for installing the preferred Emacs version 11COMMENT= Meta-package for installing the preferred Emacs version
12 12
13META_PACKAGE= yes 13META_PACKAGE= yes
14 14
@@ -28,27 +28,27 @@ MY_EMACS_TYPE?=${EMACS_TYPE} @@ -28,27 +28,27 @@ MY_EMACS_TYPE?=${EMACS_TYPE}
28EMACS_BASE_TYPE=${MY_EMACS_TYPE:S/nox//} 28EMACS_BASE_TYPE=${MY_EMACS_TYPE:S/nox//}
29EMACS_MAJOR=${EMACS_BASE_TYPE:S/emacs//} 29EMACS_MAJOR=${EMACS_BASE_TYPE:S/emacs//}
30 30
31# Sigh. 31# Sigh.
32.if ${MY_EMACS_TYPE} == "emacs20nox" 32.if ${MY_EMACS_TYPE} == "emacs20nox"
33MY_EMACS_TYPE:= emacs20 33MY_EMACS_TYPE:= emacs20
34.endif 34.endif
35 35
36.if !empty(MY_EMACS_TYPE:Mxemacs*) 36.if !empty(MY_EMACS_TYPE:Mxemacs*)
37PKG_FAIL_REASON+= "EMACS_TYPE is xemacs." 37PKG_FAIL_REASON+= "EMACS_TYPE is xemacs."
38# (Set these to avoid crashing out below.) 38# (Set these to avoid crashing out below.)
39EMACS_PKGDIR= ../../editors/xemacs 39EMACS_PKGDIR= ../../editors/xemacs
40EMACS_PACKAGE= xemacs 40EMACS_PACKAGE= xemacs
41.elif ${MY_EMACS_TYPE} == "emacs25" 41.elif ${MY_EMACS_TYPE} == "emacs26"
42EMACS_PKGDIR= ../../editors/emacs-snapshot 42EMACS_PKGDIR= ../../editors/emacs-snapshot
43EMACS_PACKAGE= ${EMACS_BASE_TYPE} 43EMACS_PACKAGE= ${EMACS_BASE_TYPE}
44.elif !empty(MY_EMACS_TYPE:M*nox) 44.elif !empty(MY_EMACS_TYPE:M*nox)
45EMACS_PKGDIR= ../../editors/${EMACS_BASE_TYPE}-nox11 45EMACS_PKGDIR= ../../editors/${EMACS_BASE_TYPE}-nox11
46EMACS_PACKAGE= ${EMACS_BASE_TYPE}-nox11 46EMACS_PACKAGE= ${EMACS_BASE_TYPE}-nox11
47.else 47.else
48EMACS_PKGDIR= ../../editors/${EMACS_BASE_TYPE} 48EMACS_PKGDIR= ../../editors/${EMACS_BASE_TYPE}
49EMACS_PACKAGE= ${EMACS_BASE_TYPE} 49EMACS_PACKAGE= ${EMACS_BASE_TYPE}
50.endif 50.endif
51 51
52DEPENDS+= ${EMACS_PACKAGE}>=${EMACS_MAJOR}:${EMACS_PKGDIR} 52DEPENDS+= ${EMACS_PACKAGE}>=${EMACS_MAJOR}:${EMACS_PKGDIR}
53 53
54# 54#