[pkgsrc/trunk]: pkgsrc/security/polarssl Add patch to make OpenSSL ("tests") ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6288cc357871
branches:  trunk
changeset: 649028:6288cc357871
user:      rodent <rodent%pkgsrc.org@localhost>
date:      Sat Mar 28 19:00:28 2015 +0000

description:
Add patch to make OpenSSL ("tests") optional. The package wants this by
default and users of other package management systems might imagine this
package functioning the same way. However, the PLIST differs by one item
without it, which users may change at their discretion. Add zlib option
too which I'd missed during the previous update. Bump PKGREVISION.

diffstat:

 security/polarssl/Makefile                                   |   7 ++-
 security/polarssl/PLIST                                      |   4 +-
 security/polarssl/distinfo                                   |   7 ++-
 security/polarssl/options.mk                                 |  23 ++++++++++++
 security/polarssl/patches/patch-Makefile                     |   4 +-
 security/polarssl/patches/patch-library_Makefile             |   6 +-
 security/polarssl/patches/patch-programs_test_CMakeLists.txt |  14 +++++++
 7 files changed, 52 insertions(+), 13 deletions(-)

diffs (139 lines):

diff -r a0ce29776d40 -r 6288cc357871 security/polarssl/Makefile
--- a/security/polarssl/Makefile        Sat Mar 28 17:08:08 2015 +0000
+++ b/security/polarssl/Makefile        Sat Mar 28 19:00:28 2015 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2015/03/27 23:30:42 rodent Exp $
+# $NetBSD: Makefile,v 1.9 2015/03/28 19:00:28 rodent Exp $
 #
 
 DISTNAME=              polarssl-1.3.9-gpl
 PKGNAME=               ${DISTNAME:-gpl=}
+PKGREVISION=           1
 CATEGORIES=            security devel
 MASTER_SITES=          https://tls.mbed.org/download/
 EXTRACT_SUFX=          .tgz
@@ -19,7 +20,7 @@
 USE_LANGUAGES=         c
 TEST_TARGET=           check
 
-.include "../../mk/bsd.fast.prefs.mk"
+.include "options.mk"
 
 CMAKE_ARGS+=           -DUSE_SHARED_POLARSSL_LIBRARY=ON
 MAKE_ENV+=             RANLIB=${RANLIB:Q}
@@ -28,5 +29,5 @@
        ${CHMOD} -x ${DESTDIR}${PREFIX}/lib/libpolarssl.a
 
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+#.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a0ce29776d40 -r 6288cc357871 security/polarssl/PLIST
--- a/security/polarssl/PLIST   Sat Mar 28 17:08:08 2015 +0000
+++ b/security/polarssl/PLIST   Sat Mar 28 19:00:28 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/03/27 23:30:42 rodent Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/03/28 19:00:28 rodent Exp $
 bin/aescrypt2
 bin/benchmark
 bin/cert_app
@@ -18,7 +18,7 @@
 bin/key_app
 bin/md5sum
 bin/mpi_demo
-bin/o_p_test
+${PLIST.tests}bin/o_p_test
 bin/pem2der
 bin/pk_decrypt
 bin/pk_encrypt
diff -r a0ce29776d40 -r 6288cc357871 security/polarssl/distinfo
--- a/security/polarssl/distinfo        Sat Mar 28 17:08:08 2015 +0000
+++ b/security/polarssl/distinfo        Sat Mar 28 19:00:28 2015 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2015/03/27 23:30:42 rodent Exp $
+$NetBSD: distinfo,v 1.7 2015/03/28 19:00:28 rodent Exp $
 
 SHA1 (polarssl-1.3.9-gpl.tgz) = 3462b4455e1443ac1a1007fbd69861ebfb5c5506
 RMD160 (polarssl-1.3.9-gpl.tgz) = 981e4605d36ac8dfc1269c7be281f8c7d37c93cf
 Size (polarssl-1.3.9-gpl.tgz) = 1741396 bytes
-SHA1 (patch-Makefile) = d35397c1df60e384c2a0826844ac8765fd1fef1a
-SHA1 (patch-library_Makefile) = 131158b6206c81628ef3c3d037fbe0cc6fcf2c1f
+SHA1 (patch-Makefile) = 166adbc2786bb99018b47407677eb358952fd97b
+SHA1 (patch-library_Makefile) = d2799d7f60744b094968fe5ebd0b443ee47ddbd8
+SHA1 (patch-programs_test_CMakeLists.txt) = c2d352091bc6da4913c20e9f622cd112595a809c
diff -r a0ce29776d40 -r 6288cc357871 security/polarssl/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/polarssl/options.mk      Sat Mar 28 19:00:28 2015 +0000
@@ -0,0 +1,23 @@
+# $NetBSD: options.mk,v 1.1 2015/03/28 19:00:28 rodent Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.polarssl
+PKG_SUPPORTED_OPTIONS= tests zlib
+PKG_SUGGESTED_OPTIONS+=        # XXX: blank, though the package has "tests" by default
+PLIST_VARS+=           tests
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mtests)
+.include "../../security/openssl/buildlink3.mk"
+CMAKE_ARGS+=           -DENABLE_TESTING=ON
+PLIST.tests=           yes
+.else
+CMAKE_ARGS+=           -DENABLE_TESTING=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mzlib)
+.include "../../devel/zlib/buildlink3.mk"
+CMAKE_ARGS+=           -DENABLE_ZLIB_SUPPORT=ON
+.else
+CMAKE_ARGS+=           -DENABLE_ZLIB_SUPPORT=OFF
+.endif
diff -r a0ce29776d40 -r 6288cc357871 security/polarssl/patches/patch-Makefile
--- a/security/polarssl/patches/patch-Makefile  Sat Mar 28 17:08:08 2015 +0000
+++ b/security/polarssl/patches/patch-Makefile  Sat Mar 28 19:00:28 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile,v 1.2 2013/09/11 13:17:26 obache Exp $
+$NetBSD: patch-Makefile,v 1.3 2015/03/28 19:00:28 rodent Exp $
 
 Fix DESTDIR for pkgsrc, and suppress building test programs.
 
---- Makefile.orig      2013-06-21 13:11:10.000000000 +0000
+--- Makefile.orig      2014-10-20 11:59:19.000000000 +0000
 +++ Makefile
 @@ -1,48 +1,28 @@
  
diff -r a0ce29776d40 -r 6288cc357871 security/polarssl/patches/patch-library_Makefile
--- a/security/polarssl/patches/patch-library_Makefile  Sat Mar 28 17:08:08 2015 +0000
+++ b/security/polarssl/patches/patch-library_Makefile  Sat Mar 28 19:00:28 2015 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-library_Makefile,v 1.1 2015/03/19 11:25:24 jperkin Exp $
+$NetBSD: patch-library_Makefile,v 1.2 2015/03/28 19:00:28 rodent Exp $
 
 Call ranlib instead of non-portable 'ar s'.
 
---- library/Makefile.orig      2014-10-24 08:42:52.000000000 +0000
+--- library/Makefile.orig      2014-10-20 11:59:19.000000000 +0000
 +++ library/Makefile
-@@ -67,7 +67,7 @@ libpolarssl.a: $(OBJS)
+@@ -79,7 +79,7 @@ libpolarssl.a: $(OBJS)
        echo "  AR    $@"
        $(AR) r $@ $(OBJS)
        echo "  RL    $@"
diff -r a0ce29776d40 -r 6288cc357871 security/polarssl/patches/patch-programs_test_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/polarssl/patches/patch-programs_test_CMakeLists.txt      Sat Mar 28 19:00:28 2015 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-programs_test_CMakeLists.txt,v 1.1 2015/03/28 19:00:28 rodent Exp $
+
+Make OpenSSL optional.
+
+--- programs/test/CMakeLists.txt.orig  2015-03-28 18:49:58.000000000 +0000
++++ programs/test/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-FIND_PACKAGE(OpenSSL)
++if(ENABLE_TESTING)
++  FIND_PACKAGE(OpenSSL)
++endif()
+ 
+ set(libs
+      polarssl