From 24c65f886d242efa7e46b07cd69651e1235cfe4a Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sun, 20 Mar 2011 15:46:34 +0000
Subject: [PATCH] Add rc scripts for puppetd and puppetmasterd. Set GPL version
 while here.

ok robert@ (maintainer)
---
 sysutils/ruby-puppet/Makefile             |  6 ++++--
 sysutils/ruby-puppet/pkg/PLIST            |  7 ++++++-
 sysutils/ruby-puppet/pkg/puppetd.rc       | 12 ++++++++++++
 sysutils/ruby-puppet/pkg/puppetmasterd.rc | 12 ++++++++++++
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 sysutils/ruby-puppet/pkg/puppetd.rc
 create mode 100644 sysutils/ruby-puppet/pkg/puppetmasterd.rc

diff --git a/sysutils/ruby-puppet/Makefile b/sysutils/ruby-puppet/Makefile
index 8f4dd0733e3..7d0340992a3 100644
--- a/sysutils/ruby-puppet/Makefile
+++ b/sysutils/ruby-puppet/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2011/03/09 10:31:52 robert Exp $
+# $OpenBSD: Makefile,v 1.30 2011/03/20 15:46:34 ajacoutot Exp $
 
 COMMENT=	centralised configuration management for networks
 
@@ -7,12 +7,14 @@ DISTNAME=	puppet-${VERSION}
 PKGNAME=	ruby-${DISTNAME}
 CATEGORIES=	sysutils net
 
+REVISION=	0
+
 HOMEPAGE=	http://reductivelabs.com/projects/puppet/
 MASTER_SITES=	http://reductivelabs.com/downloads/puppet/
 
 MAINTAINER=	Robert Nagy <robert@openbsd.org>
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/sysutils/ruby-puppet/pkg/PLIST b/sysutils/ruby-puppet/pkg/PLIST
index 79a09cf38fe..66e9a1e1b62 100644
--- a/sysutils/ruby-puppet/pkg/PLIST
+++ b/sysutils/ruby-puppet/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.12 2011/03/09 10:31:52 robert Exp $
+@comment $OpenBSD: PLIST,v 1.13 2011/03/20 15:46:34 ajacoutot Exp $
 @newgroup _puppet:580
 @newuser _puppet:580:580:daemon:Puppet user:/var/empty:/sbin/nologin
 bin/filebucket
@@ -693,3 +693,8 @@ ${MODRUBY_RELEXAMPLEDIR}/puppet/tagmail.conf
 @sample /var/puppet/reports/
 @extraunexec rm -rf ${SYSCONFDIR}/puppet/
 @extraunexec rm -rf /var/puppet/
+@mode
+@owner
+@group
+@rcscript ${RCDIR}/puppetd
+@rcscript ${RCDIR}/puppetmasterd
diff --git a/sysutils/ruby-puppet/pkg/puppetd.rc b/sysutils/ruby-puppet/pkg/puppetd.rc
new file mode 100644
index 00000000000..2c1ffab3d62
--- /dev/null
+++ b/sysutils/ruby-puppet/pkg/puppetd.rc
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# $OpenBSD: puppetd.rc,v 1.1 2011/03/20 15:46:34 ajacoutot Exp $
+
+daemon="${TRUEPREFIX}/sbin/puppetd"
+
+. /etc/rc.d/rc.subr
+
+pexp=".*ruby.* ${daemon}${daemon_flags:+ ${daemon_flags}}"
+rc_reload=NO
+
+rc_cmd $1
diff --git a/sysutils/ruby-puppet/pkg/puppetmasterd.rc b/sysutils/ruby-puppet/pkg/puppetmasterd.rc
new file mode 100644
index 00000000000..4ba49d6184b
--- /dev/null
+++ b/sysutils/ruby-puppet/pkg/puppetmasterd.rc
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# $OpenBSD: puppetmasterd.rc,v 1.1 2011/03/20 15:46:34 ajacoutot Exp $
+
+daemon="${TRUEPREFIX}/sbin/puppetmasterd"
+
+. /etc/rc.d/rc.subr
+
+pexp=".*ruby.* ${daemon}${daemon_flags:+ ${daemon_flags}}"
+rc_reload=NO
+
+rc_cmd $1