pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/openssl Add zlib option.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b98b656373e1
branches:  trunk
changeset: 547465:b98b656373e1
user:      reed <reed%pkgsrc.org@localhost>
date:      Wed Sep 17 00:46:58 2008 +0000

description:
Add zlib option.
This is for PR 39433.
It is not enabled by default.

diffstat:

 security/openssl/Makefile   |   3 ++-
 security/openssl/options.mk |  11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 42e434ea1a2f -r b98b656373e1 security/openssl/Makefile
--- a/security/openssl/Makefile Wed Sep 17 00:32:02 2008 +0000
+++ b/security/openssl/Makefile Wed Sep 17 00:46:58 2008 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.134 2008/07/14 03:52:54 tnn Exp $
+# $NetBSD: Makefile,v 1.135 2008/09/17 00:46:58 reed Exp $
 
 OPENSSL_SNAPSHOT?=     # empty
 OPENSSL_STABLE?=       # empty
 OPENSSL_VERS?=         0.9.8h
+PKGREVISION=           1
 
 .if empty(OPENSSL_SNAPSHOT)
 DISTNAME=      openssl-${OPENSSL_VERS}
diff -r 42e434ea1a2f -r b98b656373e1 security/openssl/options.mk
--- a/security/openssl/options.mk       Wed Sep 17 00:32:02 2008 +0000
+++ b/security/openssl/options.mk       Wed Sep 17 00:46:58 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:12 jlam Exp $
+# $NetBSD: options.mk,v 1.6 2008/09/17 00:46:58 reed Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.openssl
-PKG_SUPPORTED_OPTIONS= idea mdc2 rc5
+PKG_SUPPORTED_OPTIONS= idea mdc2 rc5 zlib
 
 .include "../../mk/bsd.options.mk"
 
@@ -48,6 +48,13 @@
 CONFIGURE_ARGS+=       no-rc5
 .endif
 
+.if !empty(PKG_OPTIONS:Mzlib)
+CONFIGURE_ARGS+=       zlib
+.include "../../devel/zlib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       no-zlib
+.endif
+
 .if !empty(OPENSSL_LICENSE)
 # pkgsrc does not handle multiple licenses
 LICENSE=       openssl-patented-algorithms-nonlicense



Home | Main Index | Thread Index | Old Index