diff options
author | wiz <wiz@pkgsrc.org> | 2003-04-15 12:19:17 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2003-04-15 12:19:17 +0000 |
commit | 5217c05abb5535101987830521c70899a2df2df7 (patch) | |
tree | d06ceadaa04729dedce00572e3b19df65044b783 /net/gnet | |
parent | 88634e6f47b2d7c0371d712e4683465498dd2b8e (diff) | |
download | pkgsrc-5217c05abb5535101987830521c70899a2df2df7.tar.gz |
Update to 2.0.0.
* DNS bug fixes
* FreeBSD compile fixes and UDP send bug fix
* New functions: gnet_{udp,mcast}_socket_get_local_inetaddr
* Build improvements: library is now named libgnet-MAJOR.MINOR,
favors GLib 2 over GLib 1.2
* New Base64 module (by Alfred Reibenschuh)
* Major documentation improvements
* Some minor API renaming in Inetaddr and TcpSocket
* IPv6 support
* Server, Conn, URI, and Unix modules are no longer "experimental"
* Header files are now in gnet-2.0
* gnet-config removed. Use pkg-config.
* Many API changes
* gnet_server_new() changed, but the prototype is the same. Make sure
you are using the new version correctly.
Diffstat (limited to 'net/gnet')
-rw-r--r-- | net/gnet/Makefile | 4 | ||||
-rw-r--r-- | net/gnet/PLIST | 116 | ||||
-rw-r--r-- | net/gnet/buildlink2.mk | 28 | ||||
-rw-r--r-- | net/gnet/distinfo | 13 | ||||
-rw-r--r-- | net/gnet/patches/patch-aa | 32 | ||||
-rw-r--r-- | net/gnet/patches/patch-ab | 18 | ||||
-rw-r--r-- | net/gnet/patches/patch-ac | 25 | ||||
-rw-r--r-- | net/gnet/patches/patch-ad | 14 | ||||
-rw-r--r-- | net/gnet/patches/patch-ae | 17 |
9 files changed, 93 insertions, 174 deletions
diff --git a/net/gnet/Makefile b/net/gnet/Makefile index b0ae4a8e106..1b8074038b4 100644 --- a/net/gnet/Makefile +++ b/net/gnet/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2003/03/04 14:03:04 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2003/04/15 12:19:17 wiz Exp $ # -DISTNAME= gnet-1.1.8 +DISTNAME= gnet-2.0.0 CATEGORIES= net MASTER_SITES= http://www.gnetlibrary.org/src/ diff --git a/net/gnet/PLIST b/net/gnet/PLIST index 9276ddf4c59..fbb9cf4f35e 100644 --- a/net/gnet/PLIST +++ b/net/gnet/PLIST @@ -1,56 +1,60 @@ -@comment $NetBSD: PLIST,v 1.4 2003/03/04 14:03:04 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 +@comment $NetBSD: PLIST,v 1.5 2003/04/15 12:19:17 wiz Exp $ +include/gnet-2.0/base64.h +include/gnet-2.0/conn.h +include/gnet-2.0/gnet.h +include/gnet-2.0/inetaddr.h +include/gnet-2.0/iochannel.h +include/gnet-2.0/ipv6.h +include/gnet-2.0/mcast.h +include/gnet-2.0/md5.h +include/gnet-2.0/pack.h +include/gnet-2.0/server.h +include/gnet-2.0/sha.h +include/gnet-2.0/socks.h +include/gnet-2.0/tcp.h +include/gnet-2.0/udp.h +include/gnet-2.0/unix.h +include/gnet-2.0/uri.h +lib/gnet-2.0/include/gnetconfig.h +lib/libgnet-2.0.a +lib/libgnet-2.0.la +lib/libgnet-2.0.so +lib/libgnet-2.0.so.0 +lib/libgnet-2.0.so.0.0 +lib/pkgconfig/gnet-2.0.pc +share/aclocal/gnet-2.0.m4 +share/doc/libgnet2.0-dev/html/gnet/book1.html +share/doc/libgnet2.0-dev/html/gnet/gnet-base64.html +share/doc/libgnet2.0-dev/html/gnet/gnet-conn.html +share/doc/libgnet2.0-dev/html/gnet/gnet-developers-async.html +share/doc/libgnet2.0-dev/html/gnet/gnet-developers-tips.html +share/doc/libgnet2.0-dev/html/gnet/gnet-developers.html +share/doc/libgnet2.0-dev/html/gnet/gnet-examples-other.html +share/doc/libgnet2.0-dev/html/gnet/gnet-examples.html +share/doc/libgnet2.0-dev/html/gnet/gnet-gnet.html +share/doc/libgnet2.0-dev/html/gnet/gnet-inetaddr.html +share/doc/libgnet2.0-dev/html/gnet/gnet-iochannel.html +share/doc/libgnet2.0-dev/html/gnet/gnet-ipv6.html +share/doc/libgnet2.0-dev/html/gnet/gnet-mcast.html +share/doc/libgnet2.0-dev/html/gnet/gnet-md5.html +share/doc/libgnet2.0-dev/html/gnet/gnet-overview.html +share/doc/libgnet2.0-dev/html/gnet/gnet-pack.html +share/doc/libgnet2.0-dev/html/gnet/gnet-server.html +share/doc/libgnet2.0-dev/html/gnet/gnet-sha.html +share/doc/libgnet2.0-dev/html/gnet/gnet-socks.html +share/doc/libgnet2.0-dev/html/gnet/gnet-tcp.html +share/doc/libgnet2.0-dev/html/gnet/gnet-udp.html +share/doc/libgnet2.0-dev/html/gnet/gnet-unix.html +share/doc/libgnet2.0-dev/html/gnet/gnet-uri.html +share/doc/libgnet2.0-dev/html/gnet/home.png +share/doc/libgnet2.0-dev/html/gnet/index.sgml +share/doc/libgnet2.0-dev/html/gnet/left.png +share/doc/libgnet2.0-dev/html/gnet/libgnet-reference.html +share/doc/libgnet2.0-dev/html/gnet/right.png +share/doc/libgnet2.0-dev/html/gnet/up.png +@dirrm share/doc/libgnet2.0-dev/html/gnet +@dirrm share/doc/libgnet2.0-dev/html +@dirrm share/doc/libgnet2.0-dev +@dirrm lib/gnet-2.0/include +@dirrm lib/gnet-2.0 +@dirrm include/gnet-2.0 diff --git a/net/gnet/buildlink2.mk b/net/gnet/buildlink2.mk index 20435ab8d79..aa07d74f31d 100644 --- a/net/gnet/buildlink2.mk +++ b/net/gnet/buildlink2.mk @@ -1,37 +1,21 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/12/24 06:10:18 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2003/04/15 12:19:17 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_DEPENDS.gnet?= gnet>=2.0.0 BUILDLINK_PKGSRCDIR.gnet?= ../../net/gnet 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 +BUILDLINK_FILES.gnet+= include/gnet-2.0/*.h +BUILDLINK_FILES.gnet+= lib/gnet-2.0/include/gnetconfig.h +BUILDLINK_FILES.gnet+= lib/libgnet-2.0.* +BUILDLINK_FILES.gnet+= lib/pkgconfig/gnet-2.0.pc .include "../../devel/glib2/buildlink2.mk" diff --git a/net/gnet/distinfo b/net/gnet/distinfo index cf2bd9ff649..331629385fc 100644 --- a/net/gnet/distinfo +++ b/net/gnet/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.7 2003/03/04 14:03:04 wiz Exp $ +$NetBSD: distinfo,v 1.8 2003/04/15 12:19:17 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 +SHA1 (gnet-2.0.0.tar.gz) = df8c08b93719c0125ed8ef7a6698fee5a56cbbee +Size (gnet-2.0.0.tar.gz) = 446365 bytes +SHA1 (patch-ad) = 4c7e3a07df6f1018fe9446db333348eaf587225e +SHA1 (patch-ae) = cf642dc0f9ea7a6c87ef0a9fb6be0f110d42232d diff --git a/net/gnet/patches/patch-aa b/net/gnet/patches/patch-aa deleted file mode 100644 index ebb16595a79..00000000000 --- a/net/gnet/patches/patch-aa +++ /dev/null @@ -1,32 +0,0 @@ -$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 deleted file mode 100644 index 3d67f534a2d..00000000000 --- a/net/gnet/patches/patch-ab +++ /dev/null @@ -1,18 +0,0 @@ -$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 deleted file mode 100644 index 8475ed819cf..00000000000 --- a/net/gnet/patches/patch-ac +++ /dev/null @@ -1,25 +0,0 @@ -$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 index e210c164deb..82b995a99ca 100644 --- a/net/gnet/patches/patch-ad +++ b/net/gnet/patches/patch-ad @@ -1,18 +1,22 @@ -$NetBSD: patch-ad,v 1.1 2003/02/13 00:29:53 dmcmahill Exp $ +$NetBSD: patch-ad,v 1.2 2003/04/15 12:19:19 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 @@ +--- examples/echoserver-unix.c.orig Mon Feb 3 20:01:56 2003 ++++ examples/echoserver-unix.c +@@ -228,7 +228,7 @@ async_client_iofunc(GIOChannel *iochanne + /* Check for data to be read (or if the socket was closed) */ if (c & G_IO_IN) { GIOError e; - guint bytes_read; + gsize bytes_read; /* Read the data into our buffer */ -@@ -265,5 +265,5 @@ + e = g_io_channel_read(iochannel, +@@ -259,7 +259,7 @@ async_client_iofunc(GIOChannel *iochanne + } 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, + &bytes_written); diff --git a/net/gnet/patches/patch-ae b/net/gnet/patches/patch-ae index eac9b77eaf0..26334ea3d60 100644 --- a/net/gnet/patches/patch-ae +++ b/net/gnet/patches/patch-ae @@ -1,21 +1,25 @@ -$NetBSD: patch-ae,v 1.1 2003/02/13 00:29:53 dmcmahill Exp $ +$NetBSD: patch-ae,v 1.2 2003/04/15 12:19:19 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 @@ +--- examples/hfetch.c.orig Mon Feb 3 20:01:56 2003 ++++ examples/hfetch.c +@@ -114,6 +114,7 @@ hfetch(gchar* server, gint port, gchar* + gchar buffer[1024]; GIOError error; guint n; + gsize n2; -@@ -143,5 +144,5 @@ + /* Create the address */ +@@ -142,17 +143,17 @@ hfetch(gchar* server, gint port, gchar* + /* Read the output */ 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 @@ + g_warning("Read error: %d\n", error); + break; } - if (n == 0) @@ -26,3 +30,4 @@ $NetBSD: patch-ae,v 1.1 2003/02/13 00:29:53 dmcmahill Exp $ + fwrite(buffer, n2, 1, stdout); } + gnet_tcp_socket_delete(socket); |