summaryrefslogtreecommitdiff
path: root/sysutils/puppet/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/puppet/Makefile')
-rw-r--r--sysutils/puppet/Makefile13
1 files changed, 9 insertions, 4 deletions
diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile
index 3a5c91d2856e..89c9f86e4167 100644
--- a/sysutils/puppet/Makefile
+++ b/sysutils/puppet/Makefile
@@ -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 patches
.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 <bsd.port.pre.mk>
+# 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 \