Date: Sat, 12 Aug 2017 14:14:13 +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: r447832 - in head/databases: . puppetdb3 puppetdb4 puppetdb5 puppetdb5/files Message-ID: <201708121414.v7CEEDw2009931@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: romain Date: Sat Aug 12 14:14:12 2017 New Revision: 447832 URL: https://svnweb.freebsd.org/changeset/ports/447832 Log: New port databases/puppetdb5 Copy databases/puppetdb4 to databases/puppetdb5 and update. While here: - Update/fix conflicts with databases/puppetdb[34]; - Remove broken indirect dependency in databases/puppetdb3 (no need to rebuild, so not bumping PORTREVISION). With hat: puppet Added: head/databases/puppetdb5/ - copied from r447831, head/databases/puppetdb4/ Modified: head/databases/Makefile head/databases/puppetdb3/Makefile head/databases/puppetdb4/Makefile head/databases/puppetdb5/Makefile head/databases/puppetdb5/distinfo head/databases/puppetdb5/files/patch-Makefile head/databases/puppetdb5/pkg-plist Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Sat Aug 12 13:53:05 2017 (r447831) +++ head/databases/Makefile Sat Aug 12 14:14:12 2017 (r447832) @@ -738,6 +738,7 @@ SUBDIR += puppetdb-terminus4 SUBDIR += puppetdb3 SUBDIR += puppetdb4 + SUBDIR += puppetdb5 SUBDIR += pure-sql3 SUBDIR += puredb SUBDIR += pxlib Modified: head/databases/puppetdb3/Makefile ============================================================================== --- head/databases/puppetdb3/Makefile Sat Aug 12 13:53:05 2017 (r447831) +++ head/databases/puppetdb3/Makefile Sat Aug 12 14:14:12 2017 (r447832) @@ -13,12 +13,11 @@ LICENSE= APACHE20 RUN_DEPENDS= bash:shells/bash \ puppet:sysutils/puppet4 -BUILD_DEPENDS= rubygem-facter>=0:sysutils/rubygem-facter \ - rubygem-rake>=0:devel/rubygem-rake +BUILD_DEPENDS= rubygem-rake>=0:devel/rubygem-rake USE_RC_SUBR= puppetdb -CONFLICTS_INSTALL= puppetdb-* puppetdb4-* +CONFLICTS_INSTALL= puppetdb4-* puppetdb5-* USE_JAVA= yes NO_BUILD= yes JAVA_VERSION= 1.7+ Modified: head/databases/puppetdb4/Makefile ============================================================================== --- head/databases/puppetdb4/Makefile Sat Aug 12 13:53:05 2017 (r447831) +++ head/databases/puppetdb4/Makefile Sat Aug 12 14:14:12 2017 (r447832) @@ -16,7 +16,7 @@ RUN_DEPENDS= bash:shells/bash \ USE_RC_SUBR= puppetdb -CONFLICTS_INSTALL= puppetdb-* puppetdb3-* +CONFLICTS_INSTALL= puppetdb3-* puppetdb5-* USES= shebangfix SHEBANG_FILES= ext/bin/puppetdb \ ext/cli/anonymize \ Modified: head/databases/puppetdb5/Makefile ============================================================================== --- head/databases/puppetdb4/Makefile Sat Aug 12 13:53:05 2017 (r447831) +++ head/databases/puppetdb5/Makefile Sat Aug 12 14:14:12 2017 (r447832) @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= puppetdb -PORTVERSION= 4.4.0 +PORTVERSION= 5.0.1 CATEGORIES= databases java MASTER_SITES= http://downloads.puppetlabs.com/puppetdb/ -PKGNAMESUFFIX= 4 +PKGNAMESUFFIX= 5 MAINTAINER= puppet@FreeBSD.org COMMENT= PuppetDB storeconfigs backend @@ -12,18 +12,16 @@ COMMENT= PuppetDB storeconfigs backend LICENSE= APACHE20 RUN_DEPENDS= bash:shells/bash \ - puppet:sysutils/puppet4 + puppet:sysutils/puppet5 USE_RC_SUBR= puppetdb -CONFLICTS_INSTALL= puppetdb-* puppetdb3-* +CONFLICTS_INSTALL= puppetdb3-* puppetdb4-* USES= shebangfix SHEBANG_FILES= ext/bin/puppetdb \ ext/cli/anonymize \ ext/cli/config-migration \ - ext/cli/export \ ext/cli/foreground \ - ext/cli/import \ ext/cli/ssl-setup \ ext/cli/start \ ext/cli/stop \ Modified: head/databases/puppetdb5/distinfo ============================================================================== --- head/databases/puppetdb4/distinfo Sat Aug 12 13:53:05 2017 (r447831) +++ head/databases/puppetdb5/distinfo Sat Aug 12 14:14:12 2017 (r447832) @@ -1,3 +1,3 @@ -TIMESTAMP = 1493780923 -SHA256 (puppetdb-4.4.0.tar.gz) = b9e656846981397a3eed64dff44a7171e6a01b7e8c76c877bd93267d96f50414 -SIZE (puppetdb-4.4.0.tar.gz) = 23629723 +TIMESTAMP = 1499445330 +SHA256 (puppetdb-5.0.1.tar.gz) = ac75c40c16ecfd14a64c3122811adcceaa2f32c1874e07c763ad0b1ec7338a27 +SIZE (puppetdb-5.0.1.tar.gz) = 24055687 Modified: head/databases/puppetdb5/files/patch-Makefile ============================================================================== --- head/databases/puppetdb4/files/patch-Makefile Sat Aug 12 13:53:05 2017 (r447831) +++ head/databases/puppetdb5/files/patch-Makefile Sat Aug 12 14:14:12 2017 (r447832) @@ -1,4 +1,4 @@ ---- Makefile.orig 2016-03-17 04:17:10 UTC +--- Makefile.orig +++ Makefile @@ -1,23 +1,23 @@ -prefix = /usr/local @@ -17,20 +17,20 @@ install -m 0774 ext/ezbake-functions.sh "$(DESTDIR)$(datadir)/puppetdb" install -m 0644 ext/ezbake.manifest "$(DESTDIR)$(datadir)/puppetdb" - install -d -m 0755 "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d" -- install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.xml" - install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/bootstrap.cfg" +- install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/config.ini" +- install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/database.ini" - install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/jetty.ini" - install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini" -- install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/database.ini" -- install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/config.ini" +- install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.xml" - install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/request-logging.xml" + install -d -m 0755 "$(DESTDIR)$(confdir)/puppetdb/conf.d" -+ install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.xml.sample" + install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetdb/bootstrap.cfg.sample" ++ install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/config.ini.sample" ++ install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/database.ini.sample" + install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/jetty.ini.sample" + install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.sample" -+ install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/database.ini.sample" -+ install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/config.ini.sample" ++ install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.xml.sample" + install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetdb/request-logging.xml.sample" install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli" install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli/apps" Modified: head/databases/puppetdb5/pkg-plist ============================================================================== --- head/databases/puppetdb4/pkg-plist Sat Aug 12 13:53:05 2017 (r447831) +++ head/databases/puppetdb5/pkg-plist Sat Aug 12 14:14:12 2017 (r447832) @@ -1,9 +1,7 @@ bin/puppetdb %%DATADIR%%/cli/apps/anonymize %%DATADIR%%/cli/apps/config-migration -%%DATADIR%%/cli/apps/export %%DATADIR%%/cli/apps/foreground -%%DATADIR%%/cli/apps/import %%DATADIR%%/cli/apps/ssl-setup %%DATADIR%%/cli/apps/start %%DATADIR%%/cli/apps/stop
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708121414.v7CEEDw2009931>