diff options
| author | wiz <wiz@pkgsrc.org> | 2007-06-06 06:23:58 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2007-06-06 06:23:58 +0000 |
| commit | 984a5671847cb8a152b466815a7043016c333799 (patch) | |
| tree | 2468db84e540d1f39bd8c3f42a5ff2d371f9372a /security/gnutls | |
| parent | 3f1913788bd2507820c438421206e7c767602c55 (diff) | |
| download | pkgsrc-984a5671847cb8a152b466815a7043016c333799.tar.gz | |
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 (limited to 'security/gnutls')
| -rw-r--r-- | security/gnutls/Makefile | 9 | ||||
| -rw-r--r-- | security/gnutls/buildlink3.mk | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index 162512cbb33..713a81e2d14 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -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 @@ INFO_FILES= yes 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 @@ post-install: .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 --git a/security/gnutls/buildlink3.mk b/security/gnutls/buildlink3.mk index 727b2eb5746..50c4953e7b9 100644 --- a/security/gnutls/buildlink3.mk +++ b/security/gnutls/buildlink3.mk @@ -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 @@ BUILDLINK_PKGSRCDIR.gnutls?= ../../security/gnutls .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/+$//} |