From 293c13ba067172061c0392a914f79ac8e97d42b7 Mon Sep 17 00:00:00 2001 From: Michael Moll Date: Tue, 15 Sep 2015 09:08:50 +0000 Subject: [PATCH] sysutils/facter: update to 3.1.0 --- sysutils/facter/Makefile | 3 +-- sysutils/facter/distinfo | 4 ++-- sysutils/facter/files/patch-CMakeLists.txt | 8 -------- sysutils/facter/files/patch-lib_CMakeLists.txt | 11 ----------- .../files/patch-vendor_leatherman_cmake_cflags.cmake | 12 ++---------- sysutils/facter/pkg-plist | 12 +----------- 6 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 sysutils/facter/files/patch-CMakeLists.txt delete mode 100644 sysutils/facter/files/patch-lib_CMakeLists.txt diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile index 94e1e80379bb..fa189b81697d 100644 --- a/sysutils/facter/Makefile +++ b/sysutils/facter/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= facter -PORTVERSION= 3.0.2 -PORTREVISION= 1 +PORTVERSION= 3.1.0 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/facter/ diff --git a/sysutils/facter/distinfo b/sysutils/facter/distinfo index 00088a35c14e..88c80e7985e4 100644 --- a/sysutils/facter/distinfo +++ b/sysutils/facter/distinfo @@ -1,2 +1,2 @@ -SHA256 (facter-3.0.2.tar.gz) = 2fee1ee938196790f24b7b876ff04a5d69c0ac1492ff6935b003ae23500eced7 -SIZE (facter-3.0.2.tar.gz) = 508583 +SHA256 (facter-3.1.0.tar.gz) = 637a4e9cc3283374e11949b0450d0433fabcb2e2699c5d01921e8dad9cb457dd +SIZE (facter-3.1.0.tar.gz) = 620224 diff --git a/sysutils/facter/files/patch-CMakeLists.txt b/sysutils/facter/files/patch-CMakeLists.txt deleted file mode 100644 index 624b10c8adf1..000000000000 --- a/sysutils/facter/files/patch-CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ ---- CMakeLists.txt.orig 2015-07-23 12:50:51 UTC -+++ CMakeLists.txt -@@ -169,4 +169,4 @@ endif() - add_test(NAME "facter\\ smoke" COMMAND facter) - - # Install the man page --install(FILES ${PROJECT_SOURCE_DIR}/man/man8/facter.8 DESTINATION share/man/man8/) -+install(FILES ${PROJECT_SOURCE_DIR}/man/man8/facter.8 DESTINATION man/man8/) diff --git a/sysutils/facter/files/patch-lib_CMakeLists.txt b/sysutils/facter/files/patch-lib_CMakeLists.txt deleted file mode 100644 index 4d1c4a7e14dc..000000000000 --- a/sysutils/facter/files/patch-lib_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/CMakeLists.txt.orig 2015-07-21 17:31:28 UTC -+++ lib/CMakeLists.txt -@@ -115,7 +115,7 @@ if (UNIX) - set(LIBFACTER_STANDARD_SOURCES ${LIBFACTER_STANDARD_SOURCES} "src/util/posix/scoped_bio.cc") - endif() - -- set(POSIX_LIBRARIES pthread dl) -+ set(POSIX_LIBRARIES pthread) - endif() - - if (WIN32) diff --git a/sysutils/facter/files/patch-vendor_leatherman_cmake_cflags.cmake b/sysutils/facter/files/patch-vendor_leatherman_cmake_cflags.cmake index 1c7bb33e13da..0863dec5b6ca 100644 --- a/sysutils/facter/files/patch-vendor_leatherman_cmake_cflags.cmake +++ b/sysutils/facter/files/patch-vendor_leatherman_cmake_cflags.cmake @@ -1,19 +1,11 @@ ---- vendor/leatherman/cmake/cflags.cmake.orig 2015-07-21 17:31:29 UTC +--- vendor/leatherman/cmake/cflags.cmake.orig 2015-09-14 20:07:07 UTC +++ vendor/leatherman/cmake/cflags.cmake @@ -2,7 +2,7 @@ # Each of our project dirs sets CMAKE_CXX_FLAGS based on these. We do # not set CMAKE_CXX_FLAGS globally because gtest is not warning-clean. - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "\\w*Clang") - set(LEATHERMAN_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-tautological-constant-out-of-range-compare") + set(LEATHERMAN_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-error") # Clang warns that 'register' is deprecated; 'register' is used throughout boost, so it can't be an error yet. # The warning flag is different on different clang versions so we need to extract the clang version. -@@ -21,6 +21,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL - else() - set(LEATHERMAN_CXX_FLAGS "${LEATHERMAN_CXX_FLAGS} -Wno-deprecated") - endif() -+ set(LEATHERMAN_LIBRARY_FLAGS "-fPIC") - elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - # maybe-uninitialized is a relatively new GCC warning that Boost 1.57 violates; disable it for now until it's available in Clang as well - # it's also sometimes wrong diff --git a/sysutils/facter/pkg-plist b/sysutils/facter/pkg-plist index 30a3706c46c4..b55f735769eb 100644 --- a/sysutils/facter/pkg-plist +++ b/sysutils/facter/pkg-plist @@ -1,5 +1,4 @@ bin/facter -include/facter/execution/execution.hpp include/facter/export.h include/facter/facts/array_value.hpp include/facter/facts/collection.hpp @@ -12,20 +11,11 @@ include/facter/facts/resolver.hpp include/facter/facts/scalar_value.hpp include/facter/facts/value.hpp include/facter/facts/vm.hpp -include/facter/http/client.hpp -include/facter/http/request.hpp -include/facter/http/response.hpp include/facter/logging/logging.hpp include/facter/ruby/ruby.hpp -include/facter/util/directory.hpp -include/facter/util/environment.hpp -include/facter/util/file.hpp -include/facter/util/option_set.hpp -include/facter/util/scope_exit.hpp -include/facter/util/scoped_resource.hpp include/facter/util/string.hpp include/facter/version.h lib/libfacter.so -lib/libfacter.so.3.0.2 +lib/libfacter.so.3.1.0 lib/ruby/vendor_ruby/facter.rb man/man8/facter.8.gz