Attachment 151691 Details for Bug 196768 – patch as svn diff (At revision 377098)

[patch] patch as svn diff (At revision 377098)

www_calendarserver-5.1_3.diff (text/plain), 2.59 KB, created by Axel.Rau on 2015-01-15 16:54:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Axel.Rau

Created: 2015-01-15 16:54:50 UTC

Size: 2.59 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 377098)
>+++ Makefile	(working copy)
>@@ -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 @@
> 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 \
>@@ -91,7 +93,7 @@
> 	@${REINPLACE_CMD} -e 's|/usr/share/caldavd/lib/python/txdav/common/datastore|${SHAREDIR}|' ${WRKSRC}/calendarserver/tools/bootstrapdatabase.py
> 	@${REINPLACE_CMD} -e 's|"_postgres"|"pgsql"|' ${WRKSRC}/calendarserver/tools/bootstrapdatabase.py
> 
>-post-install:
>+post-stage:
> 	@${MKDIR} ${STAGEDIR}${ETCDIR}/auth
> 	(cd ${WRKSRC}/bin && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/bin)
> 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>Index: files/caldavd.in
>===================================================================
>--- files/caldavd.in	(revision 377098)
>+++ files/caldavd.in	(working copy)
>@@ -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"
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 377098)
>+++ pkg-plist	(working copy)
>@@ -119,3 +119,4 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/servertoserver.dtd
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sudoers.plist
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/accounts.xml
>+@dir etc/caldavd/auth

Actions: View | Diff

Attachments on bug 196768: 151691