* Update Satoshi Yatagawa <yatagawa at cc dot teu dot ac dot jp>'s Mule 4.1

  patch.  The previous one had decode-coding string<f> bug.  Pointed out and
  tested by tron.  Thanks!

* XIM patch by Seiichiro Inouse <ginouse at ts dot catv dot ne dot jp>.

* Belately Buildlinkify.

Let's bump revision to 2.

3 files changed, 48 insertions, 14 deletions

diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 06c6679397b..4300b2c6e69 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,12 +1,19 @@
-# $NetBSD: Makefile,v 1.50 2003/01/12 11:33:19 tron Exp $
+# $NetBSD: Makefile,v 1.51 2003/03/01 06:18:21 uebayasi Exp $
 
 DISTNAME=	emacs-20.7
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
+MASTER_SITES=	${MASTER_SITE_GNU:=emacs/} \
+		${MASTER_SITE_LOCAL}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${DISTNAME}-mule-4.1b-elc${EXTRACT_SUFX}
 
+# Mule enhancement (back port) patch by Satoshi Yatagawa
 PATCH_SITES=		http://www.teu.ac.jp/nsit/~yatagawa/comp/emacs/
-PATCHFILES=		emacs-20.7-mule-4.1.patch
+PATCHFILES=		emacs-20.7-mule-4.1b.patch
+# XIM fix patch by Seiichiro Inoue
+PATCH_SITES+=		http://home.catv.ne.jp/pp/ginoue/software/emacs-xim/
+PATCHFILES+=		emacs20-xim-20000713.diff
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	packages@netbsd.org
@@ -15,6 +22,7 @@ COMMENT=	GNU editing macros (editor)
 
 CONFLICTS=	mule-[0-9]*
 
+USE_BUILDLINK2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
@@ -29,9 +37,8 @@ EMACS_USE_POP?=	yes
     (${EMACS_USE_POP} == yes || ${EMACS_USE_POP} == YES))
 CONFIGURE_ARGS+=--with-pop
 .endif
-.if defined(EMACS_USE_X)
-CONFIGURE_ARGS+=--with-x=${EMACS_USE_X}
-.endif
+USE_X11=	yes
+CONFIGURE_ARGS+=--with-x=yes
 .if defined(EMACS_USE_X_TOOLKIT)
 CONFIGURE_ARGS+=--with-x-toolkit=${EMACS_USE_X_TOOLKIT}
 .endif
@@ -52,5 +59,12 @@ pre-install:
 post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs
 
+.if defined(EMACS_USE_X_TOOLKIT) && ${EMACS_USE_X_TOOLKIT} == "athena"
+.include "../../mk/xaw.buildlink2.mk"
+.endif
+.if defined(EMACS_USE_X_TOOLKIT) && ${EMACS_USE_X_TOOLKIT} == "motif"
+.include "../../mk/motif.buildlink2.mk"
+.endif
+
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index 9eba5f21ef3..1bfeb4d5061 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,15 +1,19 @@
-$NetBSD: distinfo,v 1.9 2003/01/12 11:33:19 tron Exp $
+$NetBSD: distinfo,v 1.10 2003/03/01 06:18:21 uebayasi Exp $
 
 SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
 Size (emacs-20.7.tar.gz) = 15043428 bytes
-SHA1 (emacs-20.7-mule-4.1.patch) = fab706da960547a789eef1a101f17ee4dfb5ce85
-Size (emacs-20.7-mule-4.1.patch) = 78492 bytes
+SHA1 (emacs-20.7-mule-4.1b-elc.tar.gz) = 3894fb2b81bb326545f6ccc3bf0a8405c23004ff
+Size (emacs-20.7-mule-4.1b-elc.tar.gz) = 70474 bytes
+SHA1 (emacs-20.7-mule-4.1b.patch) = 2c5538198a4d032a9e987d810fe5c26407d968eb
+Size (emacs-20.7-mule-4.1b.patch) = 79729 bytes
+SHA1 (emacs20-xim-20000713.diff) = 5bed39e7b8a52941f77088529566aaa3bcf06670
+Size (emacs20-xim-20000713.diff) = 21296 bytes
 SHA1 (patch-aa) = 3b3fd76c058a0a46e0458338ce4c2327a238fb3d
 SHA1 (patch-ab) = eb16c1ab30e8aac6e6877e8c0f9388961b8003b2
 SHA1 (patch-ac) = 9586951e581271664b28d5e812ee14105de508cf
 SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6
 SHA1 (patch-ae) = 7aaca5409a71f8a292ac57f828ee5ec7a07e3880
-SHA1 (patch-af) = 778ae26ac31d0a37736c3aa89331a68229c2649d
+SHA1 (patch-af) = c35816b47a46d4a3d8381a20e593fa29297e1f4d
 SHA1 (patch-ag) = 14469c8907ea09395031594e7e0d0fe967b915d9
 SHA1 (patch-ah) = 2cfb03c57fad97db9eaaf9cda610f5d6c906aa4a
 SHA1 (patch-ai) = d1e5bb8fe797761f63fad42dbfb48834284f4533
diff --git a/editors/emacs/patches/patch-af b/editors/emacs/patches/patch-af
index b8e38c006e4..c208906038d 100644
--- a/editors/emacs/patches/patch-af
+++ b/editors/emacs/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.6 2002/10/26 19:47:07 bouyer Exp $
+$NetBSD: patch-af,v 1.7 2003/03/01 06:18:22 uebayasi Exp $
 
---- src/Makefile.in.orig	Mon Apr 26 07:19:42 1999
-+++ src/Makefile.in	Tue Oct 22 15:55:06 2002
+--- src/Makefile.in.orig	Thu Jan 16 19:08:48 2003
++++ src/Makefile.in
 @@ -329,7 +329,7 @@
  #ifdef USE_X_TOOLKIT
  #define @X_TOOLKIT_TYPE@
@@ -29,3 +29,19 @@ $NetBSD: patch-af,v 1.6 2002/10/26 19:47:07 bouyer Exp $
  
  /* A macro which other sections of Makefile can redefine to munge the
     flags before they're passed to LD.  This is helpful if you have
+@@ -804,14 +804,7 @@
+ #define OBJECTS_MACHINE
+ #endif
+ 
+-all: emacs bytecomp OTHER_FILES
+-
+-bytecomp: emacs
+-	./emacs -batch -q -f batch-byte-compile \
+-	${lispsource}ange-ftp.el ${lispsource}international/ccl.el \
+-	${lispsource}international/mule-cmds.el \
+-	${lispsource}international/mule.el \
+-	${lispsource}international/titdic-cnv.el
++all: emacs OTHER_FILES
+ 
+ emacs: temacs ${etc}DOC ${lisp}
+ #ifdef CANNOT_DUMP