diff options
| author | uebayasi <uebayasi> | 2008-10-11 09:31:54 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi> | 2008-10-11 09:31:54 +0000 |
| commit | b96889b1354fc2db619e890c37d47726128607e1 (patch) | |
| tree | 28f89f081daec07805c1f982f0bc63a420c005ba /inputmethod/skk | |
| parent | 82bb21f245fe7a2dee3f10a3aec11ffd03c27e07 (diff) | |
| download | pkgsrc-b96889b1354fc2db619e890c37d47726128607e1.tar.gz | |
Move mk/emacs.mk to editors/emacs/modules.mk.
Don't call pkg_info to get the installed Emacs version; always use the
version matching EMACS_TYPE set by users. Be DEPENDS to it. This should
address pkg/37146 by Aleksey Cheusov.
While here convert some emacs lisp packages to user-destdir.
Diffstat (limited to 'inputmethod/skk')
| -rw-r--r-- | inputmethod/skk/Makefile | 19 | ||||
| -rw-r--r-- | inputmethod/skk/files/SKK-CFG | 19 |
2 files changed, 20 insertions, 18 deletions
diff --git a/inputmethod/skk/Makefile b/inputmethod/skk/Makefile index b973eb52e02..89939c379c5 100644 --- a/inputmethod/skk/Makefile +++ b/inputmethod/skk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2008/05/30 16:03:17 brook Exp $ +# $NetBSD: Makefile,v 1.18 2008/10/11 09:31:57 uebayasi Exp $ # DISTNAME= ddskk-20080309 @@ -11,32 +11,29 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= http://openlab.ring.gr.jp/skk/index.html COMMENT= Japanese input methods for Emacs +PKG_DESTDIR_SUPPORT= user-destdir + CONFLICTS= ddskk-[0-9]* EMACS_MODULES+= base leim MAKEFLAGS+= EMACS=${EMACS_BIN:Q} +MAKE_ENV= prefix=${DESTDIR:Q}${PREFIX:Q} \ + EMACS_INFOPREFIX=${DESTDIR:Q}${EMACS_INFOPREFIX:Q} \ + EMACS_LISPPREFIX=${DESTDIR:Q}${EMACS_LISPPREFIX:Q} BUILD_TARGET= elc INFO_FILES= # PLIST -# SKK-CFG was copied from ${FILESDIR} during post-extract. -SUBST_CLASSES+= cfg -SUBST_STAGE.cfg= do-configure -SUBST_FILES.cfg= SKK-CFG -SUBST_SED.cfg= -e 's|@PREFIX@|${PREFIX}|g' \ - -e 's|@EMACS_INFOPREFIX@|${EMACS_INFOPREFIX}|g' \ - -e 's|@EMACS_LISPPREFIX@|${EMACS_LISPPREFIX}|g' - # Substitute directory definitions during do-configure. post-extract: @${MV} ${WRKSRC}/SKK-CFG ${WRKSRC}/SKK-CFG.orig @${CP} ${FILESDIR}/SKK-CFG ${WRKSRC} - @${CHMOD} +w ${WRKSRC}/doc/skk.texi + @${CHMOD} +w ${WRKSRC}/skk-dic.* ${WRKSRC}/doc/skk.texi .include "options.mk" -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../devel/apel/buildlink3.mk" .include "../../editors/mule-ucs/buildlink3.mk" diff --git a/inputmethod/skk/files/SKK-CFG b/inputmethod/skk/files/SKK-CFG index e483124818e..bb424a3d41c 100644 --- a/inputmethod/skk/files/SKK-CFG +++ b/inputmethod/skk/files/SKK-CFG @@ -1,12 +1,17 @@ -;;; $NetBSD: SKK-CFG,v 1.2 2006/04/08 19:29:52 jlam Exp $ +;;; $NetBSD: SKK-CFG,v 1.3 2008/10/11 09:31:57 uebayasi Exp $ ;;; from inputmethods/ddskk/files/SKK-CFG ;;; NetBSD: SKK-CFG,v 1.1.1.1 2002/09/16 13:20:44 uebayasi Exp ;;; -(setq APEL_SPECIFIC_LISPDIR "@EMACS_LISPPREFIX@/apel") -(setq LISPDIR "@EMACS_LISPPREFIX@") + +(setq pkgsrc-prefix (getenv "prefix")) +(setq pkgsrc-emacs-infoprefix (getenv "EMACS_INFOPREFIX")) +(setq pkgsrc-emacs-lispprefix (getenv "EMACS_LISPPREFIX")) + +(setq APEL_SPECIFIC_LISPDIR (concat pkgsrc-emacs-lispprefix "/apel")) +(setq LISPDIR pkgsrc-emacs-lispprefix) ;;; XXX We avoid *.{el,elc} files installed under .../emacs/2?.?/site-lisp/... -(setq VERSION_SPECIFIC_LISPDIR "@EMACS_LISPPREFIX@") +(setq VERSION_SPECIFIC_LISPDIR pkgsrc-emacs-lispprefix) (setq EMU_PREFIX "emu") -(setq SKK_DATADIR "@PREFIX@/share/skk") -(setq SKK_INFODIR "@EMACS_INFOPREFIX@") -(setq SKK_LISPDIR "@EMACS_LISPPREFIX@/skk") +(setq SKK_DATADIR (concat pkgsrc-prefix "/share/skk")) +(setq SKK_INFODIR pkgsrc-emacs-infoprefix) +(setq SKK_LISPDIR (concat pkgsrc-emacs-lispprefix "/skk")) |