diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/gnet/Makefile | 8 | ||||
| -rw-r--r-- | net/gnet/PLIST | 3 | ||||
| -rw-r--r-- | net/gnet/distinfo | 8 | ||||
| -rw-r--r-- | net/gnet/patches/patch-ad | 22 | ||||
| -rw-r--r-- | net/gnet/patches/patch-ae | 33 | ||||
| -rw-r--r-- | net/gnet/patches/patch-co | 13 |
6 files changed, 9 insertions, 78 deletions
diff --git a/net/gnet/Makefile b/net/gnet/Makefile index fa4fb96bb82..18d0239b7c1 100644 --- a/net/gnet/Makefile +++ b/net/gnet/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.32 2006/03/04 21:30:19 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2008/04/16 14:43:38 wiz Exp $ # -DISTNAME= gnet-2.0.7 -PKGREVISION= 2 +DISTNAME= gnet-2.0.8 CATEGORIES= net -MASTER_SITES= http://www.gnetlibrary.org/src/ +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnet/2.0/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gnetlibrary.org/ @@ -14,7 +13,6 @@ USE_TOOLS+= pkg-config USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= gnet-2.0.pc.in GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --enable-glib2 CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc TEST_TARGET= check diff --git a/net/gnet/PLIST b/net/gnet/PLIST index f54f273e3be..ad0acc49050 100644 --- a/net/gnet/PLIST +++ b/net/gnet/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2005/05/25 11:41:32 wiz Exp $ +@comment $NetBSD: PLIST,v 1.13 2008/04/16 14:43:38 wiz Exp $ include/gnet-2.0/base64.h include/gnet-2.0/conn-http.h include/gnet-2.0/conn.h @@ -44,6 +44,7 @@ share/doc/gnet/gnet-udp.html share/doc/gnet/gnet-unix.html share/doc/gnet/gnet-uri.html share/doc/gnet/gnet.devhelp +share/doc/gnet/gnet.devhelp2 share/doc/gnet/home.png share/doc/gnet/index.html share/doc/gnet/index.sgml diff --git a/net/gnet/distinfo b/net/gnet/distinfo index b01c8e8ac1f..d1d8f6daf95 100644 --- a/net/gnet/distinfo +++ b/net/gnet/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.16 2006/10/10 20:01:31 rillig Exp $ +$NetBSD: distinfo,v 1.17 2008/04/16 14:43:38 wiz Exp $ -SHA1 (gnet-2.0.7.tar.gz) = 01c41bd492c6fd33d31800d0c5146a09315f7f6d -RMD160 (gnet-2.0.7.tar.gz) = 4df0bbc29ccdd84cb32d5199dade6351163c5548 -Size (gnet-2.0.7.tar.gz) = 608961 bytes +SHA1 (gnet-2.0.8.tar.gz) = 762b606874fed243d2befe730212a398eef02872 +RMD160 (gnet-2.0.8.tar.gz) = b2ab816f4101e5825867b4fd1a7f6b7cb91c31d3 +Size (gnet-2.0.8.tar.gz) = 725267 bytes SHA1 (patch-ad) = 4c7e3a07df6f1018fe9446db333348eaf587225e SHA1 (patch-ae) = cf642dc0f9ea7a6c87ef0a9fb6be0f110d42232d SHA1 (patch-co) = 286194dfea94f17e44b2fdb454076b076cc235ad diff --git a/net/gnet/patches/patch-ad b/net/gnet/patches/patch-ad deleted file mode 100644 index 82b995a99ca..00000000000 --- a/net/gnet/patches/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2003/04/15 12:19:19 wiz Exp $ - ---- 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 */ - 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 deleted file mode 100644 index 26334ea3d60..00000000000 --- a/net/gnet/patches/patch-ae +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2003/04/15 12:19:19 wiz Exp $ - ---- 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; - - - /* 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) - { - g_warning("Read error: %d\n", error); - break; - } - -- if (n == 0) -+ if (n2 == 0) - break; - -- fwrite(buffer, n, 1, stdout); -+ fwrite(buffer, n2, 1, stdout); - } - - gnet_tcp_socket_delete(socket); diff --git a/net/gnet/patches/patch-co b/net/gnet/patches/patch-co deleted file mode 100644 index 89f9a414b4a..00000000000 --- a/net/gnet/patches/patch-co +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-co,v 1.1 2006/10/10 20:01:31 rillig Exp $ - ---- configure.orig 2006-10-10 21:32:25.000000000 +0200 -+++ configure 2006-10-10 22:00:48.000000000 +0200 -@@ -21644,7 +21644,7 @@ fi - LIBS="$gnet_save_LIBS $dash_pthread" - - # Otherwise, check for -lpthread and -lc_r -- if test "x$dash_pthread" == "x"; then -+ if test "x$dash_pthread" = "x"; then - echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 - echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 - if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then |