From owner-svn-ports-all@FreeBSD.ORG Thu Jan 16 17:36:29 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D7E2A669; Thu, 16 Jan 2014 17:36:29 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C2B261394; Thu, 16 Jan 2014 17:36:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GHaTop013286; Thu, 16 Jan 2014 17:36:29 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GHaTjI013283; Thu, 16 Jan 2014 17:36:29 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201401161736.s0GHaTjI013283@svn.freebsd.org> From: Steve Wills Date: Thu, 16 Jan 2014 17:36:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339944 - in branches/2014Q1/sysutils/puppet: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 17:36:29 -0000 Author: swills Date: Thu Jan 16 17:36:28 2014 New Revision: 339944 URL: http://svnweb.freebsd.org/changeset/ports/339944 QAT: https://qat.redports.org/buildarchive/r339944/ Log: MFH: r339793 - Update to 3.4.2 [1] - Remove Ruby 1.9 conditional, as 1.8 is gone. PR: ports/185549 [1] Submitted by: Bartek Rutkowski [1] Approved by: portmgr (implicit) Added: branches/2014Q1/sysutils/puppet/files/patch-ext__rack__config.ru - copied unchanged from r339793, head/sysutils/puppet/files/patch-ext__rack__config.ru Deleted: branches/2014Q1/sysutils/puppet/files/patch-ext__rack__files__config.ru Modified: branches/2014Q1/sysutils/puppet/Makefile branches/2014Q1/sysutils/puppet/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/sysutils/puppet/Makefile ============================================================================== --- branches/2014Q1/sysutils/puppet/Makefile Thu Jan 16 17:34:03 2014 (r339943) +++ branches/2014Q1/sysutils/puppet/Makefile Thu Jan 16 17:36:28 2014 (r339944) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= puppet -PORTVERSION= 3.3.1 -PORTREVISION= 6 +PORTVERSION= 3.4.2 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ @@ -50,10 +49,8 @@ BROKEN= PACKAGE_ROOT option patch is inc .if ${PORT_OPTIONS:MPACKAGE_ORIGIN} EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_origin -.if ${RUBY_VER} == 1.9 RUN_DEPENDS+= rubygem-bzip2>=0:${PORTSDIR}/archivers/rubygem-bzip2 .endif -.endif post-patch: @${REINPLACE_CMD} -e "s|/etc/puppet|${ETCDIR}|" \ @@ -69,7 +66,7 @@ post-patch: @${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \ ${WRKSRC}/lib/puppet/defaults.rb @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \ - ${WRKSRC}/ext/rack/files/config.ru + ${WRKSRC}/ext/rack/config.ru do-install: @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} @@ -93,11 +90,10 @@ post-install: @${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} @${MKDIR} ${STAGEDIR}${WWWDIR}/public - ${INSTALL_DATA} ${WRKSRC}/ext/rack/files/config.ru ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} ${WRKSRC}/ext/rack/config.ru ${STAGEDIR}${WWWDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/ext/rack/files/apache2.conf ${STAGEDIR}${EXAMPLESDIR} .include Modified: branches/2014Q1/sysutils/puppet/distinfo ============================================================================== --- branches/2014Q1/sysutils/puppet/distinfo Thu Jan 16 17:34:03 2014 (r339943) +++ branches/2014Q1/sysutils/puppet/distinfo Thu Jan 16 17:36:28 2014 (r339944) @@ -1,2 +1,2 @@ -SHA256 (puppet-3.3.1.tar.gz) = 152f9eaa6767c5f6cbd52befff891bd54e074d2f6487a649373da0113c09e284 -SIZE (puppet-3.3.1.tar.gz) = 1896023 +SHA256 (puppet-3.4.2.tar.gz) = 40ad847e7f8f7a2eb2b968280dcc60427de6770710bbdd289b8bd7d1ced69210 +SIZE (puppet-3.4.2.tar.gz) = 1951200 Copied: branches/2014Q1/sysutils/puppet/files/patch-ext__rack__config.ru (from r339793, head/sysutils/puppet/files/patch-ext__rack__config.ru) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/sysutils/puppet/files/patch-ext__rack__config.ru Thu Jan 16 17:36:28 2014 (r339944, copy of r339793, head/sysutils/puppet/files/patch-ext__rack__config.ru) @@ -0,0 +1,13 @@ +--- ./ext/rack/config.ru.orig 2013-12-20 16:47:22.876896492 +0000 ++++ ./ext/rack/config.ru 2013-12-20 16:47:33.826895721 +0000 +@@ -14,8 +14,8 @@ + # Rack applications typically don't start as root. Set --confdir and --vardir + # to prevent reading configuration from ~puppet/.puppet/puppet.conf and writing + # to ~puppet/.puppet +-ARGV << "--confdir" << "/etc/puppet" +-ARGV << "--vardir" << "/var/lib/puppet" ++ARGV << "--confdir" << "%%PREFIX%%/etc/puppet" ++ARGV << "--vardir" << "/var/puppet" + + # NOTE: it's unfortunate that we have to use the "CommandLine" class + # here to launch the app, but it contains some initialization logic