Fix package to compile again. Patches supplied by NONAKA Kimihiro in

pkg/10909.

6 files changed, 51 insertions, 7 deletions

diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index f99860cef3b..2ad5ee451c4 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/08/23 23:14:32 tron Exp $
+# $NetBSD: Makefile,v 1.19 2000/08/30 00:01:03 wiz Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp
 #
 
@@ -24,9 +24,7 @@ CONFIGURE_ARGS+=	--enable-utmp \
 			--enable-menubar \
 			--enable-xterm-scroll \
 			--enable-xim \
-			--enable-kanji \
-			--enable-big5 \
-			--enable-gb \
+			--enable-languages \
 			--enable-greek \
 			--enable-ttygid \
 			--enable-xgetdefault \
diff --git a/x11/rxvt/files/patch-sum b/x11/rxvt/files/patch-sum
index 65523bf0aca..048421ccc2f 100644
--- a/x11/rxvt/files/patch-sum
+++ b/x11/rxvt/files/patch-sum
@@ -1,4 +1,6 @@
-$NetBSD: patch-sum,v 1.4 2000/05/08 03:25:22 hubertf Exp $
+$NetBSD: patch-sum,v 1.5 2000/08/30 00:01:05 wiz Exp $
 
-MD5 (patch-aa) = adb29817515eb6849371a9d04e3337a7
-MD5 (patch-ab) = 69939bad285eba6d0096e52c446bf415
+MD5 (patch-aa) = 4ab517329bc6964782e53830172ca8eb
+MD5 (patch-ab) = 585f973ef2f919770dcef7c8e26c1257
+MD5 (patch-ac) = 18a2d1ff2b4416104bd59a25948e6013
+MD5 (patch-ad) = 1cbe324406d61570d052c4fb0b449791
diff --git a/x11/rxvt/patches/patch-aa b/x11/rxvt/patches/patch-aa
index 9f818fb6dcf..c486fd7573d 100644
--- a/x11/rxvt/patches/patch-aa
+++ b/x11/rxvt/patches/patch-aa
@@ -1,3 +1,5 @@
+$NetBSD: patch-aa,v 1.5 2000/08/30 00:01:05 wiz Exp $
+
 --- Makefile.in.orig	Tue Dec 21 11:07:54 1999
 +++ Makefile.in	Mon May  8 05:10:06 2000
 @@ -9,7 +9,7 @@
diff --git a/x11/rxvt/patches/patch-ab b/x11/rxvt/patches/patch-ab
index b3c278021ff..70dd53b6d57 100644
--- a/x11/rxvt/patches/patch-ab
+++ b/x11/rxvt/patches/patch-ab
@@ -1,3 +1,5 @@
+$NetBSD: patch-ab,v 1.6 2000/08/30 00:01:05 wiz Exp $
+
 --- doc/Makefile.in.orig	Sun Mar 12 06:26:26 2000
 +++ doc/Makefile.in	Mon May  8 05:11:35 2000
 @@ -38,7 +38,10 @@
diff --git a/x11/rxvt/patches/patch-ac b/x11/rxvt/patches/patch-ac
new file mode 100644
index 00000000000..75d225ac7d4
--- /dev/null
+++ b/x11/rxvt/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.3 2000/08/30 00:01:05 wiz Exp $
+
+--- configure.orig	Sun Mar 26 16:47:39 2000
++++ configure	Wed Aug 16 03:06:27 2000
+@@ -4163,6 +4163,7 @@
+   cat > conftest.$ac_ext <<EOF
+ #line 4165 "configure"
+ #include "confdefs.h"
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <utmp.h>
+ #include <errno.h>
diff --git a/x11/rxvt/patches/patch-ad b/x11/rxvt/patches/patch-ad
new file mode 100644
index 00000000000..f7656d70606
--- /dev/null
+++ b/x11/rxvt/patches/patch-ad
@@ -0,0 +1,28 @@
+$NetBSD: patch-ad,v 1.4 2000/08/30 00:01:05 wiz Exp $
+
+--- src/grkelot.c.orig	Thu Jun  3 22:20:19 1999
++++ src/grkelot.c	Wed Aug 16 03:07:26 2000
+@@ -81,10 +81,6 @@
+ #define MAX_SWITCHER	2U	/* per state */
+ #define MAX_VAL 	256	/* for temp allocation */
+ 
+-typedef unsigned char u_char;
+-typedef unsigned int u_int;
+-typedef unsigned long u_long;
+-
+ typedef struct s_xlat {
+     u_int           first, last;
+     u_int          *pval;	/* array of translated values */
+@@ -159,9 +155,9 @@
+ 
+ #define NUM_XLAT_TYPES	(sizeof(xlat_type) / sizeof(xlat_type[0]))
+ 
+-static void     kstate_add_xlat(char *str);
+-static void     kstate_add_switcher(char *str);
+-static void     kstate_set_life(char *str);
++void     kstate_add_xlat(char *str);
++void     kstate_add_switcher(char *str);
++void     kstate_set_life(char *str);
+ 
+ /* --- Functions ------------- */
+ /* INTPROTO */