CVS commit: pkgsrc

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Wed Jun 20 11:15:44 UTC 2018

Modified Files:
        pkgsrc/doc: CHANGES-2018
        pkgsrc/editors: Makefile
        pkgsrc/editors/emacs: modules.mk

Log Message:
Added editors/emacs26{,-nox11} version 26.1 [makoto 2018-06-20]


To generate a diff of this commit:
cvs rdiff -u -r1.2923 -r1.2924 pkgsrc/doc/CHANGES-2018
cvs rdiff -u -r1.185 -r1.186 pkgsrc/editors/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/editors/emacs/modules.mk

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

Modified files:

Index: pkgsrc/doc/CHANGES-2018
diff -u pkgsrc/doc/CHANGES-2018:1.2923 pkgsrc/doc/CHANGES-2018:1.2924
--- pkgsrc/doc/CHANGES-2018:1.2923      Wed Jun 20 09:29:59 2018
+++ pkgsrc/doc/CHANGES-2018     Wed Jun 20 11:15:44 2018
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2018,v 1.2923 2018/06/20 09:29:59 jperkin Exp $
+$NetBSD: CHANGES-2018,v 1.2924 2018/06/20 11:15:44 mef Exp $
 
 Changes to the packages collection and infrastructure in 2018:
 
@@ -4158,3 +4158,5 @@ Changes to the packages collection and i
        Added math/p5-Math-Systems version 0.01 [mef 2018-06-20]
        Updated security/libgcrypt to 1.8.3 [adam 2018-06-20]
        Updated pkgtools/pkgin to 0.11.2 [jperkin 2018-06-20]
+       Added editors/emacs26 version 26.1 [makoto 2018-06-20]
+       Added editors/emacs26-nox11 version 26.1 [makoto 2018-06-20]

Index: pkgsrc/editors/Makefile
diff -u pkgsrc/editors/Makefile:1.185 pkgsrc/editors/Makefile:1.186
--- pkgsrc/editors/Makefile:1.185       Fri Nov 24 06:47:15 2017
+++ pkgsrc/editors/Makefile     Wed Jun 20 11:15:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.185 2017/11/24 06:47:15 kamil Exp $
+# $NetBSD: Makefile,v 1.186 2018/06/20 11:15:44 mef Exp $
 #
 
 COMMENT=       Editors
@@ -38,6 +38,8 @@ SUBDIR+=      emacs21
 SUBDIR+=       emacs21-nox11
 SUBDIR+=       emacs25
 SUBDIR+=       emacs25-nox11
+SUBDIR+=       emacs26
+SUBDIR+=       emacs26-nox11
 SUBDIR+=       ex
 SUBDIR+=       fe
 SUBDIR+=       gate

Index: pkgsrc/editors/emacs/modules.mk
diff -u pkgsrc/editors/emacs/modules.mk:1.22 pkgsrc/editors/emacs/modules.mk:1.23
--- pkgsrc/editors/emacs/modules.mk:1.22        Fri Sep 29 12:40:27 2017
+++ pkgsrc/editors/emacs/modules.mk     Wed Jun 20 11:15:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.22 2017/09/29 12:40:27 wiz Exp $
+# $NetBSD: modules.mk,v 1.23 2018/06/20 11:15:44 mef Exp $
 #
 # This Makefile fragment handles Emacs Lisp Packages (== ELPs).
 #
@@ -41,7 +41,7 @@
 #                      The user's favourite Emacs version.  The default
 #                      value is set in mk/defaults/mk.conf.
 #              Possible values:
-#                      emacs25, emacs21, emacs21nox, emacs20,
+#                      emacs26, emacs25, emacs21, emacs21nox, emacs20,
 #                      xemacs215, xemacs215nox, xemacs214, xemacs214nox
 #              Default value:
 #                      emacs25
@@ -61,10 +61,10 @@
 #              Description:
 #                      Versions the ELP accepts (supports).
 #              Possible values:
-#                      emacs25, emacs21, emacs21nox, emacs20,
+#                      emacs26, emacs25, emacs21, emacs21nox, emacs20,
 #                      xemacs215, xemacs215nox, xemacs214, xemacs214nox
 #              Default value:
-#                      emacs25, emacs21, emacs21nox, emacs20,
+#                      emacs26, emacs25, emacs21, emacs21nox, emacs20,
 #                      xemacs215, xemacs215nox, xemacs214, xemacs214nox
 #
 #      EMACS_BUILDLINK
@@ -174,10 +174,10 @@
 #              Possible values:
 #                      XXX
 #
-#      FOR_{emacs25,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
+#      FOR_{emacs26,emacs25,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
 #      FOR_{emacs,xemacs}
 #      FOR_{emacs_x,emacs_nox}
-#      NOTFOR_{emacs25,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
+#      NOTFOR_{emacs26,emacs25,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
 #      NOTFOR_{emacs,xemacs}
 #      NOTFOR_{emacs_x,emacs_nox}
 #              Description:
@@ -221,7 +221,7 @@ BUILD_DEFS_EFFECTS+=        ${_SYS_VARS.emacs}
 #
 
 _EMACS_VERSIONS_ALL= \
-       emacs20 emacs21 emacs21nox emacs25 emacs25nox \
+       emacs20 emacs21 emacs21nox emacs25 emacs25nox emacs26 emacs26nox\
        xemacs214 xemacs214nox xemacs215 xemacs215nox
 
 _EMACS_PKGDIR_MAP= \
@@ -230,6 +230,8 @@ _EMACS_PKGDIR_MAP= \
        emacs21nox@../../editors/emacs21-nox11 \
        emacs25@../../editors/emacs25 \
        emacs25nox@../../editors/emacs25-nox11 \
+       emacs26@../../editors/emacs26 \
+       emacs26nox@../../editors/emacs26-nox11 \
        xemacs214@../../editors/xemacs \
        xemacs214nox@../../editors/xemacs-nox11 \
        xemacs215@../../editors/xemacs-current \
@@ -340,10 +342,11 @@ PRINT_PLIST_AWK+= { gsub(/${EMACS_LISPPR
 
 .if defined(EMACS_BUILDLINK)
 _EMACS_DIR=    ${BUILDLINK_DIR}/share/emacs
-.  if empty(EMACS_TYPE:Memacs26)
-ALL_ENV+=      EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}/lisp:${_EMACS_DIR}/site-lisp
-.  else
+#  development version usually claims three digit, say, 27.0.50 etc
+.  if !empty(EMACS_TYPE:Memacs27)
 ALL_ENV+=      EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}/lisp:${_EMACS_DIR}/site-lisp
+.  else
+ALL_ENV+=      EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}/lisp:${_EMACS_DIR}/site-lisp
 .  endif
 .include       "${_EMACS_PKGDIR}/buildlink3.mk"
 .endif