summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2006-03-20 05:27:50 +0000
committerjlam <jlam>2006-03-20 05:27:50 +0000
commitb1e6476af0b9cc87b6e42f647d7fe29cd3196914 (patch)
tree726a1a6e6d2228eab9b39b08dd1e3c6fcc179126
parent5be55301a1524bfe6d915456ae0ab5a7fb58f5a5 (diff)
downloadpkgsrc-b1e6476af0b9cc87b6e42f647d7fe29cd3196914.tar.gz
Use EMACS_MODULES appropriately to replace EMACS_USE_LEIM and conditional
dependency on xemacs-packages.
-rw-r--r--editors/tamago/Makefile4
-rw-r--r--inputmethod/anthy-elisp/Makefile7
2 files changed, 4 insertions, 7 deletions
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index 260bf0e67e1..5bf4ea7863d 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:57 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/20 05:27:50 jlam Exp $
DISTNAME= tamago-4.0.6
PKGNAME= ${EMACS_PKGNAME_PREFIX}tamago-20020909
@@ -13,7 +13,7 @@ COMMENT= CJK characters inputting system for emacs + leim
GNU_CONFIGURE= yes
# XXX please someone adjust paths and PLIST for XEmacs...
EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20
-EMACS_USE_LEIM= # defined
+EMACS_MODULES+= leim
.include "../../mk/emacs.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/anthy-elisp/Makefile b/inputmethod/anthy-elisp/Makefile
index e23dcb41578..cb076a26894 100644
--- a/inputmethod/anthy-elisp/Makefile
+++ b/inputmethod/anthy-elisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:42 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/03/20 05:27:50 jlam Exp $
.include "../../inputmethod/anthy/Makefile.common"
PKGNAME= ${EMACS_PKGNAME_PREFIX}anthy-elisp-${ANTHY_VERSION}
@@ -12,12 +12,9 @@ DEPENDS+= anthy>=${ANTHY_VERSION}:../../inputmethod/anthy
GNU_CONFIGURE= yes
CONFIGURE_ENV+= EMACS=${EMACS_BIN:Q}
-EMACS_USE_LEIM= yes # (for emacs21/emacs20)
+EMACS_MODULES+= base leim
.include "../../mk/emacs.mk"
-.if ${EMACS_FLAVOR} == "xemacs"
-DEPENDS+= xemacs-packages-[0-9]*:../../editors/xemacs-packages
-.endif
do-build:
cd ${WRKSRC}/src-util && ${MAKE} elc-stamp