From 8748c6679e04218202577718e94a1cd13351129e Mon Sep 17 00:00:00 2001
From: reed <reed@pkgsrc.org>
Date: Wed, 17 Sep 2008 00:46:58 +0000
Subject: Add zlib option. This is for PR 39433. It is not enabled by default.

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

(limited to 'security/openssl')

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index d885c25386c..a1bc8523dfe 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -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 --git a/security/openssl/options.mk b/security/openssl/options.mk
index 25696de0f5a..c160850538c 100644
--- a/security/openssl/options.mk
+++ b/security/openssl/options.mk
@@ -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 @@ PLIST.rc5=		yes
 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
-- 
cgit v1.2.3