summaryrefslogtreecommitdiff
path: root/sysutils/facter
diff options
context:
space:
mode:
authorRomain Tartière <romain@FreeBSD.org>2017-10-12 16:55:50 +0000
committerRomain Tartière <romain@FreeBSD.org>2017-10-12 16:55:50 +0000
commit87f3101ee1e5e19434f4565b44b7775d27fb25ff (patch)
treed0f537ac52313084e2515158cb864b6c3d6b226a /sysutils/facter
parentWoraround crash when LC_* is not set (diff)
Update to 3.9.2
- This version does not build with ninja, so disable it for now; - Remove unneeded patch; - While here, silent down post-patch operations. With hat: puppet
Notes
Notes: svn path=/head/; revision=451908
Diffstat (limited to 'sysutils/facter')
-rw-r--r--sysutils/facter/Makefile7
-rw-r--r--sysutils/facter/distinfo6
-rw-r--r--sysutils/facter/files/patch-lib_CMakeLists.txt14
3 files changed, 6 insertions, 21 deletions
diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile
index 8e5caf4d94ad..833a12aa9fec 100644
--- a/sysutils/facter/Makefile
+++ b/sysutils/facter/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= facter
-PORTVERSION= 3.9.0
-PORTREVISION?= 3
+PORTVERSION= 3.9.2
CATEGORIES?= sysutils
MASTER_SITES= http://downloads.puppetlabs.com/facter/
@@ -12,7 +11,7 @@ COMMENT= Cross-platform library for retrieving facts from OS
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= cmake compiler:c++11-lib ssl
+USES= cmake:noninja compiler:c++11-lib ssl
BROKEN_DragonFly= DragonFly is not supported upstream
BROKEN_powerpc64= fails to compile: collection.cc: 'stoi' was not declared in this scope
@@ -43,7 +42,7 @@ OPTIONS_SUB= yes
.include <bsd.port.options.mk>
post-patch:
- ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
+ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
${WRKSRC}/lib/src/facts/posix/collection.cc \
${WRKSRC}/lib/src/util/config/posix/config.cc
diff --git a/sysutils/facter/distinfo b/sysutils/facter/distinfo
index 31cdb6a8417b..1f5b6df9c4e7 100644
--- a/sysutils/facter/distinfo
+++ b/sysutils/facter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1505384928
-SHA256 (facter-3.9.0.tar.gz) = 5c80cae72e7d9457b8a0d28dfc3c030d7dbe5dc38c5418aa8f237928290ac9f7
-SIZE (facter-3.9.0.tar.gz) = 335644
+TIMESTAMP = 1507718795
+SHA256 (facter-3.9.2.tar.gz) = 7111b36a9179baa23f8faca185a4905200f096c2ee52d901dcd64796a66d4760
+SIZE (facter-3.9.2.tar.gz) = 335812
diff --git a/sysutils/facter/files/patch-lib_CMakeLists.txt b/sysutils/facter/files/patch-lib_CMakeLists.txt
deleted file mode 100644
index 40b9ce5fcb29..000000000000
--- a/sysutils/facter/files/patch-lib_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/CMakeLists.txt.orig 2017-09-12 21:43:10 UTC
-+++ lib/CMakeLists.txt
-@@ -189,6 +189,11 @@ elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "
- "src/facts/linux/processor_resolver.cc"
- "src/facts/linux/virtualization_resolver.cc"
- "src/util/bsd/scoped_ifaddrs.cc"
-+ "src/facts/freebsd/virtualization_resolver.cc"
-+ "src/facts/freebsd/memory_resolver.cc"
-+ "src/facts/freebsd/zfs_resolver.cc"
-+ "src/facts/freebsd/zpool_resolver.cc"
-+ "src/facts/freebsd/operating_system_resolver.cc"
- )
- set(LIBFACTER_PLATFORM_LIBRARIES
- ${BLKID_LIBRARIES}