[pkgsrc/trunk]: pkgsrc/security take wip/pkcs11-helper as generated by Daniel...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/08c2250351a7
branches:  trunk
changeset: 399237:08c2250351a7
user:      spz <spz%pkgsrc.org@localhost>
date:      Tue Sep 15 20:00:47 2009 +0000

description:
take wip/pkcs11-helper as generated by Daniel 'morr' Horecki <shinden%linux.pl@localhost>

add options, DESTDIR, LICENSE and other small updates to pkgsrc-current

diffstat:

 security/Makefile                       |   3 +-
 security/pkcs11-helper/patches/patch-aa |  34 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletions(-)

diffs (55 lines):

diff -r aa6f57aa9b80 -r 08c2250351a7 security/Makefile
--- a/security/Makefile Tue Sep 15 19:54:32 2009 +0000
+++ b/security/Makefile Tue Sep 15 20:00:47 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.358 2009/09/13 19:58:14 manu Exp $
+# $NetBSD: Makefile,v 1.359 2009/09/15 20:00:47 spz Exp $
 #
 
 COMMENT=       Security tools
@@ -236,6 +236,7 @@
 SUBDIR+=       php-suhosin
 SUBDIR+=       pinentry
 SUBDIR+=       pinepgp
+SUBDIR+=       pkcs11-helper
 SUBDIR+=       pks
 SUBDIR+=       policykit
 SUBDIR+=       policykit-gnome
diff -r aa6f57aa9b80 -r 08c2250351a7 security/pkcs11-helper/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pkcs11-helper/patches/patch-aa   Tue Sep 15 20:00:47 2009 +0000
@@ -0,0 +1,34 @@
+$NetBSD: patch-aa,v 1.1 2009/09/15 20:00:47 spz Exp $
+
+--- configure.ac.orig  2008-07-31 17:44:03.000000000 +0200
++++ configure.ac       2009-01-27 15:09:26.000000000 +0100
+@@ -281,10 +281,25 @@
+       AC_CHECK_LIB([pthread], [pthread_create])
+ fi
+ 
+-PKG_CHECK_MODULES([OPENSSL], [libcrypto >= 0.9.7], [have_openssl="yes"], [have_openssl="no"])
+-if test "${have_openssl}" = "no"; then
+-      PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.7], [have_openssl="yes"], [have_openssl="no"])
+-fi
++PKG_CHECK_MODULES(
++        [OPENSSL],
++        [libcrypto >= 0.9.7],
++        [have_openssl="yes"],
++        [PKG_CHECK_MODULES(
++                [OPENSSL],
++                [openssl >= 0.9.7],
++                [have_openssl="yes"],
++                [AC_CHECK_LIB(
++                        [crypto],
++                        [RSA_version],
++                        [
++                                have_openssl="yes"
++                                OPENSSL_LIBS="-lcrypto"
++                        ],
++                        [have_openssl="no"]
++                )]
++        )]
++)
+ 
+ PKG_CHECK_MODULES([GNUTLS], [gnutls >= 1.4], [have_gnutls="yes"], [have_gnutls="no"])
+ PKG_CHECK_MODULES([NSS], [nss >= 3.11], [have_nss="yes"], [have_nss="no"])