Update gnet to 1.1.7. Depends on glib2 now. Other changes are:

  * Fixed major bug in IO channel code from 1.1.6
  * IOChannels are non-buffering, non-encoded by default (for GLib 2.0)
  * examples are now build by default
  * gnet_inetaddr_list_interfaces() bug fix
  * FreeBSD compile fix (affected gnet_inetaddr_list_interfaces())
  * New gnet_init() function.  This should be called in main(). [1]
  * GNet now properly links to libgthread (if necessary)
  * More automated test cases
  * Several compile fixes and small bug fixes
  * Package now includes a buildlink2.mk

5 files changed, 69 insertions, 14 deletions

diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index f003ecbfd9d..482c4d105bb 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.2 2002/08/25 21:49:57 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/16 07:58:55 rh Exp $
 #
 
-DISTNAME=	gnet-1.1.4
-CATEGORIES=	net
-MASTER_SITES=	http://www.gnetlibrary.org/src/
+DISTNAME=		gnet-1.1.7
+CATEGORIES=		net
+MASTER_SITES=		http://www.gnetlibrary.org/src/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.gnetlibrary.org/
-COMMENT=	simple network library
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.gnetlibrary.org/
+COMMENT=		simple network library
 
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
+CONFIGURE_ARGS=		--enable-glib2
 
-.include "../../devel/glib/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gnet/PLIST b/net/gnet/PLIST
index 5e648998bd1..119473aefb9 100644
--- a/net/gnet/PLIST
+++ b/net/gnet/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/25 21:49:57 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/10/16 07:58:56 rh Exp $
 bin/gnet-config
 include/gnet/conn.h
 include/gnet/gnet.h
@@ -16,8 +16,8 @@ include/gnet/unix.h
 include/gnet/url.h
 lib/gnet/include/gnetconfig.h
 lib/libgnet-1.1.so
-lib/libgnet-1.1.so.1
-lib/libgnet-1.1.so.1.3
+lib/libgnet-1.1.so.7
+lib/libgnet-1.1.so.7.0
 lib/libgnet.a
 lib/libgnet.la
 lib/libgnet.so
diff --git a/net/gnet/buildlink2.mk b/net/gnet/buildlink2.mk
new file mode 100644
index 00000000000..88062591dab
--- /dev/null
+++ b/net/gnet/buildlink2.mk
@@ -0,0 +1,42 @@
+# $NetBSD: buildlink2.mk,v 1.1 2002/10/16 07:58:56 rh 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.7
+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
+
+.include "../../devel/glib2/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	gnet-buildlink
+
+gnet-buildlink: _BUILDLINK_USE
+
+.endif	# GNET_BUILDLINK2_MK
diff --git a/net/gnet/distinfo b/net/gnet/distinfo
index 3b76c50522a..4485c756827 100644
--- a/net/gnet/distinfo
+++ b/net/gnet/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/08/25 21:49:57 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/10/16 07:58:57 rh Exp $
 
-SHA1 (gnet-1.1.4.tar.gz) = 1970534bebbfbd9a5255e7d23c26fdbad1ea6acb
-Size (gnet-1.1.4.tar.gz) = 363006 bytes
+SHA1 (gnet-1.1.7.tar.gz) = 42e68deee3c82c38153ae361edee785399476f5d
+Size (gnet-1.1.7.tar.gz) = 367915 bytes
+SHA1 (patch-aa) = 2a3b2229b69f4276d939bbd3716a17a4ba225cb4
diff --git a/net/gnet/patches/patch-aa b/net/gnet/patches/patch-aa
new file mode 100644
index 00000000000..19fa7288ea8
--- /dev/null
+++ b/net/gnet/patches/patch-aa
@@ -0,0 +1,11 @@
+$NetBSD: patch-aa,v 1.1 2002/10/16 07:58:57 rh Exp $
+
+--- gnet.pc.in.orig	Sat Apr 13 06:20:37 2002
++++ gnet.pc.in
+@@ -6,5 +6,5 @@ includedir=@includedir@
+ Name: Gnet
+ Description: A network compatibility layer library
+ Version: @VERSION@
+-Libs: -L${libdir} -lgnet @GLIB_LIBS@ @GTHREAD_LIBS@
++Libs: -Wl,-R${libdir} -L${libdir} -lgnet @GLIB_LIBS@ @GTHREAD_LIBS@
+ Cflags: -I${includedir}/gnet -I${libdir}/gnet/include/ @GLIB_CFLAGS@ @GTHREAD_CFLAGS@