Index: head/sysutils/puppet-devel/Makefile
===================================================================
--- head/sysutils/puppet-devel/Makefile	(revision 217909)
+++ head/sysutils/puppet-devel/Makefile	(revision 217910)
@@ -1,91 +1,89 @@
 # New ports collection makefile for:	rubygem-puppet
 # Date created:		2007-03-03
 # Whom:			Tomoyuki Sakurai <cherry@trombik.mine.nu>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	puppet
-PORTVERSION=	0.24.4
+PORTVERSION=	0.24.5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.reductivelabs.com/downloads/puppet/
 PKGNAMESUFFIX=	-devel
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	cherry@trombik.org
 COMMENT=	A configuration management framework written in Ruby
 
 BUILD_DEPENDS=	${RUBY_SITELIBDIR}/facter.rb:${PORTSDIR}/sysutils/facter \
 	portupgrade>0:${PORTSDIR}/ports-mgmt/portupgrade
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CONFLICTS=	puppet-[0-9]*
 
 NO_BUILD=	yes
 USE_RUBY=	yes
 USE_RC_SUBR=	puppetmasterd puppetd
 DOCS=	CHANGELOG README LICENSE COPYING
 PUPPET_USER:=	puppet
 PUPPET_GROUP:=	${PUPPET_USER}
 PUPPET_RUNDIR:=	/var/run/${PORTNAME}
 SUB_FILES+=	pkg-install pkg-message
 SUB_LIST+=	PUPPET_RUNDIR="${PUPPET_RUNDIR}" \
 			PUPPET_USER="${PUPPET_USER}" \
 			PUPPET_GROUP="${PUPPET_GROUP}"
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e "s|/etc/puppet|${PREFIX}/etc/puppet|" \
 		${WRKSRC}/lib/puppet/reference/configuration.rb
 	${REINPLACE_CMD} -e "s|/etc/puppet|${PREFIX}/etc/puppet|" \
 	${WRKSRC}/lib/puppet/defaults.rb
 
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
-	cd ${WRKSRC} && \
-		${SETENV} DSTDIR=${DSTDIR}/${PREFIX} \
-		${RUBY} ${WRKSRC}/install.rb --full
+	cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb
 	${INSTALL} -d ${DOCSDIR}
 .if !defined(NOPORTDOCS)
 .for FILE in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 .endfor
 	${INSTALL} -d ${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 .endif
 
 post-install:
 	${INSTALL} -d ${PREFIX}/etc/${PORTNAME}
 .for DIR in ssl manifests
 	${INSTALL} -d ${PREFIX}/etc/${PORTNAME}/${DIR}
 .endfor
 	${RUBY} -I ${RUBY_SITELIBDIR} ${PREFIX}/bin/puppetmasterd \
 		--confdir=${PREFIX}/etc/${PORTNAME} \
 		--rundir=${PUPPET_RUNDIR} \
 		--genconfig | \
 		${SED} -e 's/genconfig = true/# genconfig = false/' \
 		> ${PREFIX}/etc/${PORTNAME}/puppet.conf-dist
 	@${ECHO} ${RUBY_SITELIBDIR}/puppet.rb | \
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type f | \
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
 .if !defined(NOPORTDOCS)
 	@${FIND} ${EXAMPLESDIR} -type f | \
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${EXAMPLESDIR} -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 	@${FIND} ${DOCSDIR} -type f | \
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${DOCSDIR} -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 .endif
 	@${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/sysutils/puppet-devel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/sysutils/puppet-devel/distinfo
===================================================================
--- head/sysutils/puppet-devel/distinfo	(revision 217909)
+++ head/sysutils/puppet-devel/distinfo	(revision 217910)
@@ -1,3 +1,3 @@
-MD5 (puppet-0.24.4.tgz) = 9658624ed3745e8954772b3fbfdcc438
-SHA256 (puppet-0.24.4.tgz) = 0d54f6db7cf1210d123264bcb35b07b36837ebc12a4f2bd01aee6127836adfb9
-SIZE (puppet-0.24.4.tgz) = 652572
+MD5 (puppet-0.24.5.tgz) = 1160bb69966b9145d9f845f1f355dd44
+SHA256 (puppet-0.24.5.tgz) = 0b5ff82b06699a5d10b2ee6e995f427b76540cc0e67ffa8243ee6fc03d8e641d
+SIZE (puppet-0.24.5.tgz) = 872803

Property changes on: head/sysutils/puppet-devel/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/sysutils/puppet-devel/files/patch-install.rb
===================================================================
--- head/sysutils/puppet-devel/files/patch-install.rb	(nonexistent)
+++ head/sysutils/puppet-devel/files/patch-install.rb	(revision 217910)
@@ -0,0 +1,25 @@
+--- install.rb.orig	2008-07-24 08:03:04.000000000 +0900
++++ install.rb	2008-08-01 18:48:33.000000000 +0900
+@@ -98,11 +98,12 @@
+ end
+ 
+ def do_man(man, strip = 'man/')
++  return
+   man.each do |mf|
+     omf = File.join(InstallOptions.man_dir, mf.gsub(/#{strip}/, ''))
+     om = File.dirname(omf)
+     File.makedirs(om, true)
+-    File.chmod(0644, om)
++    File.chmod(0755, om)
+     File.install(mf, omf, 0644, true)
+     gzip = %x{which gzip}
+     gzip.chomp!
+@@ -223,7 +224,7 @@
+   else
+     bindir = Config::CONFIG['bindir']
+     sbindir = Config::CONFIG['sbindir']
+-    mandir = Config::CONFIG['mandir']
++    mandir = ENV['PREFIX'] + "/man"
+     tmpdirs << Config::CONFIG['bindir']
+   end
+ 

Property changes on: head/sysutils/puppet-devel/files/patch-install.rb
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property