[pkgsrc/trunk]: pkgsrc/editors Use XEMACS_USE_CANNA instead of EMACS_CANNA fo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cea980969059
branches:  trunk
changeset: 467979:cea980969059
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Mon Feb 09 07:16:13 2004 +0000

description:
Use XEMACS_USE_CANNA instead of EMACS_CANNA for consistency, and add
it to BUILD_DEFS.  Approved by uebayasi@.

diffstat:

 editors/xemacs-current/Makefile |  5 +++--
 editors/xemacs-nox11/Makefile   |  6 +++---
 editors/xemacs/Makefile         |  6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diffs (80 lines):

diff -r 297688095cf1 -r cea980969059 editors/xemacs-current/Makefile
--- a/editors/xemacs-current/Makefile   Mon Feb 09 06:24:05 2004 +0000
+++ b/editors/xemacs-current/Makefile   Mon Feb 09 07:16:13 2004 +0000
@@ -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 @@
 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=    --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 -r 297688095cf1 -r cea980969059 editors/xemacs-nox11/Makefile
--- a/editors/xemacs-nox11/Makefile     Mon Feb 09 06:24:05 2004 +0000
+++ b/editors/xemacs-nox11/Makefile     Mon Feb 09 07:16:13 2004 +0000
@@ -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 @@
 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=    --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 -r 297688095cf1 -r cea980969059 editors/xemacs/Makefile
--- a/editors/xemacs/Makefile   Mon Feb 09 06:24:05 2004 +0000
+++ b/editors/xemacs/Makefile   Mon Feb 09 07:16:13 2004 +0000
@@ -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 @@
 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=    --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