From owner-svn-ports-head@FreeBSD.ORG Tue Jan 20 22:25:51 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D800112D; Tue, 20 Jan 2015 22:25:50 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B86166D0; Tue, 20 Jan 2015 22:25:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0KMPoDE071170; Tue, 20 Jan 2015 22:25:50 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0KMPov9071167; Tue, 20 Jan 2015 22:25:50 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201501202225.t0KMPov9071167@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Tue, 20 Jan 2015 22:25:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377547 - in head/www/calendarserver: . 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-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jan 2015 22:25:51 -0000 Author: marino Date: Tue Jan 20 22:25:49 2015 New Revision: 377547 URL: https://svnweb.freebsd.org/changeset/ports/377547 QAT: https://qat.redports.org/buildarchive/r377547/ Log: www/calendarserver: Fix issues with rc script The primary need for the patch is to fix errors with the RC script, but it also installs the examples and document by default as originally intended. PR: 196768 Submitted by: maintainer (Axel Rau) Modified: head/www/calendarserver/Makefile head/www/calendarserver/files/caldavd.in head/www/calendarserver/pkg-plist Modified: head/www/calendarserver/Makefile ============================================================================== --- head/www/calendarserver/Makefile Tue Jan 20 22:12:28 2015 (r377546) +++ head/www/calendarserver/Makefile Tue Jan 20 22:25:49 2015 (r377547) @@ -2,7 +2,7 @@ PORTNAME= calendarserver PORTVERSION= 5.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www python MASTER_SITES= LOCAL/wg PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -31,6 +31,8 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bas OPTIONS_DEFINE= EXAMPLES DOCS EXAMPLES_DESC= Install configuration examples DOCS_DESC= Install additional documentation +OPTIONS_DEFAULT= EXAMPLES DOCS +.include NEED_ROOT= yes USES= shebangfix pgsql:9.0+ python \ Modified: head/www/calendarserver/files/caldavd.in ============================================================================== --- head/www/calendarserver/files/caldavd.in Tue Jan 20 22:12:28 2015 (r377546) +++ head/www/calendarserver/files/caldavd.in Tue Jan 20 22:25:49 2015 (r377547) @@ -13,25 +13,29 @@ # Default is "/usr/local/etc/caldavd.conf". # caldavd_flags (string): Flags to pass to caldavd. # Default is empty. +# caldavd_pidfile (string): Set path to the pid file. +# Default is /var/db/caldavd/caldavd.pid # . /etc/rc.subr -: ${caldavd_enable="NO"} -: ${caldavd_conf="%%PREFIX%%/etc/caldavd/caldavd.plist"} - - name="caldavd" +rcvar=caldavd_enable -command="%%PREFIX%%/bin/caldavd" -command_args=" -f ${caldavd_conf} -R kqueue" +load_rc_config $name +: ${caldavd_enable:=no} +: ${caldavd_conf="%%PREFIX%%/etc/caldavd/caldavd.plist"} +: ${caldavd_pidfile="/var/run/${name}.pid"} pidfile="/var/db/${name}/${name}.pid" required_files="${caldavd_conf}" -procname="%%PYTHON_CMD%%" +procname="%%PYTHON_CMD%%" PATH=${PATH}:%%PREFIX%%/bin +command="%%PREFIX%%/bin/caldavd" +command_args=" -f ${caldavd_conf} -R kqueue" + start_precmd="install -d -o caldavd /var/db/caldavd/Data/Documents /var/db/caldavd/Documents && install -d /var/log/caldavd" run_rc_command "$1" Modified: head/www/calendarserver/pkg-plist ============================================================================== --- head/www/calendarserver/pkg-plist Tue Jan 20 22:12:28 2015 (r377546) +++ head/www/calendarserver/pkg-plist Tue Jan 20 22:25:49 2015 (r377547) @@ -119,3 +119,4 @@ man/man8/calendarserver_shell.8.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/servertoserver.dtd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sudoers.plist %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/accounts.xml +@dir etc/caldavd/auth