Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Aug 2017 18:47:52 +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: r448483 - in head/sysutils/facter: . files
Message-ID:  <201708211847.v7LIlqR7052716@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: romain
Date: Mon Aug 21 18:47:52 2017
New Revision: 448483
URL: https://svnweb.freebsd.org/changeset/ports/448483

Log:
  Update to 3.8.0
  
  Remove a bunch of patches merged upstream.
  Add some new patches to use paths that better fit FreeBSD:
    Configuration -> /usr/local/etc/facter/facter.conf
    Custom facts  -> /usr/local/etc/facter/facts.d/
    Cached facts  -> /var/facter/cache/cached_facts/

Added:
  head/sysutils/facter/files/patch-lib_src_facts_posix_cache.cc   (contents, props changed)
  head/sysutils/facter/files/patch-lib_src_facts_posix_collection.cc   (contents, props changed)
  head/sysutils/facter/files/patch-lib_src_util_config_posix_config.cc   (contents, props changed)
Deleted:
  head/sysutils/facter/files/patch-lib_inc_facter_facts_fact.hpp
  head/sysutils/facter/files/patch-lib_inc_facter_facts_vm.hpp
  head/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_memory__resolver.hpp
  head/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_operating__system__resolver.hpp
  head/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_virtualization__resolver.hpp
  head/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_zfs__resolver.hpp
  head/sysutils/facter/files/patch-lib_inc_internal_facts_freebsd_zpool__resolver.hpp
  head/sysutils/facter/files/patch-lib_inc_internal_facts_resolvers_operating__system__resolver.hpp
  head/sysutils/facter/files/patch-lib_inc_internal_facts_resolvers_zfs__resolver.hpp
  head/sysutils/facter/files/patch-lib_inc_internal_facts_resolvers_zpool__resolver.hpp
  head/sysutils/facter/files/patch-lib_schema_facter.yaml
  head/sysutils/facter/files/patch-lib_src_facts_bsd_collection.cc
  head/sysutils/facter/files/patch-lib_src_facts_freebsd_collection.cc
  head/sysutils/facter/files/patch-lib_src_facts_freebsd_memory__resolver.cc
  head/sysutils/facter/files/patch-lib_src_facts_freebsd_operating__system__resolver.cc
  head/sysutils/facter/files/patch-lib_src_facts_freebsd_virtualization__resolver.cc
  head/sysutils/facter/files/patch-lib_src_facts_freebsd_zfs__resolver.cc
  head/sysutils/facter/files/patch-lib_src_facts_freebsd_zpool__resolver.cc
  head/sysutils/facter/files/patch-lib_src_facts_openbsd_collection.cc
  head/sysutils/facter/files/patch-lib_src_facts_resolvers_operating__system__resolver.cc
  head/sysutils/facter/files/patch-lib_src_facts_resolvers_zfs__resolver.cc
  head/sysutils/facter/files/patch-lib_src_facts_resolvers_zpool__resolver.cc
  head/sysutils/facter/files/patch-lib_tests_facts_resolvers_zfs__resolver.cc
  head/sysutils/facter/files/patch-lib_tests_facts_resolvers_zpool__resolver.cc
  head/sysutils/facter/files/patch-lib_tests_facts_schema.cc
Modified:
  head/sysutils/facter/Makefile
  head/sysutils/facter/distinfo
  head/sysutils/facter/pkg-plist

Modified: head/sysutils/facter/Makefile
==============================================================================
--- head/sysutils/facter/Makefile	Mon Aug 21 17:49:01 2017	(r448482)
+++ head/sysutils/facter/Makefile	Mon Aug 21 18:47:52 2017	(r448483)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	facter
-PORTVERSION=	3.7.1
+PORTVERSION=	3.8.0
 PORTREVISION?=	0
 CATEGORIES?=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/facter/
@@ -32,6 +32,11 @@ USE_LDCONFIG=	yes
 USE_RUBY=	yes
 USES+=		compiler:c++11-lib ssl
 CMAKE_ARGS+=	-DMAN_PATH=${MANPREFIX}/man
+
+post-patch:
+	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
+		${WRKSRC}/lib/src/facts/posix/collection.cc \
+		${WRKSRC}/lib/src/util/config/posix/config.cc
 
 test: build
 	cd ${WRKSRC}/lib && bundle install --path vendor

Modified: head/sysutils/facter/distinfo
==============================================================================
--- head/sysutils/facter/distinfo	Mon Aug 21 17:49:01 2017	(r448482)
+++ head/sysutils/facter/distinfo	Mon Aug 21 18:47:52 2017	(r448483)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500912593
-SHA256 (facter-3.7.1.tar.gz) = 54fc56bfc3997b40c806982759c837f609a7268f669764921424fd41fda83467
-SIZE (facter-3.7.1.tar.gz) = 330767
+TIMESTAMP = 1503037047
+SHA256 (facter-3.8.0.tar.gz) = a53f1646614f774cc150e7edcca40ef2512650e1cbafdcaf0f2739969c6b59c6
+SIZE (facter-3.8.0.tar.gz) = 334042

Added: head/sysutils/facter/files/patch-lib_src_facts_posix_cache.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/facter/files/patch-lib_src_facts_posix_cache.cc	Mon Aug 21 18:47:52 2017	(r448483)
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- lib/src/facts/posix/cache.cc.orig
++++ lib/src/facts/posix/cache.cc
+@@ -3,7 +3,7 @@
+ namespace facter { namespace facts { namespace cache {
+ 
+     std::string fact_cache_location() {
+-        return "/opt/puppetlabs/facter/cache/cached_facts/";
++        return "/var/facter/cache/cached_facts/";
+     }
+ 
+ }}}  // namespace facter::facts::cache

Added: head/sysutils/facter/files/patch-lib_src_facts_posix_collection.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/facter/files/patch-lib_src_facts_posix_collection.cc	Mon Aug 21 18:47:52 2017	(r448483)
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- lib/src/facts/posix/collection.cc.orig
++++ lib/src/facts/posix/collection.cc
+@@ -29,6 +29,8 @@
+             directories.emplace_back("/opt/puppetlabs/facter/facts.d");
+             directories.emplace_back("/etc/facter/facts.d");
+             directories.emplace_back("/etc/puppetlabs/facter/facts.d");
++            directories.emplace_back("%%PREFIX%%/etc/facter/facts.d");
++            directories.emplace_back("%%PREFIX%%/etc/puppetlabs/facter/facts.d");
+         }
+         return directories;
+     }

Added: head/sysutils/facter/files/patch-lib_src_util_config_posix_config.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/facter/files/patch-lib_src_util_config_posix_config.cc	Mon Aug 21 18:47:52 2017	(r448483)
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- lib/src/util/config/posix/config.cc.orig
++++ lib/src/util/config/posix/config.cc
+@@ -7,6 +7,6 @@
+     }
+ 
+     std::string default_config_location() {
+-        return "/etc/puppetlabs/facter/facter.conf";
++        return "%%PREFIX%%/etc/facter/facter.conf";
+     }
+ }}}  // namespace facter::util::config

Modified: head/sysutils/facter/pkg-plist
==============================================================================
--- head/sysutils/facter/pkg-plist	Mon Aug 21 17:49:01 2017	(r448482)
+++ head/sysutils/facter/pkg-plist	Mon Aug 21 18:47:52 2017	(r448483)
@@ -1,4 +1,5 @@
 bin/facter
+include/facter/cwrapper.hpp
 include/facter/export.h
 include/facter/facts/array_value.hpp
 include/facter/facts/collection.hpp



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