Fix some test programs and avoid a double/ulong issue on sparc64

8 files changed, 104 insertions, 62 deletions

diff --git a/wm/pwm/distinfo b/wm/pwm/distinfo
index 358937a5ce3..188fe09cde1 100644
--- a/wm/pwm/distinfo
+++ b/wm/pwm/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.5 2001/07/28 21:44:36 jlam Exp $
+$NetBSD: distinfo,v 1.6 2001/08/21 08:17:39 abs Exp $
 
 SHA1 (pwm-1.0.tar.gz) = 79c708a2a6260a06bc8dc586110578bf23aa01e7
 Size (pwm-1.0.tar.gz) = 93239 bytes
-SHA1 (patch-aa) = de9c7048a60bf232e60bfa6d8557f22a5afca5f4
-SHA1 (patch-ab) = ab1c23cab95bd60876b7905f0d9634f11bf2964e
-SHA1 (patch-ac) = 8dc9752805bf1bb45340ba5d5eeb3cb7c995d9dc
-SHA1 (patch-ad) = d4dcb5e21f195ab99ec22dfc93d5347825a6653e
+SHA1 (patch-aa) = b61460733df13a3367aaa9ab38bf1463642b5356
+SHA1 (patch-ab) = 85eeaa8284e82f170e47dba9beb4aec741933463
+SHA1 (patch-ac) = 53b2d849539a533ba03ad18ec2f1831177a8c892
+SHA1 (patch-ad) = ce5e61f7c4011366708b4a7f0b7f2f575def1867
+SHA1 (patch-ae) = 66aab44974a3076fdf72cdbf7b32c9281ff6b04b
+SHA1 (patch-af) = 58d7a96776487f0356120775084fc7d616187fde
+SHA1 (patch-ag) = c2f75054ac2d1daffb5ab40a8f4448d72e5bc5ea
diff --git a/wm/pwm/patches/patch-aa b/wm/pwm/patches/patch-aa
index 35296565349..526a68ba696 100644
--- a/wm/pwm/patches/patch-aa
+++ b/wm/pwm/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2001/07/11 07:58:48 abs Exp $
+$NetBSD: patch-aa,v 1.3 2001/08/21 08:17:39 abs Exp $
 
---- Makefile.orig	Sat Jul  1 16:48:50 2000
+--- Makefile.orig	Sat Jul  1 15:48:50 2000
 +++ Makefile
 @@ -12,7 +12,7 @@
  INCLUDES += -I./libtu/include $(X11_INCLUDES)
diff --git a/wm/pwm/patches/patch-ab b/wm/pwm/patches/patch-ab
index d296c40370c..ddf55741906 100644
--- a/wm/pwm/patches/patch-ab
+++ b/wm/pwm/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2001/07/11 07:58:48 abs Exp $
+$NetBSD: patch-ab,v 1.3 2001/08/21 08:17:40 abs Exp $
 
---- event.c.orig	Sat Jul  1 13:37:50 2000
+--- event.c.orig	Sat Jul  1 12:37:50 2000
 +++ event.c
 @@ -6,6 +6,7 @@
   */
diff --git a/wm/pwm/patches/patch-ac b/wm/pwm/patches/patch-ac
index 1b6a359d9e9..14e726cc26a 100644
--- a/wm/pwm/patches/patch-ac
+++ b/wm/pwm/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2001/07/11 07:58:48 abs Exp $
+$NetBSD: patch-ac,v 1.3 2001/08/21 08:17:40 abs Exp $
 
---- pwm.1x.in.orig	Sat Jul  1 15:11:03 2000
-+++ pwm.1x.in
-@@ -48,7 +48,7 @@
- .SH SEE ALSO
- The PWM home page, http://www.students.tut.fi/~tuomov/pwm/
- .PP
--.BR PREFIX/doc/pwm/config.txt
-+.BR PREFIX/share/doc/pwm/config.txt
- .PP
- .BR X (1x)
- .SH AUTHOR
+--- libtu/numparser2.h.orig	Mon Aug 20 22:19:29 2001
++++ libtu/numparser2.h
+@@ -27,7 +27,7 @@
+ 
+ static int npnum_mulbase_add(NPNum *num, long base, long v)
+ {
+-	double iold=num->ival;
++	ulong iold=num->ival;
+ 	
+ 	num->fval=num->fval*base+(double)v;
+ 	
diff --git a/wm/pwm/patches/patch-ad b/wm/pwm/patches/patch-ad
index 52a9e0d4a8a..bd6133119b7 100644
--- a/wm/pwm/patches/patch-ad
+++ b/wm/pwm/patches/patch-ad
@@ -1,42 +1,13 @@
-$NetBSD: patch-ad,v 1.2 2001/07/28 21:44:37 jlam Exp $
+$NetBSD: patch-ad,v 1.3 2001/08/21 08:17:40 abs Exp $
 
---- system.mk.orig	Sat Jul  1 08:37:50 2000
-+++ system.mk
-@@ -7,7 +7,7 @@
- ## Installation directory prefix
- ##
- 
--PREFIX=/usr/local
-+#PREFIX=/usr/local
- 
- #EXTRA_INCLUDES = -I$(PREFIX)/include
- #EXTRA_LIBS = -L$(PREFIX)/lib
-@@ -17,7 +17,7 @@
- ## X libraries, includes and options
- ##
- 
--X11_PREFIX=/usr/X11R6
-+X11_PREFIX=${X11BASE}
- 
- # SunOS/Solaris
- #X11_PREFIX=/usr/openwin
-@@ -31,7 +31,7 @@
- ## C compiler
- ##
- 
--CC=gcc
-+#CC=gcc
- 
- # The POSIX_SOURCE, XOPEN_SOURCE and WARN options should not be necessary,
- # they're mainly for development use. So, if they cause trouble (not
-@@ -57,8 +57,8 @@
- 	-Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized \
- 	-Wparentheses -pedantic-errors
- 
--CFLAGS=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
--LDFLAGS=-g $(LIBS) $(EXTRA_LIBS)
-+CFLAGS+=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
-+LDFLAGS+=$(LIBS)
- 
- 
- ##
+--- libtu/tester.c.orig	Mon Aug 20 22:05:33 2001
++++ libtu/tester.c
+@@ -18,7 +18,7 @@
+ 	
+ 	libtu_init(argv[0]);
+ 	
+-	if(!(tokz=tokz_open_file(stdin)))
++	if(!(tokz=tokz_open_file(stdin, NULL)))
+ 		return EXIT_FAILURE;
+ 
+ 	while(tokz_get_token(tokz, &tok)){
diff --git a/wm/pwm/patches/patch-ae b/wm/pwm/patches/patch-ae
new file mode 100644
index 00000000000..ef17f59946b
--- /dev/null
+++ b/wm/pwm/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2001/08/21 08:17:40 abs Exp $
+
+--- libtu/tester2.c.orig	Mon Aug 20 22:07:00 2001
++++ libtu/tester2.c
+@@ -59,7 +59,7 @@
+ 			 
+ int main(int argc, char *argv[])
+ {
+-	libtu_init_argv0(argv[0], NULL);
++	libtu_init(argv[0]);
+ 	parse_config_file(stdin, opts, TOKZ_ERROR_TOLERANT);
+ 	
+ 	return EXIT_SUCCESS;
diff --git a/wm/pwm/patches/patch-af b/wm/pwm/patches/patch-af
new file mode 100644
index 00000000000..eff7c92b11c
--- /dev/null
+++ b/wm/pwm/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2001/08/21 08:17:41 abs Exp $
+
+--- pwm.1x.in.orig	Sat Jul  1 14:11:03 2000
++++ pwm.1x.in
+@@ -48,7 +48,7 @@
+ .SH SEE ALSO
+ The PWM home page, http://www.students.tut.fi/~tuomov/pwm/
+ .PP
+-.BR PREFIX/doc/pwm/config.txt
++.BR PREFIX/share/doc/pwm/config.txt
+ .PP
+ .BR X (1x)
+ .SH AUTHOR
diff --git a/wm/pwm/patches/patch-ag b/wm/pwm/patches/patch-ag
new file mode 100644
index 00000000000..8df05c8843f
--- /dev/null
+++ b/wm/pwm/patches/patch-ag
@@ -0,0 +1,42 @@
+$NetBSD: patch-ag,v 1.1 2001/08/21 08:17:41 abs Exp $
+
+--- system.mk.orig	Sat Jul  1 12:37:50 2000
++++ system.mk
+@@ -7,7 +7,7 @@
+ ## Installation directory prefix
+ ##
+ 
+-PREFIX=/usr/local
++#PREFIX=/usr/local
+ 
+ #EXTRA_INCLUDES = -I$(PREFIX)/include
+ #EXTRA_LIBS = -L$(PREFIX)/lib
+@@ -17,7 +17,7 @@
+ ## X libraries, includes and options
+ ##
+ 
+-X11_PREFIX=/usr/X11R6
++X11_PREFIX=${X11BASE}
+ 
+ # SunOS/Solaris
+ #X11_PREFIX=/usr/openwin
+@@ -31,7 +31,7 @@
+ ## C compiler
+ ##
+ 
+-CC=gcc
++#CC=gcc
+ 
+ # The POSIX_SOURCE, XOPEN_SOURCE and WARN options should not be necessary,
+ # they're mainly for development use. So, if they cause trouble (not
+@@ -57,8 +57,8 @@
+ 	-Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized \
+ 	-Wparentheses -pedantic-errors
+ 
+-CFLAGS=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
+-LDFLAGS=-g $(LIBS) $(EXTRA_LIBS)
++CFLAGS+=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
++LDFLAGS+=$(LIBS)
+ 
+ 
+ ##