pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/editors Set _EMACS_VERSION_MICRO for emacs-snapshot.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee7f52485de0
branches:  trunk
changeset: 394149:ee7f52485de0
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sat Jun 06 05:06:12 2009 +0000

description:
Set _EMACS_VERSION_MICRO for emacs-snapshot.

Suggested by Makoto Fujiwara in PR 40023.

diffstat:

 editors/emacs-snapshot/version.mk |   3 ++-
 editors/emacs/modules.mk          |  16 ++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diffs (66 lines):

diff -r c10787a5cfe7 -r ee7f52485de0 editors/emacs-snapshot/version.mk
--- a/editors/emacs-snapshot/version.mk Sat Jun 06 05:01:36 2009 +0000
+++ b/editors/emacs-snapshot/version.mk Sat Jun 06 05:06:12 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.1 2009/06/05 21:18:02 minskim Exp $
+# $NetBSD: version.mk,v 1.2 2009/06/06 05:06:12 minskim Exp $
 
 _EMACS_FLAVOR= emacs
 _EMACS_REQD=   emacs>=23
@@ -7,3 +7,4 @@
 
 _EMACS_VERSION_MAJOR=  23
 _EMACS_VERSION_MINOR=  0
+_EMACS_VERSION_MICRO=  94
diff -r c10787a5cfe7 -r ee7f52485de0 editors/emacs/modules.mk
--- a/editors/emacs/modules.mk  Sat Jun 06 05:01:36 2009 +0000
+++ b/editors/emacs/modules.mk  Sat Jun 06 05:06:12 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.5 2009/06/05 21:18:02 minskim Exp $
+# $NetBSD: modules.mk,v 1.6 2009/06/06 05:06:12 minskim Exp $
 #
 # This Makefile fragment handles Emacs Lisp Packages (== ELPs).
 #
@@ -139,6 +139,12 @@
 #              Possible values:
 #                      <integer>
 #
+#      EMACS_VERSION_MICRO
+#              Description:
+#                      Emacs micro version.
+#              Possible values:
+#                      <integer>
+#
 # Variables provided in ELPs' PLIST:
 #
 #      EMACS_ETCPREFIX
@@ -200,7 +206,8 @@
 _SYS_VARS.emacs=       EMACS_BIN EMACS_ETCPREFIX EMACS_FLAVOR \
                        EMACS_INFOPREFIX EMACS_LISPPREFIX \
                        EMACS_PKGNAME_PREFIX \
-                       EMACS_VERSION_MAJOR EMACS_VERSION_MINOR
+                       EMACS_VERSION_MAJOR EMACS_VERSION_MINOR \
+                       EMACS_VERSION_MICRO
 _DEF_VARS.emacs=       _EMACS_TYPE _EMACS_PKGBASE
 BUILD_DEFS+=           ${_USER_VARS.emacs}
 BUILD_DEFS_EFFECTS+=   ${_SYS_VARS.emacs}
@@ -288,6 +295,7 @@
 EMACS_BIN=             ${PREFIX}/bin/${_EMACS_FLAVOR}
 EMACS_VERSION_MAJOR=   ${_EMACS_VERSION_MAJOR}
 EMACS_VERSION_MINOR=   ${_EMACS_VERSION_MINOR}
+EMACS_VERSION_MICRO=   ${_EMACS_VERSION_MICRO}
 EMACS_ETCPREFIX=       ${PREFIX}/${_EMACS_ETCDIR.${_EMACS_FLAVOR}}
 EMACS_INFOPREFIX=      ${PREFIX}/${_EMACS_INFODIR.${_EMACS_FLAVOR}}
 EMACS_LISPPREFIX=      ${PREFIX}/${_EMACS_LISPDIR.${_EMACS_FLAVOR}}
@@ -329,7 +337,11 @@
 
 .if defined(EMACS_BUILDLINK)
 _EMACS_DIR=    ${BUILDLINK_DIR}/share/emacs
+.  if defined(_EMACS_VERSION_MICRO)
+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



Home | Main Index | Thread Index | Old Index