Attachment #117579 for bug #159670




#

PORTNAME=	puppet
DISTVERSION=	2.7.3rc1
CATEGORIES=	sysutils
MASTER_SITES=	http://downloads.puppetlabs.com/puppet/

MAINTAINER=	raj@csub.edu
COMMENT=	A configuration management framework written in Ruby

RUN_DEPENDS=	facter>=0:${PORTSDIR}/sysutils/facter \
		rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas
		${RUBY_ARCHLIBDIR}/iconv.so:${PORTSDIR}/converters/ruby-iconv

CONFLICTS=	puppet-devel-[0-9]*

NO_BUILD=	yes
USE_RUBY=	yes
USE_RUBY_FEATURES=	iconv
USE_RC_SUBR=	puppet puppetmaster
PORTDOCS=	CHANGELOG LICENSE README.md
PORTEXAMPLES=	*
PUPPET_USER:=	puppet
PUPPET_GROUP:=	${PUPPET_USER}

MANCOMPRESSED=	yes
MAN5=	puppet.conf.5
MAN8=	filebucket.8 pi.8 puppet.8 puppetca.8 puppetd.8 \
	puppetdoc.8 puppetmasterd.8 puppetrun.8 ralsh.8 puppetqd.8 \
	puppet-agent.8 puppet-apply.8 puppet-catalog.8 puppet-cert.8 \
	puppet-certificate.8 puppet-certificate_request.8 \
	puppet-certificate_revocation_list.8 puppet-config.8 \
	puppet-describe.8 puppet-device.8 puppet-doc.8 puppet-facts.8 \
	puppet-file.8 puppet-filebucket.8 puppet-help.8 puppet-inspect.8 \
	puppet-key.8 puppet-kick.8 puppet-man.8 puppet-master.8 \
	puppet-node.8 puppet-parser.8 puppet-plugin.8 puppet-queue.8 \
	puppet-report.8 puppet-resource.8 puppet-resource_type.8 \
	puppet-secret_agent.8 puppet-status.8

OPTIONS=	MONGREL		"Run puppet server as a mongrel service"	Off \
		PACKAGE_ORIGIN	"Use port origin as package name"		On


.if defined(WITH_PACKAGE_ORIGIN)
EXTRA_PATCHES+=	${FILESDIR}/optpatch-package_origin
RUN_DEPENDS+=	rubygem-bzip2>=0:${PORTSDIR}/archivers/rubygem-bzip2
.endif

.include <bsd.port.pre.mk>

		> ${ETCDIR}/puppet.conf-dist
	@${ECHO} ${RUBY_SITELIBDIR}/puppet.rb | \
		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
	@${ECHO} ${RUBY_SITELIBDIR}/semver.rb | \
		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
	@${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type f | \
		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
	@${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \

Lines 1-2 Link Here

(-)puppet/distinfo (-2 / +2 lines)
1	SHA256 (puppet-2.6.7.tar.gz) = 90c0741f66d15716cfd76f0b8cd15f5b867056f0180ba160ce868350c6dd4ddc	1	SHA256 (puppet-2.7.3rc1.tar.gz) = c1d0a08114f94b727b33d18cec60232ae7b48f107fd23495706e0444c5377036
2	SIZE (puppet-2.6.7.tar.gz) = 1530756	2	SIZE (puppet-2.7.3rc1.tar.gz) = 1710547

Lines 1-5 Link Here

(-)puppet/files/optpatch-package_origin (-3 / +3 lines)
1	diff --git lib/puppet/provider/package/freebsd.rb lib/puppet/provider/package/freebsd.rb	1	diff --git lib/puppet/provider/package/freebsd.rb lib/puppet/provider/package/freebsd.rb
2	index e10a20b..f36e29e 100755	2	index e10a20b..7f50e10 100755
3	--- lib/puppet/provider/package/freebsd.rb	3	--- lib/puppet/provider/package/freebsd.rb
4	+++ lib/puppet/provider/package/freebsd.rb	4	+++ lib/puppet/provider/package/freebsd.rb
5	@@ -1,37 +1,165 @@	5	@@ -1,37 +1,165 @@
Lines 11-17 index e10a20b..f36e29e 100755 Link Here
11	- libraries."	11	- libraries."
12	+require 'open-uri'	12	+require 'open-uri'
13	+require 'net/ftp'	13	+require 'net/ftp'
14	+require 'bz2'	14	+require 'bzip2'
15		15
16	- commands :pkginfo => "/usr/sbin/pkg_info",	16	- commands :pkginfo => "/usr/sbin/pkg_info",
17	- :pkgadd => "/usr/sbin/pkg_add",	17	- :pkgadd => "/usr/sbin/pkg_add",
Lines 99-105 index e10a20b..f36e29e 100755 Link Here
99	+ Puppet.debug "Fetching INDEX: #{uri.inspect}"	99	+ Puppet.debug "Fetching INDEX: #{uri.inspect}"
100	+ begin	100	+ begin
101	+ open(uri, "r") do \|f\|	101	+ open(uri, "r") do \|f\|
102	+ BZ2::Reader.open(f.path) do \|f\|	102	+ Bzip2::Reader.open(f.path) do \|f\|
103	+ while (line = f.gets)	103	+ while (line = f.gets)
104	+ fields = line.split("\|")	104	+ fields = line.split("\|")
105	+ pkg_info = self.class.parse_pkg_string(fields[0])	105	+ pkg_info = self.class.parse_pkg_string(fields[0])

Return to bug 159670

Lines 6-28 Link Here

(-)puppet/Makefile (-8 / +19 lines)
6	#	6	#
7		7
8	PORTNAME= puppet	8	PORTNAME= puppet
9	PORTVERSION= 2.6.7	9	DISTVERSION= 2.7.3rc1
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= http://www.puppetlabs.com/downloads/puppet/	11	MASTER_SITES= http://downloads.puppetlabs.com/puppet/
12		12
13	MAINTAINER= raj@csub.edu	13	MAINTAINER= raj@csub.edu
14	COMMENT= A configuration management framework written in Ruby	14	COMMENT= A configuration management framework written in Ruby
15		15
16	RUN_DEPENDS= ${RUBY_SITELIBDIR}/facter.rb:${PORTSDIR}/sysutils/facter \	16	RUN_DEPENDS= facter>=0:${PORTSDIR}/sysutils/facter \
17	rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas \	17	rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas
18	${RUBY_ARCHLIBDIR}/iconv.so:${PORTSDIR}/converters/ruby-iconv
19		18
20	CONFLICTS= puppet-devel-[0-9]*	19	CONFLICTS= puppet-devel-[0-9]*
21		20
22	NO_BUILD= yes	21	NO_BUILD= yes
23	USE_RUBY= yes	22	USE_RUBY= yes
		23	USE_RUBY_FEATURES= iconv
24	USE_RC_SUBR= puppet puppetmaster	24	USE_RC_SUBR= puppet puppetmaster
25	PORTDOCS= CHANGELOG README LICENSE COPYING	25	PORTDOCS= CHANGELOG LICENSE README.md
26	PORTEXAMPLES= *	26	PORTEXAMPLES= *
27	PUPPET_USER:= puppet	27	PUPPET_USER:= puppet
28	PUPPET_GROUP:= ${PUPPET_USER}	28	PUPPET_GROUP:= ${PUPPET_USER}
Lines 37-43 SUB_LIST+= PUPPET_USER="${PUPPET_USER}" \ Link Here
37	MANCOMPRESSED= yes	37	MANCOMPRESSED= yes
38	MAN5= puppet.conf.5	38	MAN5= puppet.conf.5
39	MAN8= filebucket.8 pi.8 puppet.8 puppetca.8 puppetd.8 \	39	MAN8= filebucket.8 pi.8 puppet.8 puppetca.8 puppetd.8 \
40	puppetdoc.8 puppetmasterd.8 puppetrun.8 ralsh.8 puppetqd.8	40	puppetdoc.8 puppetmasterd.8 puppetrun.8 ralsh.8 puppetqd.8 \
		41	puppet-agent.8 puppet-apply.8 puppet-catalog.8 puppet-cert.8 \
		42	puppet-certificate.8 puppet-certificate_request.8 \
		43	puppet-certificate_revocation_list.8 puppet-config.8 \
		44	puppet-describe.8 puppet-device.8 puppet-doc.8 puppet-facts.8 \
		45	puppet-file.8 puppet-filebucket.8 puppet-help.8 puppet-inspect.8 \
		46	puppet-key.8 puppet-kick.8 puppet-man.8 puppet-master.8 \
		47	puppet-node.8 puppet-parser.8 puppet-plugin.8 puppet-queue.8 \
		48	puppet-report.8 puppet-resource.8 puppet-resource_type.8 \
		49	puppet-secret_agent.8 puppet-status.8
41		50
42	OPTIONS= MONGREL "Run puppet server as a mongrel service" Off \	51	OPTIONS= MONGREL "Run puppet server as a mongrel service" Off \
43	PACKAGE_ORIGIN "Use port origin as package name" On	52	PACKAGE_ORIGIN "Use port origin as package name" On
Lines 50-56 RUN_DEPENDS+= rubygem-mongrel>=0:${PORTSDIR}/www/rubygem-mongrel Link Here
50		59
51	.if defined(WITH_PACKAGE_ORIGIN)	60	.if defined(WITH_PACKAGE_ORIGIN)
52	EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_origin	61	EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_origin
53	RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bz2.so:${PORTSDIR}/archivers/ruby-bz2	62	RUN_DEPENDS+= rubygem-bzip2>=0:${PORTSDIR}/archivers/rubygem-bzip2
54	.endif	63	.endif
55		64
56	.include <bsd.port.pre.mk>	65	.include <bsd.port.pre.mk>
Lines 86-91 post-install: Link Here
86	> ${ETCDIR}/puppet.conf-dist	95	> ${ETCDIR}/puppet.conf-dist
87	@${ECHO} ${RUBY_SITELIBDIR}/puppet.rb \| \	96	@${ECHO} ${RUBY_SITELIBDIR}/puppet.rb \| \
88	${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}	97	${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
		98	@${ECHO} ${RUBY_SITELIBDIR}/semver.rb \| \
		99	${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
89	@${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type f \| \	100	@${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type f \| \
90	${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}	101	${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
91	@${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type d \| ${SORT} -r \| \	102	@${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type d \| ${SORT} -r \| \