* add patch-cj to fix build failure

* add user-destdir installation support.
* Bump PKGREVISION to force rebuild with fixed ja-FreeWnn-lib.

3 files changed, 71 insertions, 5 deletions

diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index a12841664e1..7ca6e696ef8 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2009/09/02 08:34:13 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2010/07/11 03:00:33 obache Exp $
 
 DISTNAME=	mule-2.3
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/
 
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.m17n.org/mule/
 COMMENT=	Multilingual GNU editing macros (editor)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	emacs-[0-9]*
 
 # build PATH in the dumped mule is not a problem
@@ -35,6 +37,10 @@ CONFIGURE_ARGS+=	--bdf-path=${X11PREFIX}/lib/X11/fonts/intlfonts/bdf
 
 INFO_FILES=	# PLIST
 
+INSTALL_MAKE_FLAGS=	prefix=${DESTDIR}${PREFIX}
+INSTALL_MAKE_FLAGS+=	infodir=${DESTDIR}${GNU_CONFIGURE_INFODIR}
+INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}${GNU_CONFIGURE_MANDIR}
+
 # Remove original versions of patched files so that aren't installed.
 post-build:
 	${FIND} ${WRKSRC} -name "*.orig" | ${XARGS} ${RM} -f
@@ -45,8 +51,8 @@ post-install:
 		-e 's/etl\([0-9]*\)-latin1/lt1-40-etl/' \
 		-e 's/etl\([0-9]*\)-latin\([0-9]\)/lt\2-\1-etl/' \
 		-e 's/jiskan24/j83-48/' \
-		< ${WRKSRC}/etc/CHARSETS > ${PREFIX}/lib/mule/19.28/etc/CHARSETS
-	#diff -u		${WRKSRC}/etc/CHARSETS ${PREFIX}/lib/mule/19.28/etc/CHARSETS
+		< ${WRKSRC}/etc/CHARSETS > ${DESTDIR}${PREFIX}/lib/mule/19.28/etc/CHARSETS
+	#diff -u		${WRKSRC}/etc/CHARSETS ${DESTDIR}${PREFIX}/lib/mule/19.28/etc/CHARSETS
 
 .include "../../x11/xbitmaps/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
diff --git a/editors/mule/distinfo b/editors/mule/distinfo
index 824f027a641..93202ac9046 100644
--- a/editors/mule/distinfo
+++ b/editors/mule/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2006/01/04 20:35:08 joerg Exp $
+$NetBSD: distinfo,v 1.8 2010/07/11 03:00:33 obache Exp $
 
 SHA1 (mule-2.3.tar.gz) = 52737767955caf2fde34b994f367a89c5d8a045f
 RMD160 (mule-2.3.tar.gz) = 52b93e746a7a796549a44104ab1898954df044bf
@@ -64,3 +64,4 @@ SHA1 (patch-cf) = a13990995698dc16f91a825cbb4430a41a4c65dd
 SHA1 (patch-cg) = 2fbe0de8a502a2fe083379a39aaf126148d0ded3
 SHA1 (patch-ch) = f5314755074b7301ee36825c82d15763b1d3f062
 SHA1 (patch-ci) = b172fe40cccba2aa622a5522fffa421cbcd299a5
+SHA1 (patch-cj) = 19b158106f4fbe382084dc8e6ddd6545e506e30d
diff --git a/editors/mule/patches/patch-cj b/editors/mule/patches/patch-cj
new file mode 100644
index 00000000000..3db5017338d
--- /dev/null
+++ b/editors/mule/patches/patch-cj
@@ -0,0 +1,59 @@
+$NetBSD: patch-cj,v 1.1 2010/07/11 03:00:33 obache Exp $
+
+--- src/wnnfns.c.orig	1995-05-30 06:49:10.000000000 +0000
++++ src/wnnfns.c
+@@ -322,6 +322,9 @@ static struct wnn_env *wnnfns_env_rev[NS
+ static int wnnfns_norm;
+ static unsigned char lc_wnn_server_type[NSERVER] = {LCJP, LCCN, LCINV, LCKR};
+ 
++static int yes_or_no();
++static void puts2();
++
+ /* Lisp Variables and Constants Definition */
+ Lisp_Object	Qjserver;
+ Lisp_Object	Qcserver;
+@@ -430,8 +433,6 @@ Specify password files of dictionary and
+      int			nargs;
+      register Lisp_Object	*args;
+ {
+-  static int yes_or_no();
+-  static void puts2();
+   struct gcpro gcpro1;
+   int	snum;
+   CHECK_STRING (args[0], 0);
+@@ -1242,8 +1243,6 @@ Specify password files of dictionary and
+      int                        nargs;
+      register Lisp_Object       *args;
+ {
+-  static int yes_or_no();
+-  static void puts2();
+   struct gcpro gcpro1;
+   int   snum;
+   CHECK_STRING (args[0], 0);
+@@ -1278,8 +1277,6 @@ Specify password files of dictionary and
+      int                        nargs;
+      register Lisp_Object       *args;
+ {
+-  static int yes_or_no();
+-  static void puts2();
+   struct gcpro gcpro1;
+   int   snum;
+   CHECK_STRING (args[0], 0);
+@@ -1314,8 +1311,6 @@ Specify password files of dictionary and
+      int                        nargs;
+      register Lisp_Object       *args;
+ {
+-  static int yes_or_no();
+-  static void puts2();
+   struct gcpro gcpro1;
+   int   snum;
+   int	dic_no;
+@@ -1376,8 +1371,6 @@ Specify password files of dictionary and
+      int                        nargs;
+      register Lisp_Object       *args;
+ {
+-  static int yes_or_no();
+-  static void puts2();
+   struct gcpro gcpro1;
+   int   snum;
+   int   dic_no;