From owner-svn-ports-all@FreeBSD.ORG  Mon Mar 10 09:20:07 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 798331A6;
 Mon, 10 Mar 2014 09:20:07 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4EDB3B73;
 Mon, 10 Mar 2014 09:20:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2A9K7La055120;
 Mon, 10 Mar 2014 09:20:07 GMT (envelope-from decke@svn.freebsd.org)
Received: (from decke@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2A9K6WE055007;
 Mon, 10 Mar 2014 09:20:06 GMT (envelope-from decke@svn.freebsd.org)
Message-Id: <201403100920.s2A9K6WE055007@svn.freebsd.org>
From: Bernhard Froehlich <decke@FreeBSD.org>
Date: Mon, 10 Mar 2014 09:20:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r347727 - in head/print/cloudprint: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Mar 2014 09:20:07 -0000

Author: decke
Date: Mon Mar 10 09:20:06 2014
New Revision: 347727
URL: http://svnweb.freebsd.org/changeset/ports/347727
QAT: https://qat.redports.org/buildarchive/r347727/

Log:
  - Add rc startscript with support to run cloudprint as unprivileged user
  - Bump PORTREVISION

Added:
  head/print/cloudprint/files/
  head/print/cloudprint/files/cloudprint.in   (contents, props changed)
Modified:
  head/print/cloudprint/Makefile

Modified: head/print/cloudprint/Makefile
==============================================================================
--- head/print/cloudprint/Makefile	Mon Mar 10 09:17:29 2014	(r347726)
+++ head/print/cloudprint/Makefile	Mon Mar 10 09:20:06 2014	(r347727)
@@ -3,6 +3,7 @@
 
 PORTNAME=	cloudprint
 PORTVERSION=	0.11.20140215
+PORTREVISION=	1
 CATEGORIES=	print
 
 MAINTAINER=	decke@FreeBSD.org
@@ -10,7 +11,8 @@ COMMENT=	Google Cloud Print proxy for lo
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups \
+		${PYTHON_PKGNAMEPREFIX}daemon>0:${PORTSDIR}/devel/py-daemon
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	armooo
@@ -19,5 +21,13 @@ GH_COMMIT=	07e4711
 
 USE_PYTHON=	2
 USE_PYDISTUTILS=	yes
+USE_RC_SUBR=	${PORTNAME}
+
+USERS=		cups
+GROUPS=		cups
+
+SUB_LIST+=	PYTHON_CMD="${PYTHON_CMD}" \
+		CPUSER="${USERS}" \
+		CPGROUP="${GROUPS}"
 
 .include <bsd.port.mk>

Added: head/print/cloudprint/files/cloudprint.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/cloudprint/files/cloudprint.in	Mon Mar 10 09:20:06 2014	(r347727)
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: cloudprint
+# REQUIRE: LOGIN cupsd
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cloudprint
+#
+# cloudprint_enable (bool):	Set to "NO" by default.
+#				Set it to "YES" to enable cloudprint.
+# cloudprint_user (str):	User account to run with.
+# cloudprint_group (str):	Group to run with.
+# cloudprint_flags (str):	Custom flags for cloudprint.
+
+. /etc/rc.subr
+
+: ${cloudprint_enable="NO"}
+: ${cloudprint_user="%%CPUSER%%"}
+: ${cloudprint_group="%%CPGROUP%%"}
+
+name=cloudprint
+rcvar=cloudprint_enable
+piddir="/var/run/${name}"
+pidfile="${piddir}/${name}.pid"
+confdir="%%PREFIX%%/etc/cloudprint"
+command="%%PREFIX%%/bin/cloudprint"
+command_args="-d -p ${pidfile} -a ${confdir}/cloudprintauth"
+command_interpreter="%%PYTHON_CMD%%"
+sig_stop="QUIT"
+start_precmd="${name}_prestart"
+
+cloudprint_prestart()
+{
+	if [ ! -d "${piddir}" ]; then
+		/usr/bin/install -d -o ${cloudprint_user} -g ${cloudprint_group} -m 0755 ${piddir}
+	fi
+	if [ ! -d "${confdir}" ]; then
+		/usr/bin/install -d -o ${cloudprint_user} -g ${cloudprint_group} -m 0755 ${confdir}
+	fi
+}
+
+load_rc_config $name
+
+run_rc_command "$1"