Wed Mar 9 10:52:26 2011 UTC ()
fix installed pkgconfig .pc file: Don't refer to zlib.pc -- this
fails with system libz. We propagate a dependency per bl3 file,
this should be sufficient.
bump PKGREV


(drochner)
diff -r1.96 -r1.97 pkgsrc/security/gnutls/Makefile
diff -r1.69 -r1.70 pkgsrc/security/gnutls/distinfo
diff -r0 -r1.3 pkgsrc/security/gnutls/patches/patch-aj
cvs diff -r1.96 -r1.97 pkgsrc/security/gnutls/Makefile (expand / switch to unified diff)

--- pkgsrc/security/gnutls/Makefile 2011/03/07 13:45:34 1.96
+++ pkgsrc/security/gnutls/Makefile 2011/03/09 10:52:25 1.97
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.96 2011/03/07 13:45:34 adam Exp $ 1# $NetBSD: Makefile,v 1.97 2011/03/09 10:52:25 drochner Exp $
2 2
3DISTNAME= gnutls-2.10.5 3DISTNAME= gnutls-2.10.5
 4PKGREVISION= 1
4CATEGORIES= security devel 5CATEGORIES= security devel
5MASTER_SITES= ftp://ftp.gnutls.org/pub/gnutls/ \ 6MASTER_SITES= ftp://ftp.gnutls.org/pub/gnutls/ \
6 ftp://ftp.gnupg.org/gcrypt/gnutls/ \ 7 ftp://ftp.gnupg.org/gcrypt/gnutls/ \
7 ${MASTER_SITE_GNU:=gnutls/} 8 ${MASTER_SITE_GNU:=gnutls/}
8EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
9 10
10MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.gnutls.org/ 12HOMEPAGE= http://www.gnutls.org/
12COMMENT= GNU Transport Layer Security library 13COMMENT= GNU Transport Layer Security library
13LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1 14LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1
14 15
15PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
16PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
cvs diff -r1.69 -r1.70 pkgsrc/security/gnutls/distinfo (expand / switch to unified diff)

--- pkgsrc/security/gnutls/distinfo 2011/03/07 13:45:34 1.69
+++ pkgsrc/security/gnutls/distinfo 2011/03/09 10:52:25 1.70
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.69 2011/03/07 13:45:34 adam Exp $ 1$NetBSD: distinfo,v 1.70 2011/03/09 10:52:25 drochner Exp $
2 2
3SHA1 (gnutls-2.10.5.tar.bz2) = 4530657082a0e754356de89a5529d1ad7a18e777 3SHA1 (gnutls-2.10.5.tar.bz2) = 4530657082a0e754356de89a5529d1ad7a18e777
4RMD160 (gnutls-2.10.5.tar.bz2) = 4bc886ced90742a488e00c1884e6124b37047382 4RMD160 (gnutls-2.10.5.tar.bz2) = 4bc886ced90742a488e00c1884e6124b37047382
5Size (gnutls-2.10.5.tar.bz2) = 7287913 bytes 5Size (gnutls-2.10.5.tar.bz2) = 7287913 bytes
6SHA1 (patch-aa) = 45052cfc70becf7ab1e4aa880bea4fb904ddf16f 6SHA1 (patch-aa) = 45052cfc70becf7ab1e4aa880bea4fb904ddf16f
7SHA1 (patch-ab) = 43d53ae8f51491a0d300463df1ccd3445581e8b5 7SHA1 (patch-ab) = 43d53ae8f51491a0d300463df1ccd3445581e8b5
8SHA1 (patch-ae) = f505476ce0477dc547e8698d205d6ba26fe85f48 8SHA1 (patch-ae) = f505476ce0477dc547e8698d205d6ba26fe85f48
9SHA1 (patch-af) = bd4701640dfef5bfdce87d620befd93098b0dff3 9SHA1 (patch-af) = bd4701640dfef5bfdce87d620befd93098b0dff3
10SHA1 (patch-ai) = 2c5c181ec6de9622cac66c2d5fe2cc8f3f89fbe8 10SHA1 (patch-ai) = 2c5c181ec6de9622cac66c2d5fe2cc8f3f89fbe8
 11SHA1 (patch-aj) = 46fc301de8fec82b5296f0c708bd7cf734b69e72
File Added: pkgsrc/security/gnutls/patches/Attic/patch-aj
$NetBSD: patch-aj,v 1.3 2011/03/09 10:52:26 drochner Exp $

don't refer to zlib in installed pkgconfig files - fails with system libz

--- lib/configure.orig	2011-02-28 08:38:47.000000000 +0000
+++ lib/configure
@@ -16642,13 +16642,6 @@ else
 $as_echo "no" >&6; }
 fi
 
-if test x$ac_zlib != xno; then
-  if test "$GNUTLS_REQUIRES_PRIVATE" = ""; then
-    GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
-  else
-    GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE , zlib"
-  fi
-fi