Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Aug 2017 14:19:04 +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: r447833 - in head/databases: . puppetdb-terminus3 puppetdb-terminus4 puppetdb-terminus5 puppetdb-terminus5/files
Message-ID:  <201708121419.v7CEJ4mH010289@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: romain
Date: Sat Aug 12 14:19:04 2017
New Revision: 447833
URL: https://svnweb.freebsd.org/changeset/ports/447833

Log:
  New port databases/puppetdb-terminus5
  
  Copy databases/puppetdb-terminus4 to databases/puppetdb-terminus5 and update.
  
  While here, update/Fix conflicts with databases/puppetdb-terminus[34].

Added:
  head/databases/puppetdb-terminus5/
     - copied from r447832, head/databases/puppetdb-terminus4/
Modified:
  head/databases/Makefile
  head/databases/puppetdb-terminus3/Makefile
  head/databases/puppetdb-terminus4/Makefile
  head/databases/puppetdb-terminus5/Makefile
  head/databases/puppetdb-terminus5/distinfo
  head/databases/puppetdb-terminus5/files/patch-Makefile

Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile	Sat Aug 12 14:14:12 2017	(r447832)
+++ head/databases/Makefile	Sat Aug 12 14:19:04 2017	(r447833)
@@ -736,6 +736,7 @@
     SUBDIR += proftpd-mod_sql_tds
     SUBDIR += puppetdb-terminus3
     SUBDIR += puppetdb-terminus4
+    SUBDIR += puppetdb-terminus5
     SUBDIR += puppetdb3
     SUBDIR += puppetdb4
     SUBDIR += puppetdb5

Modified: head/databases/puppetdb-terminus3/Makefile
==============================================================================
--- head/databases/puppetdb-terminus3/Makefile	Sat Aug 12 14:14:12 2017	(r447832)
+++ head/databases/puppetdb-terminus3/Makefile	Sat Aug 12 14:19:04 2017	(r447833)
@@ -13,7 +13,7 @@ LICENSE=	APACHE20
 
 BUILD_DEPENDS=	puppet:sysutils/puppet4
 
-CONFLICTS_INSTALL=	puppetdb-terminus-* puppetdb-terminus4-*
+CONFLICTS_INSTALL=	puppetdb-terminus4-* puppetdb-terminus5-*
 USE_RUBY=	yes
 NO_BUILD=	yes
 

Modified: head/databases/puppetdb-terminus4/Makefile
==============================================================================
--- head/databases/puppetdb-terminus4/Makefile	Sat Aug 12 14:14:12 2017	(r447832)
+++ head/databases/puppetdb-terminus4/Makefile	Sat Aug 12 14:19:04 2017	(r447833)
@@ -14,7 +14,7 @@ LICENSE=	APACHE20
 
 BUILD_DEPENDS=	puppet4>=0:sysutils/puppet4
 
-CONFLICTS_INSTALL=	puppetdb-terminus-* puppetdb-terminus3-*
+CONFLICTS_INSTALL=	puppetdb-terminus3-* puppetdb-terminus5-*
 USE_RUBY=	yes
 NO_BUILD=	yes
 USES=		gmake

Modified: head/databases/puppetdb-terminus5/Makefile
==============================================================================
--- head/databases/puppetdb-terminus4/Makefile	Sat Aug 12 14:14:12 2017	(r447832)
+++ head/databases/puppetdb-terminus5/Makefile	Sat Aug 12 14:19:04 2017	(r447833)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	puppetdb-terminus
-PORTVERSION=	4.4.0
+PORTVERSION=	5.0.1
 CATEGORIES=	databases ruby
 MASTER_SITES=	http://downloads.puppetlabs.com/puppetdb/
-PKGNAMESUFFIX=	4
+PKGNAMESUFFIX=	5
 DISTNAME=	puppetdb-${PORTVERSION}
 
 MAINTAINER=	puppet@FreeBSD.org
@@ -12,9 +12,9 @@ COMMENT=	PuppetDB storeconfigs backend terminus module
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	puppet4>=0:sysutils/puppet4
+BUILD_DEPENDS=	puppet5>=0:sysutils/puppet5
 
-CONFLICTS_INSTALL=	puppetdb-terminus-* puppetdb-terminus3-*
+CONFLICTS_INSTALL=	puppetdb-terminus3-* puppetdb-terminus4-*
 USE_RUBY=	yes
 NO_BUILD=	yes
 USES=		gmake

Modified: head/databases/puppetdb-terminus5/distinfo
==============================================================================
--- head/databases/puppetdb-terminus4/distinfo	Sat Aug 12 14:14:12 2017	(r447832)
+++ head/databases/puppetdb-terminus5/distinfo	Sat Aug 12 14:19:04 2017	(r447833)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493775596
-SHA256 (puppetdb-4.4.0.tar.gz) = b9e656846981397a3eed64dff44a7171e6a01b7e8c76c877bd93267d96f50414
-SIZE (puppetdb-4.4.0.tar.gz) = 23629723
+TIMESTAMP = 1499445452
+SHA256 (puppetdb-5.0.1.tar.gz) = ac75c40c16ecfd14a64c3122811adcceaa2f32c1874e07c763ad0b1ec7338a27
+SIZE (puppetdb-5.0.1.tar.gz) = 24055687

Modified: head/databases/puppetdb-terminus5/files/patch-Makefile
==============================================================================
--- head/databases/puppetdb-terminus4/files/patch-Makefile	Sat Aug 12 14:14:12 2017	(r447832)
+++ head/databases/puppetdb-terminus5/files/patch-Makefile	Sat Aug 12 14:19:04 2017	(r447833)
@@ -1,4 +1,4 @@
---- Makefile.orig	2016-03-17 04:17:10 UTC
+--- Makefile.orig
 +++ Makefile
 @@ -1,7 +1,7 @@
  prefix = /usr/local
@@ -9,54 +9,54 @@
  rundir = /var/run
  bindir = /usr/bin
  
-@@ -33,22 +33,34 @@ install-puppetdb:
+@@ -34,22 +34,34 @@
  
  
  install-puppetdb-termini:
--	install -Dm 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
--	install -Dm 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
--	install -Dm 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
+-	install -Dm 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
+-	install -Dm 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
+-	install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
 -	install -Dm 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
+-	install -Dm 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
+-	install -Dm 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
+-	install -Dm 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
 -	install -Dm 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
+-	install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
+-	install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
+-	install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
+-	install -Dm 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
 -	install -Dm 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
 -	install -Dm 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
 -	install -Dm 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
 -	install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
--	install -Dm 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
--	install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
--	install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
--	install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
--	install -Dm 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
--	install -Dm 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
--	install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/node"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/node"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
-+	install -m 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
-+	install -m 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
-+	install -m 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
++	install -m 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
++	install -m 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
++	install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
 +	install -m 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
++	install -m 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
++	install -m 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
++	install -m 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
 +	install -m 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
++	install -m 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
++	install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
++	install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
++	install -m 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
 +	install -m 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
 +	install -m 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
 +	install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
 +	install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
-+	install -m 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
-+	install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
-+	install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
-+	install -m 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
-+	install -m 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
-+	install -m 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
-+	install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
  
  install-rpm-sysv-init: install-rpm-preinst
  	install -d -m 0755 "$(DESTDIR)$(initdir)"



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