From owner-svn-ports-all@freebsd.org Fri Jul 22 08:07:07 2016 Return-Path: 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 06905BA1C1B; Fri, 22 Jul 2016 08:07:07 +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 B317F1AE1; Fri, 22 Jul 2016 08:07:06 +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 u6M875oX085851; Fri, 22 Jul 2016 08:07:05 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6M875Nx085847; Fri, 22 Jul 2016 08:07:05 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201607220807.u6M875Nx085847@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Fri, 22 Jul 2016 08:07:05 +0000 (UTC) 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 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.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jul 2016 08:07:07 -0000 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