diff options
| author | swills <swills@FreeBSD.org> | 2014-01-16 01:01:38 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2014-01-16 01:01:38 +0800 |
| commit | 1d97b8cc5e1633906d9d113e2574069b5093e5cc (patch) | |
| tree | 098340a778d8d1d6b5b84df969e385113c6b6f85 /sysutils | |
| parent | 5ca3dc61f5cffe559d0e246e067266fa1fb2c3a3 (diff) | |
| download | freebsd-ports-gnome-1d97b8cc5e1633906d9d113e2574069b5093e5cc.tar.gz freebsd-ports-gnome-1d97b8cc5e1633906d9d113e2574069b5093e5cc.tar.zst freebsd-ports-gnome-1d97b8cc5e1633906d9d113e2574069b5093e5cc.zip | |
- 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@robakdesign.com> [1]
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/puppet/Makefile | 10 | ||||
| -rw-r--r-- | sysutils/puppet/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/puppet/files/patch-ext__rack__config.ru (renamed from sysutils/puppet/files/patch-ext__rack__files__config.ru) | 4 |
3 files changed, 7 insertions, 11 deletions
diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile index 1aca8c430752..511f4fbf4190 100644 --- a/sysutils/puppet/Makefile +++ b/sysutils/puppet/Makefile @@ -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 incompatable with PACKAGE_ORIGIN patch. .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 <bsd.port.post.mk> diff --git a/sysutils/puppet/distinfo b/sysutils/puppet/distinfo index be9543d49e6b..0037caf7f219 100644 --- a/sysutils/puppet/distinfo +++ b/sysutils/puppet/distinfo @@ -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 diff --git a/sysutils/puppet/files/patch-ext__rack__files__config.ru b/sysutils/puppet/files/patch-ext__rack__config.ru index 135f279ca1e5..505fac04bbe6 100644 --- a/sysutils/puppet/files/patch-ext__rack__files__config.ru +++ b/sysutils/puppet/files/patch-ext__rack__config.ru @@ -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 |