[pkgsrc/trunk]: pkgsrc/inputmethod/skk Use EMACS_MODULES instead of EMACS_USE...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b1ad5278395b
branches:  trunk
changeset: 509952:b1ad5278395b
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Mar 20 05:30:33 2006 +0000

description:
Use EMACS_MODULES instead of EMACS_USE_LEIM and the conditional dependency
on xemacs-packages.  In the "lookup" option dependency, correct the
package dependency name in the xemacs case by fixing a typo.  Bump the
PKGREVISION to 4.

diffstat:

 inputmethod/skk/Makefile   |  9 ++++-----
 inputmethod/skk/options.mk |  4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (51 lines):

diff -r 5294c868d77f -r b1ad5278395b inputmethod/skk/Makefile
--- a/inputmethod/skk/Makefile  Mon Mar 20 05:28:37 2006 +0000
+++ b/inputmethod/skk/Makefile  Mon Mar 20 05:30:33 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2006/02/18 21:56:33 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/20 05:30:33 jlam Exp $
 #
 
 DISTNAME=      ddskk-12.2.0
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}skk-12.2.0
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    japanese inputmethod
 MASTER_SITES=  http://openlab.ring.gr.jp/skk/maintrunk/
 EXTRACT_SUFX=  .tar.bz2
@@ -16,15 +16,14 @@
 
 EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox xemacs214 emacs20 xemacs215
 
+EMACS_MODULES+=        base leim
+
 .include "../../mk/emacs.mk"
 .include "options.mk"
 
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}apel>=10.6:../../devel/apel
 .if ${EMACS_FLAVOR} == "emacs"
-EMACS_USE_LEIM=        yes
 BUILD_DEPENDS+=        ${EMACS_PKGNAME_PREFIX}Mule-UCS-[0-9]*:../../editors/mule-ucs
-.else
-BUILD_DEPENDS+= xemacs-packages>=1.10:../../editors/xemacs-packages
 .endif
 
 MAKEFLAGS+=    EMACS=${EMACS_BIN:Q}
diff -r 5294c868d77f -r b1ad5278395b inputmethod/skk/options.mk
--- a/inputmethod/skk/options.mk        Mon Mar 20 05:28:37 2006 +0000
+++ b/inputmethod/skk/options.mk        Mon Mar 20 05:30:33 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2005/03/05 11:26:48 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2006/03/20 05:30:33 jlam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.skk
 PKG_SUPPORTED_OPTIONS= lookup
@@ -6,7 +6,7 @@
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mlookup)
-BUILD_DEPENDS+=        ${PKGNAME_PREFIX}lookup-[0-9]*:../../misc/lookup
+BUILD_DEPENDS+=        ${EMACS_PKGNAME_PREFIX}lookup-[0-9]*:../../misc/lookup
 PLIST_SUBST+=  FOR_LOOKUP=""
 .else
 PLIST_SUBST+=  FOR_LOOKUP="@comment "