summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/xemacs-current/Makefile5
-rw-r--r--editors/xemacs-nox11/Makefile6
-rw-r--r--editors/xemacs/Makefile6
3 files changed, 9 insertions, 8 deletions
diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index 23c68978980..d280dc762c0 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2004/02/01 01:43:29 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2004/02/09 07:16:13 minskim Exp $
DISTNAME= xemacs-21.5.16
PKGREVISION= 1
@@ -12,6 +12,7 @@ COMMENT= *BETA* XEmacs text editor version 21.5.16
USE_BUILDLINK2= YES
USE_X11= YES
+BUILD_DEFS+= XEMACS_WIDGETS XEMACS_ESD USE_LDAP USE_XFACE XEMACS_USE_CANNA
PLIST_SUBST+= EMACSVER=xemacs-21.5-b16
MESSAGE_SUBST+= EMACSVER=xemacs-21.5-b16
@@ -55,7 +56,7 @@ WITH_XFACE= --with-xface
WITH_XFACE= --without-xface
.endif
-.if defined(EMACS_CANNA) && (${EMACS_CANNA} == "YES")
+.if defined(XEMACS_USE_CANNA) && (${XEMACS_USE_CANNA} == "YES")
. include "../../inputmethod/canna-lib/buildlink2.mk"
WITH_CANNA= --with-canna
.else
diff --git a/editors/xemacs-nox11/Makefile b/editors/xemacs-nox11/Makefile
index 4c4bfe3cb7b..0fb59a15417 100644
--- a/editors/xemacs-nox11/Makefile
+++ b/editors/xemacs-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:40 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/09 07:16:13 minskim Exp $
DISTNAME= xemacs-21.4.12
PKGNAME= xemacs-nox11-21.4.12
@@ -23,7 +23,7 @@ PATCHDIR= ${.CURDIR}/../xemacs/patches
USE_BUILDLINK2= YES
#USE_X11= YES
-BUILD_DEFS+= USE_LDAP USE_XFACE
+BUILD_DEFS+= USE_LDAP USE_XFACE XEMACS_USE_CANNA
DIST_SUBDIR= xemacs
EXTRA_FILES= ${DISTNAME}-elc.tar.gz ${DISTNAME}-info.tar.gz
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@@ -61,7 +61,7 @@ WITH_XFACE= --with-xface
WITH_XFACE= --without-xface
.endif
-.if defined(EMACS_CANNA) && (${EMACS_CANNA} == "YES")
+.if defined(XEMACS_USE_CANNA) && (${XEMACS_USE_CANNA} == "YES")
. include "../../inputmethod/canna-lib/buildlink2.mk"
WITH_CANNA= --with-canna
.else
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 82a6fe8490f..349161c0ddd 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2004/01/27 00:53:11 heinz Exp $
+# $NetBSD: Makefile,v 1.68 2004/02/09 07:16:13 minskim Exp $
DISTNAME= xemacs-21.4.14
PKGREVISION= 1
@@ -15,7 +15,7 @@ NOT_FOR_PLATFORM= *-*-mips* # fails purespace dumping
USE_BUILDLINK2= YES
USE_X11= YES
-BUILD_DEFS+= USE_LDAP USE_XFACE
+BUILD_DEFS+= USE_LDAP USE_XFACE XEMACS_USE_CANNA
DIST_SUBDIR= xemacs
EXTRA_FILES= ${DISTNAME}-elc.tar.gz ${DISTNAME}-info.tar.gz
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@@ -86,7 +86,7 @@ WITH_XFACE= --with-xface
WITH_XFACE= --without-xface
.endif
-.if defined(EMACS_CANNA) && (${EMACS_CANNA} == "YES")
+.if defined(XEMACS_USE_CANNA) && (${XEMACS_USE_CANNA} == "YES")
. include "../../inputmethod/canna-lib/buildlink2.mk"
WITH_CANNA= --with-canna
.else