[pkgsrc/trunk]: pkgsrc/net/net6 use libgnutls-config.mk instead of a private ...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6b9b60bf0b2d
branches:  trunk
changeset: 395052:6b9b60bf0b2d
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Jul 03 15:59:49 2009 +0000

description:
use libgnutls-config.mk instead of a private hack

diffstat:

 net/net6/Makefile         |   3 ++-
 net/net6/distinfo         |   3 +--
 net/net6/patches/patch-aa |  23 -----------------------
 3 files changed, 3 insertions(+), 26 deletions(-)

diffs (53 lines):

diff -r 8f24ced5c539 -r 6b9b60bf0b2d net/net6/Makefile
--- a/net/net6/Makefile Fri Jul 03 14:50:34 2009 +0000
+++ b/net/net6/Makefile Fri Jul 03 15:59:49 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/06/25 09:41:45 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/03 15:59:49 drochner Exp $
 #
 
 DISTNAME=      net6-1.3.9
@@ -25,4 +25,5 @@
 
 .include "../../devel/libsigc++/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
+.include "../../security/gnutls/libgnutls-config.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8f24ced5c539 -r 6b9b60bf0b2d net/net6/distinfo
--- a/net/net6/distinfo Fri Jul 03 14:50:34 2009 +0000
+++ b/net/net6/distinfo Fri Jul 03 15:59:49 2009 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2009/06/25 09:41:45 drochner Exp $
+$NetBSD: distinfo,v 1.5 2009/07/03 15:59:50 drochner Exp $
 
 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) = 4cbce62de477d34a0fab810a57646de0bf528834
diff -r 8f24ced5c539 -r 6b9b60bf0b2d net/net6/patches/patch-aa
--- a/net/net6/patches/patch-aa Fri Jul 03 14:50:34 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2009/06/25 09:41:45 drochner Exp $
-
---- configure.ac.orig  2009-01-03 21:56:07.000000000 +0100
-+++ configure.ac
-@@ -73,16 +73,8 @@ 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"
-+PKG_CHECK_MODULES([LIBGNUTLS], [gnutls])
-+addcflags="$LIBGNUTLS_CFLAGS"
- AC_SUBST(addcflags)
- 
- # gettext / i18n