correct some types to make this compile on alpha. Passes 3/4 tests so this

is only a partial improvement.

7 files changed, 129 insertions, 2 deletions

diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index cb7e4937ba1..7770aae9c93 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/12/24 06:10:18 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/02/13 00:29:52 dmcmahill Exp $
 #
 
 DISTNAME=		gnet-1.1.7
@@ -16,6 +16,7 @@ PKGCONFIG_OVERRIDE=	${WRKSRC}/gnet.pc.in
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 CONFIGURE_ARGS=		--enable-glib2
+TEST_TARGET=		check
 
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gnet/distinfo b/net/gnet/distinfo
index 7d1a81efa4e..72534637ba5 100644
--- a/net/gnet/distinfo
+++ b/net/gnet/distinfo
@@ -1,4 +1,9 @@
-$NetBSD: distinfo,v 1.5 2002/10/30 03:09:36 rh Exp $
+$NetBSD: distinfo,v 1.6 2003/02/13 00:29:52 dmcmahill Exp $
 
 SHA1 (gnet-1.1.7.tar.gz) = 42e68deee3c82c38153ae361edee785399476f5d
 Size (gnet-1.1.7.tar.gz) = 367915 bytes
+SHA1 (patch-aa) = b46a6ca9a9f1582d262763d59c1ff6e4111667f2
+SHA1 (patch-ab) = e874ed0fd4ee827f2c96746bb33f34182f3f6968
+SHA1 (patch-ac) = 7f1545f76d28c92e37953bd5e1e0f743f3b4800f
+SHA1 (patch-ad) = f6bfaafafeaf12b49b18b2f4525310ee32db9726
+SHA1 (patch-ae) = 5135cf8ed04bb6ed7441fff03c513039b675be5d
diff --git a/net/gnet/patches/patch-aa b/net/gnet/patches/patch-aa
new file mode 100644
index 00000000000..ebb16595a79
--- /dev/null
+++ b/net/gnet/patches/patch-aa
@@ -0,0 +1,32 @@
+$NetBSD: patch-aa,v 1.3 2003/02/13 00:29:53 dmcmahill Exp $
+
+--- src/iochannel.c.orig	Wed Aug 14 12:51:02 2002
++++ src/iochannel.c	Wed Feb 12 09:58:27 2003
+@@ -51,5 +51,5 @@
+ {
+   guint nleft;
+-  guint nwritten;
++  gsize nwritten;
+   gchar* ptr;
+   GIOError error = G_IO_ERROR_NONE;
+@@ -108,5 +108,5 @@
+ {
+   guint nleft;
+-  guint nread;
++  gsize nread;
+   gchar* ptr;
+   GIOError error = G_IO_ERROR_NONE;
+@@ -476,5 +476,5 @@
+   else if (condition & G_IO_OUT)
+     {
+-      guint bytes_written;
++      gsize bytes_written;
+ 
+       if (g_io_channel_write(iochannel, 
+@@ -662,5 +662,5 @@
+   GIOError error;
+   guint bytes_to_read;
+-  guint bytes_read;
++  gsize bytes_read;
+   gint bytes_processed;
+ 
diff --git a/net/gnet/patches/patch-ab b/net/gnet/patches/patch-ab
new file mode 100644
index 00000000000..3d67f534a2d
--- /dev/null
+++ b/net/gnet/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1 2003/02/13 00:29:53 dmcmahill Exp $
+
+--- examples/echoserver.c.orig	Thu Sep 26 13:58:59 2002
++++ examples/echoserver.c	Wed Feb 12 10:00:59 2003
+@@ -319,5 +319,5 @@
+     {
+       GIOError error;
+-      guint bytes_read;
++      gsize bytes_read;
+ 
+       /* Read the data into our buffer */
+@@ -369,5 +369,5 @@
+    {
+      GIOError error;
+-     guint bytes_written;
++     gsize bytes_written;
+ 
+      /* Write the data out */
diff --git a/net/gnet/patches/patch-ac b/net/gnet/patches/patch-ac
new file mode 100644
index 00000000000..8475ed819cf
--- /dev/null
+++ b/net/gnet/patches/patch-ac
@@ -0,0 +1,25 @@
+$NetBSD: patch-ac,v 1.1 2003/02/13 00:29:53 dmcmahill Exp $
+
+--- examples/echoclient.c.orig	Thu Sep 26 13:58:59 2002
++++ examples/echoclient.c	Wed Feb 12 10:03:38 2003
+@@ -278,5 +278,5 @@
+       GIOError error;
+       gchar buffer[1024];
+-      guint bytes_read;
++      gsize bytes_read;
+ 
+       /* Read the data into our buffer */
+@@ -332,5 +332,5 @@
+       GIOError error;
+       gchar buffer[1024];
+-      guint bytes_read;
++      gsize bytes_read;
+ 
+       /* Read the data into our buffer */
+@@ -451,5 +451,5 @@
+       GIOError error;
+       gchar buffer[1024];
+-      guint bytes_read;
++      gsize bytes_read;
+ 
+       /* Read the data into our buffer */
diff --git a/net/gnet/patches/patch-ad b/net/gnet/patches/patch-ad
new file mode 100644
index 00000000000..e210c164deb
--- /dev/null
+++ b/net/gnet/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1 2003/02/13 00:29:53 dmcmahill Exp $
+
+--- examples/echoserver-unix.c.orig	Thu Sep 26 13:58:59 2002
++++ examples/echoserver-unix.c	Wed Feb 12 10:04:48 2003
+@@ -234,5 +234,5 @@
+   if (c & G_IO_IN) {
+     GIOError e;
+-    guint bytes_read;
++    gsize bytes_read;
+ 
+     /* Read the data into our buffer */
+@@ -265,5 +265,5 @@
+   if (c & G_IO_OUT) {
+     GIOError e;
+-    guint bytes_written;
++    gsize bytes_written;
+     /* Write the data out */
+     e = g_io_channel_write(iochannel, cs->buffer, cs->n,
diff --git a/net/gnet/patches/patch-ae b/net/gnet/patches/patch-ae
new file mode 100644
index 00000000000..eac9b77eaf0
--- /dev/null
+++ b/net/gnet/patches/patch-ae
@@ -0,0 +1,28 @@
+$NetBSD: patch-ae,v 1.1 2003/02/13 00:29:53 dmcmahill Exp $
+
+--- examples/hfetch.c.orig	Thu Sep 26 13:58:59 2002
++++ examples/hfetch.c	Wed Feb 12 10:06:35 2003
+@@ -115,4 +115,5 @@
+   GIOError error;
+   guint n;
++  gsize n2;
+ 
+ 
+@@ -143,5 +144,5 @@
+   while (1)
+     {
+-      error = g_io_channel_read(iochannel, buffer, sizeof(buffer), &n);
++      error = g_io_channel_read(iochannel, buffer, sizeof(buffer), &n2);
+       if (error != G_IO_ERROR_NONE)
+ 	{
+@@ -150,8 +151,8 @@
+ 	}
+ 
+-      if (n == 0)
++      if (n2 == 0)
+ 	break;
+ 
+-      fwrite(buffer, n, 1, stdout);
++      fwrite(buffer, n2, 1, stdout);
+     }
+