svn commit: r377547 - in head/www/calendarserver: . files
John Marino
marino at FreeBSD.org
Tue Jan 20 22:25:51 UTC 2015
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 <bsd.port.options.mk>
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
+ at dir etc/caldavd/auth
More information about the svn-ports-head
mailing list