pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/46804: Emacs Load Path issues when using emacs-nox11 w/ other packages such as flim, semi, and skk
The following reply was made to PR pkg/46804; it has been noted by GNATS.
From: Makoto Fujiwara <makoto%ki.nu@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc:
Subject: Re: pkg/46804: Emacs Load Path issues when using emacs-nox11 w/ other
packages such as flim, semi, and skk
Date: Thu, 16 Aug 2012 20:19:40 +0900
| From: cfuhrman%panix.com@localhost
| Date: Wed, 15 Aug 2012 22:10:00 +0000 (UTC)
> >Fix:
....
> A longer term solution would be to fix how EMACSLOADPATH is
> defined in editors/emacs/modules.mk. One clue to fixing the
> issue can be found at
> http://www.ki.nu/~makoto/diary/2012/03/06/1.html although be
> warned that the provided patch found at
> http://www.ki.nu/~makoto/diary/attach/2012/20120306-emacs-modules.mk-diff
> did not work for me :/
The revised version of the fix will be:
Index: editors/emacs/modules.mk
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/editors/emacs/modules.mk,v
retrieving revision 1.16
diff -u -r1.16 modules.mk
--- editors/emacs/modules.mk 16 Jun 2012 21:04:56 -0000 1.16
+++ editors/emacs/modules.mk 16 Aug 2012 09:37:27 -0000
@@ -345,11 +345,16 @@
.if defined(EMACS_BUILDLINK)
_EMACS_DIR= ${BUILDLINK_DIR}/share/emacs
-. if empty(EMACS_TYPE:Memacs25)
-ALL_ENV+=
EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}/lisp:${_EMACS_DIR}/site-lisp
-. else
-ALL_ENV+=
EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}/lisp:${_EMACS_DIR}/site-lisp
-. endif
+
+# (Hopefully) matches only to emacs-[1-9]+, emacs-nox11-[1-9]+
+_EMACS_VERSION_DIR!= \
+ (${PKG_INFO} -e emacs-'[1-9n]*' || ${ECHO} "") | \
+ ${SED} -e 's/emacs-nox11-//' | \
+ ${SED} -e 's/emacs-//' | \
+ ${SED} -e 's/\.[0-9]\{8,\}//' | \
+ ${SED} -e 's/nb.*//'
+
+ALL_ENV+=
EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_DIR}/lisp:${_EMACS_DIR}/site-lisp
.include "${_EMACS_PKGDIR}/buildlink3.mk"
.endif
---
Makoto Fujiwara,
Chiba, Japan, Narita Airport and Disneyland prefecture.
Home |
Main Index |
Thread Index |
Old Index