From bdcea11005dd614dc5a424ffad3d7ff94217b258 Mon Sep 17 00:00:00 2001
From: hasso <hasso@pkgsrc.org>
Date: Sat, 13 Jun 2009 12:28:44 +0000
Subject: Update to 1.3.9. Make it build with new libgnutls (which don't have
 the libgnutls-config script any more).

Changes since 1.3.7:

* Preallocate and only copy the string once when escaping or unescaping it.
* Try to open both IPv6 and IPv4 listening sockets. This is required in
  case bindtov6only is 1 to also accept IPv4 connections in IPv6 mode.
---
 net/net6/Makefile         |  9 ++++++---
 net/net6/distinfo         |  9 +++++----
 net/net6/patches/patch-aa | 23 +++++++++++++++++++++++
 3 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 net/net6/patches/patch-aa

diff --git a/net/net6/Makefile b/net/net6/Makefile
index 9695a49705d..e2f550c7661 100644
--- a/net/net6/Makefile
+++ b/net/net6/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2008/07/12 15:11:40 obache Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/13 12:28:44 hasso Exp $
 #
 
-DISTNAME=	net6-1.3.7
+DISTNAME=	net6-1.3.9
 CATEGORIES=	net
 MASTER_SITES=	http://releases.0x539.de/net6/
 
@@ -13,12 +13,15 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		autoconf pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 
 PKGCONFIG_OVERRIDE+=	net6-1.3.pc.in
 
+pre-configure:
+	cd ${WRKSRC} && autoconf
+
 .include "../../devel/libsigc++/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/net6/distinfo b/net/net6/distinfo
index 5540f476404..c81906d011b 100644
--- a/net/net6/distinfo
+++ b/net/net6/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2008/07/12 15:11:40 obache Exp $
+$NetBSD: distinfo,v 1.3 2009/06/13 12:28:44 hasso Exp $
 
-SHA1 (net6-1.3.7.tar.gz) = c7d225d94bd45a7eb6a2739e5a6b31c7c2d672c6
-RMD160 (net6-1.3.7.tar.gz) = 0a8e906af33e6ee1d80efd91360085669cce4d96
-Size (net6-1.3.7.tar.gz) = 448850 bytes
+SHA1 (net6-1.3.9.tar.gz) = 86c15f3b3bcd89bfa8da9cef68518b32349ba36f
+RMD160 (net6-1.3.9.tar.gz) = 178c0093edfc9edc3f11afed06c4743ef86052e8
+Size (net6-1.3.9.tar.gz) = 449368 bytes
+SHA1 (patch-aa) = af9e96ff38f967c93ca60f56200694c4976e2a10
diff --git a/net/net6/patches/patch-aa b/net/net6/patches/patch-aa
new file mode 100644
index 00000000000..4be61f960f8
--- /dev/null
+++ b/net/net6/patches/patch-aa
@@ -0,0 +1,23 @@
+$NetBSD: patch-aa,v 1.1 2009/06/13 12:28:44 hasso Exp $
+
+--- configure.ac.orig	2009-06-12 19:09:16 +0300
++++ configure.ac	2009-06-12 19:09:53 +0300
+@@ -73,17 +73,7 @@ AM_CONDITIONAL(WIN32, test x$win32 = xtr
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([libnet6], [sigc++-2.0])
+-
+-AM_PATH_LIBGNUTLS( 1.0.0,, AC_MSG_ERROR([[
+-***
+-*** libgnutls was not found. You may want to get it by using the
+-*** package manager of your distribution or by compiling the source
+-*** from ftp://ftp.gnutls.org/pub/gnutls/. This dependency is
+-*** now mandatory.
+-]]))
+-addlibs="$addlibs $LIBGNUTLS_LIBS"
+-addcflags="$LIBGNUTLS_CFLAGS"
+-AC_SUBST(addcflags)
++PKG_CHECK_MODULES([LIBGNUTLS], [gnutls])
+ 
+ # gettext / i18n
+ AM_GNU_GETTEXT([external])
-- 
cgit v1.2.3