From owner-svn-ports-head@freebsd.org Mon Jan 9 10:03:49 2017 Return-Path: Delivered-To: svn-ports-head@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 1859BCA5F44; Mon, 9 Jan 2017 10:03:49 +0000 (UTC) (envelope-from amdmi3@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 D95AA1050; Mon, 9 Jan 2017 10:03:48 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v09A3mn0007455; Mon, 9 Jan 2017 10:03:48 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v09A3m13007454; Mon, 9 Jan 2017 10:03:48 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201701091003.v09A3m13007454@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 9 Jan 2017 10:03:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430935 - head/www/tengine X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jan 2017 10:03:49 -0000 Author: amdmi3 Date: Mon Jan 9 10:03:47 2017 New Revision: 430935 URL: https://svnweb.freebsd.org/changeset/ports/430935 Log: - Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL - Always check NGINX_OPENSSL after it is defined Approved by: portmgr blanket Modified: head/www/tengine/Makefile Modified: head/www/tengine/Makefile ============================================================================== --- head/www/tengine/Makefile Mon Jan 9 10:02:39 2017 (r430934) +++ head/www/tengine/Makefile Mon Jan 9 10:03:47 2017 (r430935) @@ -730,20 +730,15 @@ CONFIGURE_ARGS+=--without-http_rewrite_m --without-pcre .endif -.if defined(NGINX_OPENSSL) -USE_OPENSSL= yes -.if ${PORT_OPTIONS:MSPDY} -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000028 -WITH_OPENSSL_PORT= yes -.endif -.endif -.endif - .if defined(WITH_HTTP_SSL) NGINX_OPENSSL= yes CONFIGURE_ARGS+=--with-http_ssl_module .endif +.if defined(NGINX_OPENSSL) +USES+= ssl +.endif + .if ${PORT_OPTIONS:MHTTP_SSL} WITH_HTTP_SSL= yes .endif