From owner-svn-ports-head@freebsd.org Wed Feb 3 14:18:44 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AA4915380AE; Wed, 3 Feb 2021 14:18:44 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DW3h44WHPz4dty; Wed, 3 Feb 2021 14:18:44 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8DFCD2258B; Wed, 3 Feb 2021 14:18:44 +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 113EIitT089180; Wed, 3 Feb 2021 14:18:44 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 113EIixG089179; Wed, 3 Feb 2021 14:18:44 GMT (envelope-from mat@FreeBSD.org) Message-Id: <202102031418.113EIixG089179@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 3 Feb 2021 14:18:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563887 - head/www/cpp-httplib X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: head/www/cpp-httplib X-SVN-Commit-Revision: 563887 X-SVN-Commit-Repository: ports 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.34 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: Wed, 03 Feb 2021 14:18:44 -0000 Author: mat Date: Wed Feb 3 14:18:44 2021 New Revision: 563887 URL: https://svnweb.freebsd.org/changeset/ports/563887 Log: Remove an unneeded call to awk. With hat: portmgr Modified: head/www/cpp-httplib/Makefile (contents, props changed) Modified: head/www/cpp-httplib/Makefile ============================================================================== --- head/www/cpp-httplib/Makefile Wed Feb 3 14:12:27 2021 (r563886) +++ head/www/cpp-httplib/Makefile Wed Feb 3 14:18:44 2021 (r563887) @@ -26,22 +26,14 @@ PLIST_FILES= include/httplib.h \ lib/cmake/httplib/httplibConfigVersion.cmake \ lib/cmake/httplib/httplibTargets.cmake -OSVERSION!= awk '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${CROSS_SYSROOT}/usr/include/sys/param.h # needed for options, so including bsd.port.options.mk is impossible +OPTIONS_DEFINE= BROTLI ${${OSVERSION}>1200085:?SSL:} +OPTIONS_DEFAULT= BROTLI ${${OSVERSION}>1200085:?SSL:} -OPTIONS_DEFINE= BROTLI -OPTIONS_DEFAULT= BROTLI -.if ${OSVERSION} >= 1200000 -OPTIONS_DEFINE+= SSL # fails on 11: Found unsuitable version "1.0.2u", but required is at least "1.1.1" -OPTIONS_DEFAULT+= SSL -.endif - BROTLI_CMAKE_BOOL= HTTPLIB_REQUIRE_BROTLI HTTPLIB_USE_BROTLI_IF_AVAILABLE BROTLI_BUILD_DEPENDS= brotli>0:archivers/brotli BROTLI_RUN_DEPENDS= brotli>0:archivers/brotli -.if ${OSVERSION} >= 1200000 SSL_USES= ssl SSL_CMAKE_BOOL= HTTPLIB_REQUIRE_OPENSSL HTTPLIB_USE_OPENSSL_IF_AVAILABLE -.endif .include