Attachment #114900 for bug #156629

View | Details | Raw Unified | Return to bug 156629
Collapse All | Expand All




	puppetdoc.8 puppetmasterd.8 puppetrun.8 ralsh.8 puppetqd.8

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

.include <bsd.port.options.mk>


RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bz2.so:${PORTSDIR}/archivers/ruby-bz2
.endif

.if defined(WITH_PACKAGE_ROOT)
.if !defined(WITH_PACKAGE_ORIGIN)
EXTRA_PATCHES+=	${FILESDIR}/optpatch-package_root
.else
BROKEN=	"PACKAGE_ROOT option patch is incompatable with PACKAGE_ORIGIN patch."
.endif
.endif

.include <bsd.port.pre.mk>

post-patch:

Added Link Here

(-)/local-project/jails/wiki/usr/ports/sysutils/puppet/files/optpatch-package_root (+11 lines)
1	--- lib/puppet/provider/package/freebsd.rb-orig 2011-04-21 19:36:17.000000000 -0500
2	+++ lib/puppet/provider/package/freebsd.rb 2011-04-21 20:09:50.000000000 -0500
3	@@ -20,7 +20,7 @@
4
5	if @resource[:source] =~ /\/$/
6	if @resource[:source] =~ /^(ftp\|https?):/
7	- Puppet::Util::Execution::withenv :PACKAGESITE => @resource[:source] do
8	+ Puppet::Util::Execution::withenv :PACKAGEROOT => @resource[:source] do
9	pkgadd "-r", @resource[:name]
10	end
11	else

Return to bug 156629

Lines 40-46 Link Here

(-)sysutils/puppet/Makefile (-1 / +10 lines)
40	puppetdoc.8 puppetmasterd.8 puppetrun.8 ralsh.8 puppetqd.8	40	puppetdoc.8 puppetmasterd.8 puppetrun.8 ralsh.8 puppetqd.8
41		41
42	OPTIONS= MONGREL "Run puppet server as a mongrel service" Off \	42	OPTIONS= MONGREL "Run puppet server as a mongrel service" Off \
43	PACKAGE_ORIGIN "Use port origin as package name" On	43	PACKAGE_ORIGIN "Use port origin as package name" On \
		44	PACKAGE_ROOT "Use PACKAGEROOT insted of PACKAGESITE" Off
44		45
45	.include <bsd.port.options.mk>	46	.include <bsd.port.options.mk>
46		47
Lines 53-58 Link Here
53	RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bz2.so:${PORTSDIR}/archivers/ruby-bz2	54	RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bz2.so:${PORTSDIR}/archivers/ruby-bz2
54	.endif	55	.endif
55		56
		57	.if defined(WITH_PACKAGE_ROOT)
		58	.if !defined(WITH_PACKAGE_ORIGIN)
		59	EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_root
		60	.else
		61	BROKEN= "PACKAGE_ROOT option patch is incompatable with PACKAGE_ORIGIN patch."
		62	.endif
		63	.endif
		64
56	.include <bsd.port.pre.mk>	65	.include <bsd.port.pre.mk>
57		66
58	post-patch:	67	post-patch: