From 2f25539397e1b3af7e5e9d19c61a766e3a070572 Mon Sep 17 00:00:00 2001
From: rtr <rtr>
Date: Fri, 10 Oct 2003 04:47:40 +0000
Subject: Cast mismatched fp. Approved by Johnny Lam.

---
 mbone/vic/distinfo         |  4 ++--
 mbone/vic/patches/patch-ad | 23 ++++++++++++++---------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/mbone/vic/distinfo b/mbone/vic/distinfo
index 6bdceaa720a..284ffe421c9 100644
--- a/mbone/vic/distinfo
+++ b/mbone/vic/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2003/06/25 10:08:52 uebayasi Exp $
+$NetBSD: distinfo,v 1.6 2003/10/10 04:47:40 rtr Exp $
 
 SHA1 (vicsrc-2.8.tar.gz) = ec58bf10aed99301f1e0e0828d0f2f32acdafe1d
 Size (vicsrc-2.8.tar.gz) = 605136 bytes
@@ -6,7 +6,7 @@ SHA1 (vic-2.8_ov511p0.diff.gz) = 780116733fb52058429ca7d006667e13623d008e
 Size (vic-2.8_ov511p0.diff.gz) = 8836 bytes
 SHA1 (patch-ab) = 8a9f5fbacc8e90b62cbb4dc7335fab2c23512ef4
 SHA1 (patch-ac) = e95936892d83876c90edb5e81963350c60e56866
-SHA1 (patch-ad) = ae4b9b349017a163d3c7632c10e6aa62433a3ede
+SHA1 (patch-ad) = 4604ae7077aee9e3165532a9a7947ed1875ae810
 SHA1 (patch-ae) = 05b45b8ac88a0c86d39b53cc1f2c4499411745da
 SHA1 (patch-af) = 5263cff868b12a54b51760b605fdc91180554371
 SHA1 (patch-ag) = d3458b0a01cea09b55795574c54cd8b6007e75a6
diff --git a/mbone/vic/patches/patch-ad b/mbone/vic/patches/patch-ad
index ff179b84062..4379a669dc7 100644
--- a/mbone/vic/patches/patch-ad
+++ b/mbone/vic/patches/patch-ad
@@ -1,7 +1,5 @@
-$NetBSD: patch-ad,v 1.3 1998/08/07 11:10:06 agc Exp $
-
---- /usr/local/pkgsrc//mbone/vic/work/vic-2.8/main.cc	Mon Jul 22 22:12:22 1996
-+++ main.cc	Tue Nov 18 13:16:25 1997
+--- main.cc.orig	1996-07-23 06:12:22.000000000 +1000
++++ main.cc	2003-10-08 23:12:31.000000000 +1000
 @@ -177,7 +177,7 @@
  		else {
  			Tk_Window tk = t.tkmain();
@@ -11,13 +9,20 @@ $NetBSD: patch-ad,v 1.3 1998/08/07 11:10:06 agc Exp $
  			t.result(p != 0 ? "1" : "0");
  		}
  		return (TCL_OK);
-@@ -425,6 +425,9 @@
- #endif
- 	signal(SIGINT, ciao);
- 	signal(SIGTERM, ciao);
+@@ -421,10 +421,13 @@
+ 	srandom(heuristic_random());
+ 
+ #ifdef SIGHUP
+-	signal(SIGHUP, ciao);
++	signal(SIGHUP, (void (*)(int))ciao);
++#endif
++	signal(SIGINT, (void (*)(int))ciao);
++	signal(SIGTERM, (void (*)(int))ciao);
 +#ifdef __FreeBSD__
 +	signal(SIGSYS, (sig_t)noXShm);
-+#endif
+ #endif
+-	signal(SIGINT, ciao);
+-	signal(SIGTERM, ciao);
  
  #ifdef WIN32
  	TkSetPlatformInit(TkPlatformInit);
-- 
cgit v1.2.3