From owner-svn-ports-all@freebsd.org  Thu Sep  8 14:13:03 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4B5BFBD0B70;
 Thu,  8 Sep 2016 14:13:03 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0B1FDBD9;
 Thu,  8 Sep 2016 14:13:02 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u88ED2Ca067751;
 Thu, 8 Sep 2016 14:13:02 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u88ED2Ug067750;
 Thu, 8 Sep 2016 14:13:02 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201609081413.u88ED2Ug067750@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Thu, 8 Sep 2016 14:13:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r421556 - head/Mk/Uses
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Sep 2016 14:13:03 -0000

Author: mat
Date: Thu Sep  8 14:13:01 2016
New Revision: 421556
URL: https://svnweb.freebsd.org/changeset/ports/421556

Log:
  Allow adding only a build or run-time dependency on USES=ssl.
  
  PR:		202175
  Reported by:	barnerd
  Sponsored by:	Absolight

Modified:
  head/Mk/Uses/ssl.mk

Modified: head/Mk/Uses/ssl.mk
==============================================================================
--- head/Mk/Uses/ssl.mk	Thu Sep  8 14:12:58 2016	(r421555)
+++ head/Mk/Uses/ssl.mk	Thu Sep  8 14:13:01 2016	(r421556)
@@ -4,7 +4,7 @@
 #
 # Feature:	SSL_DEFAULT
 # Usage:	USES=ssl
-# Valid ARGS:	none
+# Valid ARGS:	none (build and run), build, run
 #
 # The user can choose which ssl library he wants with:
 #
@@ -28,8 +28,17 @@
 .if !defined(_INCLUDE_USES_SSL_MK)
 _INCLUDE_USES_SSL_MK=	yes
 
-.if !empty(ssl_ARGS)
-IGNORE=	"USES=ssl does not take any argument."
+.if !empty(ssl_ARGS:Nbuild:Nrun)
+IGNORE=	"USES=ssl invalid arguments ${ssl_ARGS}."
+.endif
+
+.if empty(ssl_ARGS) || (!empty(ssl_ARGS:Mbuild) && !empty(ssl_ARGS:Mrun))
+_SSL_BUILD_DEP=	1
+_SSL_RUN_DEP=	1
+.elif !empty(ssl_ARGS:Mbuild)
+_SSL_BUILD_DEP=	1
+.elif !empty(ssl_ARGS:Mrun)
+_SSL_RUN_DEP=	1
 .endif
 
 .if ${SSL_DEFAULT} == base
@@ -87,8 +96,12 @@ OPENSSL_PORT=		security/${SSL_DEFAULT}
 .  endif
 
 OPENSSLDIR?=		${OPENSSLBASE}/openssl
+.if defined(_SSL_BUILD_DEP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
+.endif
+.if defined(_SSL_RUN_DEP)
 RUN_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
+.endif
 OPENSSLRPATH=		${LOCALBASE}/lib
 
 .endif