Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Feb 2021 14:18:44 +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: r563887 - head/www/cpp-httplib
Message-ID:  <202102031418.113EIixG089179@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>



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