summaryrefslogtreecommitdiff
path: root/inputmethod
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-03-20 05:30:33 +0000
committerjlam <jlam@pkgsrc.org>2006-03-20 05:30:33 +0000
commit0a3bd63e8ac17e343e9532ee5cf11e2a99b3bed8 (patch)
treede8a0ca7a4b60314c84402d8d84724cdb36394d0 /inputmethod
parentfcd3480c661492829f8ea3e39573ef21e738b4da (diff)
downloadpkgsrc-0a3bd63e8ac17e343e9532ee5cf11e2a99b3bed8.tar.gz
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 (limited to 'inputmethod')
-rw-r--r--inputmethod/skk/Makefile9
-rw-r--r--inputmethod/skk/options.mk4
2 files changed, 6 insertions, 7 deletions
diff --git a/inputmethod/skk/Makefile b/inputmethod/skk/Makefile
index 02a82fe1bd3..adf8deb1197 100644
--- a/inputmethod/skk/Makefile
+++ b/inputmethod/skk/Makefile
@@ -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 @@ CONFLICTS= ddskk-[0-9]*
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 --git a/inputmethod/skk/options.mk b/inputmethod/skk/options.mk
index 9db0faae445..19698b21429 100644
--- a/inputmethod/skk/options.mk
+++ b/inputmethod/skk/options.mk
@@ -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 @@ PKG_SUPPORTED_OPTIONS= lookup
.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 "