From owner-svn-ports-head@FreeBSD.ORG Sat Feb 21 19:16:00 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DD7EB450; Sat, 21 Feb 2015 19:15:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C8219B73; Sat, 21 Feb 2015 19:15:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1LJFxeL018654; Sat, 21 Feb 2015 19:15:59 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1LJFwL5018650; Sat, 21 Feb 2015 19:15:58 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201502211915.t1LJFwL5018650@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sat, 21 Feb 2015 19:15:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379542 - head/sysutils/puppet X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Feb 2015 19:16:00 -0000 Author: swills Date: Sat Feb 21 19:15:58 2015 New Revision: 379542 URL: https://svnweb.freebsd.org/changeset/ports/379542 QAT: https://qat.redports.org/buildarchive/r379542/ Log: sysutils/puppet: Update to 3.7.4 While here, mark it broken with Ruby 2.2. PR: 197194 Submitted by: Rick Submitted by: Michael Moll Modified: head/sysutils/puppet/Makefile head/sysutils/puppet/distinfo head/sysutils/puppet/pkg-descr head/sysutils/puppet/pkg-plist Modified: head/sysutils/puppet/Makefile ============================================================================== --- head/sysutils/puppet/Makefile Sat Feb 21 19:06:11 2015 (r379541) +++ head/sysutils/puppet/Makefile Sat Feb 21 19:15:58 2015 (r379542) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= puppet -PORTVERSION= 3.6.2 -PORTREVISION= 2 +PORTVERSION= 3.7.4 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ @@ -44,12 +43,17 @@ PATCHES_DESC= Optional exclusive patche .if ! ${PORT_OPTIONS:MPACKAGE_ORIGIN} EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_root .else -BROKEN= PACKAGE_ROOT option patch is incompatable with PACKAGE_ORIGIN patch. +BROKEN= PACKAGE_ROOT option patch is incompatible with PACKAGE_ORIGIN patch. .endif .endif .include +# puppet 4.x should support ruby 2.2.x +.if ${RUBY_VER} >= 2.2 +BROKEN= Does not work with Ruby 2.2 +.endif + .if ${PORT_OPTIONS:MPACKAGE_ORIGIN} EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_origin RUN_DEPENDS+= rubygem-bzip2-ruby>=0:${PORTSDIR}/archivers/rubygem-bzip2-ruby @@ -75,10 +79,11 @@ do-install: @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} post-install: + ${MKDIR} ${STAGEDIR}${ETCDIR}/manifests ${MKDIR} ${STAGEDIR}${ETCDIR}/modules ${MKDIR} ${STAGEDIR}/var/puppet ${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist - ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet master --genconfig \ + ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \ --confdir=${ETCDIR} \ --rundir=/var/run/puppet \ --vardir=/var/puppet \ Modified: head/sysutils/puppet/distinfo ============================================================================== --- head/sysutils/puppet/distinfo Sat Feb 21 19:06:11 2015 (r379541) +++ head/sysutils/puppet/distinfo Sat Feb 21 19:15:58 2015 (r379542) @@ -1,2 +1,2 @@ -SHA256 (puppet-3.6.2.tar.gz) = 9114c63108c58e39db84937cb8f7e1add3dcbaa08fd730f631de6a7f64a3c360 -SIZE (puppet-3.6.2.tar.gz) = 2252186 +SHA256 (puppet-3.7.4.tar.gz) = 957c09ab253f76e624809766999da6d872f79b3a64b54b8c66bdd8907c291745 +SIZE (puppet-3.7.4.tar.gz) = 2600191 Modified: head/sysutils/puppet/pkg-descr ============================================================================== --- head/sysutils/puppet/pkg-descr Sat Feb 21 19:06:11 2015 (r379541) +++ head/sysutils/puppet/pkg-descr Sat Feb 21 19:15:58 2015 (r379542) @@ -4,4 +4,4 @@ elements normally aggregated in differen hosts, along with obviously discrete elements like packages, services, and files. -WWW: http://www.puppetlabs.com +WWW: https://puppetlabs.com/puppet/puppet-open-source Modified: head/sysutils/puppet/pkg-plist ============================================================================== --- head/sysutils/puppet/pkg-plist Sat Feb 21 19:06:11 2015 (r379541) +++ head/sysutils/puppet/pkg-plist Sat Feb 21 19:15:58 2015 (r379542) @@ -46,5 +46,7 @@ man/man8/puppet.8.gz %%RUBY_SITELIBDIR%%/puppetx.rb %%ETCDIR%%/puppet.conf-dist %%ETCDIR%%/auth.conf-dist +@dir(puppet,puppet,) %%ETCDIR%%/manifests +@dir(puppet,puppet,) %%ETCDIR%%/modules @(puppet,puppet,) www/puppet/config.ru @dir(puppet,puppet,) /var/puppet