Re-import gnet-1.1.7 as gnet1 until the two programs using it have been

updated to gnet-2.0.0.

10 files changed, 252 insertions, 0 deletions

diff --git a/net/gnet1/DESCR b/net/gnet1/DESCR
new file mode 100644
index 00000000000..8b7a14438b4
--- /dev/null
+++ b/net/gnet1/DESCR
@@ -0,0 +1,3 @@
+GNet is a simple network library. It is written in C, object-oriented,
+and built upon GLib. It is intended to be small, fast, easy-to-use,
+and easy to port. GNet comes with documentation and examples.
diff --git a/net/gnet1/Makefile b/net/gnet1/Makefile
new file mode 100644
index 00000000000..8e0fb1027f2
--- /dev/null
+++ b/net/gnet1/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1.1.1 2003/04/15 11:49:01 wiz Exp $
+#
+
+DISTNAME=		gnet-1.1.8
+CATEGORIES=		net
+MASTER_SITES=		http://www.gnetlibrary.org/src/
+
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.gnetlibrary.org/
+COMMENT=		simple network library
+
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+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/gnet1/PLIST b/net/gnet1/PLIST
new file mode 100644
index 00000000000..e8abe5d0a82
--- /dev/null
+++ b/net/gnet1/PLIST
@@ -0,0 +1,56 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/15 11:49:02 wiz Exp $
+bin/gnet-config
+include/gnet/conn.h
+include/gnet/gnet.h
+include/gnet/inetaddr.h
+include/gnet/iochannel.h
+include/gnet/mcast.h
+include/gnet/md5.h
+include/gnet/pack.h
+include/gnet/server.h
+include/gnet/sha.h
+include/gnet/socks.h
+include/gnet/tcp.h
+include/gnet/udp.h
+include/gnet/unix.h
+include/gnet/url.h
+lib/gnet/include/gnetconfig.h
+lib/libgnet-1.1.so
+lib/libgnet-1.1.so.7
+lib/libgnet-1.1.so.7.1
+lib/libgnet.a
+lib/libgnet.la
+lib/libgnet.so
+lib/pkgconfig/gnet.pc
+man/man1/gnet-config.1
+share/aclocal/gnet.m4
+share/doc/libgnet1.1-dev/html/book1.html
+share/doc/libgnet1.1-dev/html/gnet-conn.html
+share/doc/libgnet1.1-dev/html/gnet-developers-tips.html
+share/doc/libgnet1.1-dev/html/gnet-developers.html
+share/doc/libgnet1.1-dev/html/gnet-examples.html
+share/doc/libgnet1.1-dev/html/gnet-gnet.html
+share/doc/libgnet1.1-dev/html/gnet-inetaddr.html
+share/doc/libgnet1.1-dev/html/gnet-iochannel.html
+share/doc/libgnet1.1-dev/html/gnet-mcast.html
+share/doc/libgnet1.1-dev/html/gnet-md5.html
+share/doc/libgnet1.1-dev/html/gnet-overview.html
+share/doc/libgnet1.1-dev/html/gnet-pack.html
+share/doc/libgnet1.1-dev/html/gnet-server.html
+share/doc/libgnet1.1-dev/html/gnet-sha.html
+share/doc/libgnet1.1-dev/html/gnet-socks.html
+share/doc/libgnet1.1-dev/html/gnet-tcp.html
+share/doc/libgnet1.1-dev/html/gnet-udp.html
+share/doc/libgnet1.1-dev/html/gnet-unix.html
+share/doc/libgnet1.1-dev/html/gnet-url.html
+share/doc/libgnet1.1-dev/html/hfetch.html
+share/doc/libgnet1.1-dev/html/index.html
+share/doc/libgnet1.1-dev/html/index.sgml
+share/doc/libgnet1.1-dev/html/libgnet-reference.html
+share/doc/libgnet1.1-dev/html/sdr.html
+share/doc/libgnet1.1-dev/html/tests.html
+@dirrm share/doc/libgnet1.1-dev/html
+@dirrm share/doc/libgnet1.1-dev
+@dirrm lib/gnet/include
+@dirrm lib/gnet
+@dirrm include/gnet
diff --git a/net/gnet1/buildlink2.mk b/net/gnet1/buildlink2.mk
new file mode 100644
index 00000000000..f5c6d1a9d2f
--- /dev/null
+++ b/net/gnet1/buildlink2.mk
@@ -0,0 +1,42 @@
+# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/04/15 11:49:02 wiz Exp $
+#
+# This Makefile fragment is included by packages that use gnet.
+#
+# This file was created automatically using createbuildlink 2.1.
+#
+
+.if !defined(GNET_BUILDLINK2_MK)
+GNET_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			gnet
+BUILDLINK_DEPENDS.gnet?=		gnet>=1.1.7nb1
+BUILDLINK_PKGSRCDIR.gnet?=		../../net/gnet1
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.gnet=gnet
+BUILDLINK_PREFIX.gnet_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.gnet+=	include/gnet/conn.h
+BUILDLINK_FILES.gnet+=	include/gnet/gnet.h
+BUILDLINK_FILES.gnet+=	include/gnet/inetaddr.h
+BUILDLINK_FILES.gnet+=	include/gnet/iochannel.h
+BUILDLINK_FILES.gnet+=	include/gnet/mcast.h
+BUILDLINK_FILES.gnet+=	include/gnet/md5.h
+BUILDLINK_FILES.gnet+=	include/gnet/pack.h
+BUILDLINK_FILES.gnet+=	include/gnet/server.h
+BUILDLINK_FILES.gnet+=	include/gnet/sha.h
+BUILDLINK_FILES.gnet+=	include/gnet/socks.h
+BUILDLINK_FILES.gnet+=	include/gnet/tcp.h
+BUILDLINK_FILES.gnet+=	include/gnet/udp.h
+BUILDLINK_FILES.gnet+=	include/gnet/unix.h
+BUILDLINK_FILES.gnet+=	include/gnet/url.h
+BUILDLINK_FILES.gnet+=	lib/gnet/include/gnetconfig.h
+BUILDLINK_FILES.gnet+=	lib/libgnet-1.1.*
+BUILDLINK_FILES.gnet+=	lib/libgnet.*
+BUILDLINK_FILES.gnet+=	lib/pkgconfig/gnet.pc
+
+.include "../../devel/glib2/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	gnet-buildlink
+
+gnet-buildlink: _BUILDLINK_USE
+
+.endif	# GNET_BUILDLINK2_MK
diff --git a/net/gnet1/distinfo b/net/gnet1/distinfo
new file mode 100644
index 00000000000..51409bba67e
--- /dev/null
+++ b/net/gnet1/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1.1.1 2003/04/15 11:49:02 wiz Exp $
+
+SHA1 (gnet-1.1.8.tar.gz) = f0c01075f911859f807a5a49a2165eded26c2ad5
+Size (gnet-1.1.8.tar.gz) = 350091 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/gnet1/patches/patch-aa b/net/gnet1/patches/patch-aa
new file mode 100644
index 00000000000..387ac7e4fc8
--- /dev/null
+++ b/net/gnet1/patches/patch-aa
@@ -0,0 +1,32 @@
+$NetBSD: patch-aa,v 1.1.1.1 2003/04/15 11:49:02 wiz 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/gnet1/patches/patch-ab b/net/gnet1/patches/patch-ab
new file mode 100644
index 00000000000..11c043c81c8
--- /dev/null
+++ b/net/gnet1/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1.1.1 2003/04/15 11:49:02 wiz 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/gnet1/patches/patch-ac b/net/gnet1/patches/patch-ac
new file mode 100644
index 00000000000..15a71288957
--- /dev/null
+++ b/net/gnet1/patches/patch-ac
@@ -0,0 +1,25 @@
+$NetBSD: patch-ac,v 1.1.1.1 2003/04/15 11:49:02 wiz 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/gnet1/patches/patch-ad b/net/gnet1/patches/patch-ad
new file mode 100644
index 00000000000..b57bad3d234
--- /dev/null
+++ b/net/gnet1/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1.1.1 2003/04/15 11:49:02 wiz 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/gnet1/patches/patch-ae b/net/gnet1/patches/patch-ae
new file mode 100644
index 00000000000..b3d8105a6cd
--- /dev/null
+++ b/net/gnet1/patches/patch-ae
@@ -0,0 +1,28 @@
+$NetBSD: patch-ae,v 1.1.1.1 2003/04/15 11:49:02 wiz 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);
+     }
+