>Number:         10909
>Category:       pkg
>Synopsis:       x11/rxvt package is broken.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Aug 29 09:43:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     NONAKA Kimihiro
>Release:        
>Organization:
>Environment:
System: NetBSD koharu 1.5C NetBSD 1.5C (KOHARU) #398: Thu Aug 3 07:39:02 JST 2000 nonaka@koharu:/usr/src/sys/arch/i386/compile/KOHARU i386


>Description:

===> Building for rxvt-2.7.3
cc -DHAVE_CONFIG_H -DDEBUG_STRICT -c -DHAVE_LIBXPM -I/usr/X11R6/include -I/usr/X11R6/include/X11  -I. -I.. -I.  -O2 command.c
cc -DHAVE_CONFIG_H -DDEBUG_STRICT -c -DHAVE_LIBXPM -I/usr/X11R6/include -I/usr/X11R6/include/X11  -I. -I.. -I.  -O2 init.c
cc -DHAVE_CONFIG_H -DDEBUG_STRICT -c -DHAVE_LIBXPM -I/usr/X11R6/include -I/usr/X11R6/include/X11  -I. -I.. -I.  -O2 grkelot.c
grkelot.c:84: warning: redefinition of `u_char'
/usr/include/sys/types.h:55: warning: `u_char' previously declared here
grkelot.c:85: warning: redefinition of `u_int'
/usr/include/sys/types.h:57: warning: `u_int' previously declared here
grkelot.c:86: warning: redefinition of `u_long'
/usr/include/sys/types.h:58: warning: `u_long' previously declared here
grkelot.c:162: warning: static declaration for `kstate_add_xlat' follows non-static
grkelot.c:163: warning: static declaration for `kstate_add_switcher' follows non-static
grkelot.c:164: warning: static declaration for `kstate_set_life' follows non-static
cc -DHAVE_CONFIG_H -DDEBUG_STRICT -c -DHAVE_LIBXPM -I/usr/X11R6/include -I/usr/X11R6/include/X11  -I. -I.. -I.  -O2 logging.c
logging.c: In function `write_bsd_utmp':
logging.c:117: `RXVT_UTMP_FILE' undeclared (first use in this function)
logging.c:117: (Each undeclared identifier is reported only once
logging.c:117: for each function it appears in.)
*** Error code 1

Stop.


>How-To-Repeat:

	# cd pkgsrc/x11/rxvt
	# make


>Fix:

	Apply the following patch.
	- Makefile: option '--enable-{kanji,big5,gb}' -> '--enable-languages'
	- patch-aa, patch-ab: added RCS Id.
	- patch-ac: utmp.h needed time_t structure.
	- patch-ad: NetBSD already typedef'd u_{char,int,long}.
	            vs prototype.

Index: Makefile
===================================================================
RCS file: /home/cvsroot.netbsd/pkgsrc/x11/rxvt/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile	2000/07/15 20:39:27	1.17
+++ Makefile	2000/08/15 18:04:53
@@ -25,9 +25,7 @@
 			--enable-menubar \
 			--enable-xterm-scroll \
 			--enable-xim \
-			--enable-kanji \
-			--enable-big5 \
-			--enable-gb \
+			--enable-languages \
 			--enable-greek \
 			--enable-ttygid \
 			--enable-xgetdefault \
Index: files/patch-sum
===================================================================
RCS file: /home/cvsroot.netbsd/pkgsrc/x11/rxvt/files/patch-sum,v
retrieving revision 1.4
diff -u -r1.4 patch-sum
--- files/patch-sum	2000/05/08 03:25:22	1.4
+++ files/patch-sum	2000/08/15 18:33:18
@@ -1,4 +1,6 @@
 $NetBSD: patch-sum,v 1.4 2000/05/08 03:25:22 hubertf 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
Index: patches/patch-aa
===================================================================
RCS file: /home/cvsroot.netbsd/pkgsrc/x11/rxvt/patches/patch-aa,v
retrieving revision 1.4
diff -u -r1.4 patch-aa
--- patches/patch-aa	2000/05/08 03:25:22	1.4
+++ patches/patch-aa	2000/08/15 18:23:26
@@ -1,3 +1,5 @@
+$NetBSD$
+
 --- Makefile.in.orig	Tue Dec 21 11:07:54 1999
 +++ Makefile.in	Mon May  8 05:10:06 2000
 @@ -9,7 +9,7 @@
Index: patches/patch-ab
===================================================================
RCS file: /home/cvsroot.netbsd/pkgsrc/x11/rxvt/patches/patch-ab,v
retrieving revision 1.5
diff -u -r1.5 patch-ab
--- patches/patch-ab	2000/05/08 03:25:22	1.5
+++ patches/patch-ab	2000/08/15 18:23:36
@@ -1,3 +1,5 @@
+$NetBSD$
+
 --- 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 @@
Index: patches/patch-ac
===================================================================
RCS file: patch-ac
diff -N patch-ac
--- /dev/null	Wed Aug 16 03:34:47 2000
+++ patches/patch-ac	Wed Aug 16 03:23:42 2000
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- 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>
Index: patches/patch-ad
===================================================================
RCS file: patch-ad
diff -N patch-ad
--- /dev/null	Wed Aug 16 03:34:47 2000
+++ patches/patch-ad	Wed Aug 16 03:33:09 2000
@@ -0,0 +1,28 @@
+$NetBSD$
+
+--- 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 */

>Release-Note:
>Audit-Trail:
>Unformatted: