[pkgsrc/trunk]: pkgsrc/security/gnutls Make this package use the libtasn libr...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/474d9db15fca
branches:  trunk
changeset: 462871:474d9db15fca
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sat Oct 18 08:10:57 2003 +0000

description:
Make this package use the libtasn library that comes with it, instead of our
own security/libtasn1 package, which is too new to work fine with gnutls.
While here, add missing dependency on devel/zlib.
Fixes PR pkg/23172; reviewed by wiz@.  Bump PKGREVISION to 1.

diffstat:

 security/gnutls/Makefile      |  9 +++++++--
 security/gnutls/buildlink2.mk |  6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diffs (60 lines):

diff -r aceacb2856f4 -r 474d9db15fca security/gnutls/Makefile
--- a/security/gnutls/Makefile  Sat Oct 18 05:23:48 2003 +0000
+++ b/security/gnutls/Makefile  Sat Oct 18 08:10:57 2003 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 22:52:55 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/10/18 08:10:57 jmmv Exp $
 #
 
 DISTNAME=      gnutls-0.8.7
+PKGREVISION=   1
 CATEGORIES=    security devel
 MASTER_SITES=  ftp://ftp.gnutls.org/pub/gnutls/
 
@@ -13,6 +14,10 @@
 USE_LIBTOOL=   YES
 GNU_CONFIGURE= YES
 
+# The security/libtasn1 package provides a version that is too new to work
+# fine with this version of gnutls.
+CONFIGURE_ARGS+=       --with-included-libtasn
+
 LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
 
 DOCDIR=                ${PREFIX}/share/doc/gnutls
@@ -26,7 +31,7 @@
        cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} *.c ${EGDIR}
 
 .include "../../archivers/liblzo/buildlink2.mk"
-.include "../../security/libtasn1/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
 .include "../../security/opencdk/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r aceacb2856f4 -r 474d9db15fca security/gnutls/buildlink2.mk
--- a/security/gnutls/buildlink2.mk     Sat Oct 18 05:23:48 2003 +0000
+++ b/security/gnutls/buildlink2.mk     Sat Oct 18 08:10:57 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/05/14 03:46:44 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/10/18 08:10:57 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use gnutls.
 #
@@ -9,7 +9,7 @@
 GNUTLS_BUILDLINK2_MK=  # defined
 
 BUILDLINK_PACKAGES+=                   gnutls
-BUILDLINK_DEPENDS.gnutls?=             gnutls>=0.8.7
+BUILDLINK_DEPENDS.gnutls?=             gnutls>=0.8.7nb1
 BUILDLINK_PKGSRCDIR.gnutls?=           ../../security/gnutls
 
 EVAL_PREFIX+=  BUILDLINK_PREFIX.gnutls=gnutls
@@ -19,7 +19,7 @@
 BUILDLINK_FILES.gnutls+=       lib/libgnutls.*
 
 .include "../../archivers/liblzo/buildlink2.mk"
-.include "../../security/libtasn1/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
 .include "../../security/opencdk/buildlink2.mk"
 
 BUILDLINK_TARGETS+=    gnutls-buildlink