svn commit: r339793 - in head/sysutils/puppet: . files
Steve Wills
swills at FreeBSD.org
Wed Jan 15 17:01:39 UTC 2014
Author: swills
Date: Wed Jan 15 17:01:38 2014
New Revision: 339793
URL: http://svnweb.freebsd.org/changeset/ports/339793
QAT: https://qat.redports.org/buildarchive/r339793/
Log:
- Update to 3.4.2 [1]
- Remove Ruby 1.9 conditional, as 1.8 is gone.
PR: ports/185549 [1]
Submitted by: Bartek Rutkowski <ports at robakdesign.com> [1]
Added:
head/sysutils/puppet/files/patch-ext__rack__config.ru
- copied, changed from r339618, head/sysutils/puppet/files/patch-ext__rack__files__config.ru
Deleted:
head/sysutils/puppet/files/patch-ext__rack__files__config.ru
Modified:
head/sysutils/puppet/Makefile
head/sysutils/puppet/distinfo
Modified: head/sysutils/puppet/Makefile
==============================================================================
--- head/sysutils/puppet/Makefile Wed Jan 15 16:44:14 2014 (r339792)
+++ head/sysutils/puppet/Makefile Wed Jan 15 17:01:38 2014 (r339793)
@@ -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}/, at 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 <bsd.port.post.mk>
Modified: head/sysutils/puppet/distinfo
==============================================================================
--- head/sysutils/puppet/distinfo Wed Jan 15 16:44:14 2014 (r339792)
+++ head/sysutils/puppet/distinfo Wed Jan 15 17:01:38 2014 (r339793)
@@ -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 and modified: head/sysutils/puppet/files/patch-ext__rack__config.ru (from r339618, head/sysutils/puppet/files/patch-ext__rack__files__config.ru)
==============================================================================
--- head/sysutils/puppet/files/patch-ext__rack__files__config.ru Mon Jan 13 18:21:51 2014 (r339618, copy source)
+++ head/sysutils/puppet/files/patch-ext__rack__config.ru Wed Jan 15 17:01:38 2014 (r339793)
@@ -1,5 +1,5 @@
---- ./ext/rack/files/config.ru.orig 2013-12-20 16:47:22.876896492 +0000
-+++ ./ext/rack/files/config.ru 2013-12-20 16:47:33.826895721 +0000
+--- ./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
More information about the svn-ports-all
mailing list