Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Nov 2018 01:58:49 +0000 (UTC)
From:      =?UTF-8?Q?Romain_Tarti=c3=a8re?= <romain@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r486153 - in head/sysutils/facter: . files
Message-ID:  <201811290158.wAT1wnMS075991@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: romain
Date: Thu Nov 29 01:58:49 2018
New Revision: 486153
URL: https://svnweb.freebsd.org/changeset/ports/486153

Log:
  Integrate a patch to fix cURL detection
  
  The patch has been submitted upstream, but some users depend on it now, so ship
  it:
  https://github.com/puppetlabs/facter/pull/1762

Added:
  head/sysutils/facter/files/patch-CMakeLists.txt   (contents, props changed)
Modified:
  head/sysutils/facter/Makefile

Modified: head/sysutils/facter/Makefile
==============================================================================
--- head/sysutils/facter/Makefile	Thu Nov 29 00:51:40 2018	(r486152)
+++ head/sysutils/facter/Makefile	Thu Nov 29 01:58:49 2018	(r486153)
@@ -2,6 +2,7 @@
 
 PORTNAME=	facter
 PORTVERSION=	3.12.1
+PORTREVISION=	1
 CATEGORIES?=	sysutils
 MASTER_SITES=	https://downloads.puppetlabs.com/facter/
 

Added: head/sysutils/facter/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/facter/files/patch-CMakeLists.txt	Thu Nov 29 01:58:49 2018	(r486153)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2018-10-23 22:00:38 UTC
++++ CMakeLists.txt
+@@ -52,7 +52,7 @@ SET(LEATHERMAN_COMPONENTS locale catch n
+ 
+ # We look for curl early, because whether or not we link to the leatherman curl library
+ # is dependant on whether or not we find curl on the system.
+-if ((("${CMAKE_SYSTEM_NAME}" MATCHES "Linux|OpenBSD") OR WIN32) AND NOT WITHOUT_CURL)
++if ((("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD|Linux|OpenBSD") OR WIN32) AND NOT WITHOUT_CURL)
+     find_package(CURL)
+     if (CURL_FOUND)
+         add_definitions(-DUSE_CURL)



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