Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Jul 2016 08:07:05 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r418912 - in head: Mk/Uses security/letskencrypt www/node www/node4
Message-ID:  <201607220807.u6M875Nx085847@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Fri Jul 22 08:07:05 2016
New Revision: 418912
URL: https://svnweb.freebsd.org/changeset/ports/418912

Log:
  Stop people putting arguments to USES=ssl.
  
  Sponsored by:	Absolight

Modified:
  head/Mk/Uses/ssl.mk
  head/security/letskencrypt/Makefile   (contents, props changed)
  head/www/node/Makefile   (contents, props changed)
  head/www/node4/Makefile   (contents, props changed)

Modified: head/Mk/Uses/ssl.mk
==============================================================================
--- head/Mk/Uses/ssl.mk	Fri Jul 22 07:05:12 2016	(r418911)
+++ head/Mk/Uses/ssl.mk	Fri Jul 22 08:07:05 2016	(r418912)
@@ -28,6 +28,10 @@
 .if !defined(_INCLUDE_USES_SSL_MK)
 _INCLUDE_USES_SSL_MK=	yes
 
+.if !empty(ssl_ARGS)
+IGNORE=	"USES=ssl does not take any argument."
+.endif
+
 .include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 
 .if ${SSL_DEFAULT} == base

Modified: head/security/letskencrypt/Makefile
==============================================================================
--- head/security/letskencrypt/Makefile	Fri Jul 22 07:05:12 2016	(r418911)
+++ head/security/letskencrypt/Makefile	Fri Jul 22 08:07:05 2016	(r418912)
@@ -13,7 +13,7 @@ COMMENT=	Native C client for Let's Encry
 
 LICENSE=	ISCL
 
-USES=		gmake ssl:libressl tar:tgz
+USES=		gmake ssl tar:tgz
 
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	PREFIX=${STAGEDIR}/${PREFIX}

Modified: head/www/node/Makefile
==============================================================================
--- head/www/node/Makefile	Fri Jul 22 07:05:12 2016	(r418911)
+++ head/www/node/Makefile	Fri Jul 22 08:07:05 2016	(r418912)
@@ -16,7 +16,7 @@ OPTIONS_DEFINE=	BUNDLED_SSL DOCS NLS
 OPTIONS_SUB=	yes
 
 BUNDLED_SSL_DESC=		Use node.js's bundled OpenSSL implementation
-BUNDLED_SSL_USES_OFF=		ssl:openssl
+BUNDLED_SSL_USES_OFF=		ssl
 BUNDLED_SSL_CONFIGURE_OFF+=	--shared-openssl
 
 NLS_CONFIGURE_ON=	--with-intl=system-icu

Modified: head/www/node4/Makefile
==============================================================================
--- head/www/node4/Makefile	Fri Jul 22 07:05:12 2016	(r418911)
+++ head/www/node4/Makefile	Fri Jul 22 08:07:05 2016	(r418912)
@@ -19,7 +19,7 @@ OPTIONS_DEFINE=	BUNDLED_SSL DOCS NLS
 OPTIONS_SUB=	yes
 
 BUNDLED_SSL_DESC=		Use node.js's bundled OpenSSL implementation
-BUNDLED_SSL_USES_OFF=		ssl:openssl
+BUNDLED_SSL_USES_OFF=		ssl
 BUNDLED_SSL_CONFIGURE_OFF=	--shared-openssl
 
 NLS_CONFIGURE_ON=	--with-intl=system-icu



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607220807.u6M875Nx085847>