[pkgsrc/trunk]: pkgsrc/security/gnutls Use included opencdk for now, opencdk-...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4c77194d0828
branches:  trunk
changeset: 529484:4c77194d0828
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jun 06 06:23:58 2007 +0000

description:
Use included opencdk for now, opencdk-0.6.x is not compatible with
gnutls-1.6.x (the stable branch).

No further PKGREVISION bumps necessary, because opencdk caused recursive
PKGREVISION bumps and afterwards gnutls wouldn't build.

Addresses PR pkg/36448.

diffstat:

 security/gnutls/Makefile      |  9 ++++++---
 security/gnutls/buildlink3.mk |  4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 92c74881f59e -r 4c77194d0828 security/gnutls/Makefile
--- a/security/gnutls/Makefile  Wed Jun 06 06:13:59 2007 +0000
+++ b/security/gnutls/Makefile  Wed Jun 06 06:23:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2007/06/05 05:36:59 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2007/06/06 06:23:58 wiz Exp $
 
 DISTNAME=      gnutls-1.6.3
 PKGREVISION=   1
@@ -28,7 +28,9 @@
 PKGCONFIG_OVERRIDE=    lib/gnutls.pc.in
 PKGCONFIG_OVERRIDE+=   libextra/gnutls-extra.pc.in
 
-BUILDLINK_API_DEPENDS.opencdk+=        opencdk>=0.5.5
+# Disabled because 1.6.x doesn't work with opencdk-0.6.x
+CONFIGURE_ARGS+=       --with-included-opencdk
+#BUILDLINK_API_DEPENDS.opencdk+=       opencdk>=0.5.5
 BUILDLINK_API_DEPENDS.libtasn1+=       libtasn1>=0.3.4
 BUILDLINK_API_DEPENDS.libgcrypt+=      libgcrypt>=1.2.2
 
@@ -54,5 +56,6 @@
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libtasn1/buildlink3.mk"
-.include "../../security/opencdk/buildlink3.mk"
+# Disabled because 1.6.x doesn't work with opencdk-0.6.x
+#.include "../../security/opencdk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 92c74881f59e -r 4c77194d0828 security/gnutls/buildlink3.mk
--- a/security/gnutls/buildlink3.mk     Wed Jun 06 06:13:59 2007 +0000
+++ b/security/gnutls/buildlink3.mk     Wed Jun 06 06:23:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/06/05 05:36:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2007/06/06 06:23:59 wiz Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GNUTLS_BUILDLINK3_MK:= ${GNUTLS_BUILDLINK3_MK}+
@@ -23,6 +23,6 @@
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libtasn1/buildlink3.mk"
-.include "../../security/opencdk/buildlink3.mk"
+#.include "../../security/opencdk/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}