Index: head/www/calendarserver/Makefile
===================================================================
--- head/www/calendarserver/Makefile	(revision 420456)
+++ head/www/calendarserver/Makefile	(revision 420457)
@@ -1,87 +1,100 @@
 # $FreeBSD$
 
 PORTNAME=	calendarserver
 PORTVERSION=	8.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://www.lechner-rau.de/downloads/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	CalendarServer-${PORTVERSION}
 
 MAINTAINER=	axel.rau@chaos1.de
 COMMENT=	Calendar and Contacts Server from Apple (RFC 4791, RFC 6352)
 
 LICENSE=	APACHE20
 
 FETCH_DEPENDS=	svn:devel/subversion
 BUILD_DEPENDS=	${FETCH_DEPENDS}
 RUN_DEPENDS=	memcached:databases/memcached \
 		${PYTHON_PKGNAMEPREFIX}calendar>=0.15423:devel/py-calendar \
 		${PYTHON_PKGNAMEPREFIX}PyGreSQL>=4.1:databases/py-PyGreSQL \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.2:devel/py-dateutil \
 		${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl \
 		${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.2:databases/py-pg8000 \
 		${PYTHON_PKGNAMEPREFIX}psutil>=3.4.2:sysutils/py-psutil \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2016.1:devel/py-pytz \
 		${PYTHON_PKGNAMEPREFIX}service_identity>=14.0.0:security/py-service_identity \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.9:devel/py-setproctitle \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1:databases/py-sqlparse \
 		${PYTHON_PKGNAMEPREFIX}twext>=0.15423:devel/py-twext \
 		${PYTHON_PKGNAMEPREFIX}twisted>=15.4.0:devel/py-twisted \
 		${PYTHON_PKGNAMEPREFIX}xattr>=0.7.5:devel/py-xattr \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.3:devel/py-zope.interface
 
 USES=	pgsql:9.1+ python:2.7
 USE_PYTHON=	autoplist distutils
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	USER=${USERS}
 
 USE_RC_SUBR=	caldavd
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 
 SVN_REPOSITORY_URL=	http://svn.calendarserver.org/repository/calendarserver
 SVN_TAG1=	CalendarServer/tags/release/${DISTNAME}
 SVN_CMD1=	svn export
 
-LOGDIR=		/var/log/caldavd
+ETCDIR=		${PREFIX}/etc/caldavd
 SHAREDIR=	${PREFIX}/share/caldavd
+DBDIR=		/var/db/caldavd
+LOGDIR=		/var/log/caldavd
+RUNDIR=		/var/run/caldavd
+PLIST_SUB=	USER=${USERS} GROUP=${GROUPS} \
+		ETCDIR=${ETCDIR} \
+		DBDIR=${DBDIR} \
+		LOGDIR=${LOGDIR} \
+		RUNDIR=${RUNDIR}
 
-ETCDIR=		${PREFIX}/etc/caldavd
-
 CALDAVD_USER=	caldavd
 USERS=		${CALDAVD_USER}
 GROUPS=		${CALDAVD_USER}
 
 maint-gen-distfile:
 	@if [ ! -f "${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}" ] ; then \
 		${MKDIR} ${WRKDIR} ; cd ${WRKDIR} ; ${RM} -Rf ${WRKDIR}/${DISTNAME} ; \
 		${ECHO_MSG} "=> Checking out CalendarServer from svn.calendarserver.org/..."; \
 		${SVN_CMD1} ${SVN_REPOSITORY_URL}/${SVN_TAG1} > /dev/null ; \
 		${ECHO_MSG} "=> Creating tar archive ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}"; \
 		cd ${WRKDIR} ; tar -czf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${DISTNAME} ; \
 		${RM} -Rf ${WRKDIR}/${DISTNAME} ; \
 	else \
 		${ECHO_MSG} "===>	${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} found." ; \
 	fi
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|"{}.a1+unknown".format(base_version)|"8.0"|' ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e 's|"/etc/caldavd/caldavd.plist"|"${ETCDIR}/caldavd.plist"|g' ${WRKSRC}/twistedcaldav/stdconfig.py
+	@${REINPLACE_CMD} -e 's|/etc/caldavd|${ETCDIR}|g' ${WRKSRC}/conf/caldavd.plist
+	@${REINPLACE_CMD} -e 's|/var/run|/var/run/caldavd|g' ${WRKSRC}/conf/caldavd.plist
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${ETCDIR}/auth
+	${MKDIR} ${STAGEDIR}${DBDIR}/Data/Documents
+	${MKDIR} ${STAGEDIR}${DBDIR}/Documents
+	${MKDIR} ${STAGEDIR}${ETCDIR}/auth
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	(cd ${WRKSRC}/doc && \
 		for i in `ls |${GREP} -v '.8'`; do \
 		${MKDIR} ${STAGEDIR}${DOCSDIR}/$${i} && \
 		${INSTALL_MAN} ${WRKSRC}/doc/$${i}/* \
 		${STAGEDIR}${DOCSDIR}/$${i}; \
 		done)
 	${CP} -p ${WRKSRC}/txdav/common/datastore/sql_schema/current.sql \
 		${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/doc/*.8 ${STAGEDIR}${PREFIX}/man/man8
+	${MKDIR} ${STAGEDIR}${LOGDIR}
+	${MKDIR} ${STAGEDIR}${RUNDIR}
 
 .include <bsd.port.mk>
Index: head/www/calendarserver/files/caldavd.in
===================================================================
--- head/www/calendarserver/files/caldavd.in	(revision 420456)
+++ head/www/calendarserver/files/caldavd.in	(revision 420457)
@@ -1,41 +1,39 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: caldavd
 # REQUIRE: LOGIN
 #
 # Add the following lines to /etc/rc.conf to run caldavd:
 #
 # caldavd_enable (bool):           Set it to "YES" to enable caldavd.
 #                                Default is "NO".
 # caldavd_conf (file):             Local config file.
 #                                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
+#                                Default is /var/run/caldavd/caldavd.pid
 #
 
 . /etc/rc.subr
 
 name="caldavd"
 rcvar=caldavd_enable
 
 load_rc_config $name
 : ${caldavd_enable:=no}
 : ${caldavd_conf="%%PREFIX%%/etc/caldavd/caldavd.plist"}
-: ${caldavd_pidfile="/var/run/${name}.pid"}
+: ${caldavd_pidfile="/var/run/caldavd/${name}.pid"}
 
-pidfile="/var/db/${name}/${name}.pid"
+pidfile="${caldavd_pidfile}"
 required_files="${caldavd_conf}"
 
 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: head/www/calendarserver/files/patch-setup.py
===================================================================
--- head/www/calendarserver/files/patch-setup.py	(nonexistent)
+++ head/www/calendarserver/files/patch-setup.py	(revision 420457)
@@ -0,0 +1,12 @@
+--- setup.py.orig	2016-01-07 15:18:44 UTC
++++ setup.py
+@@ -429,9 +429,6 @@ def doSetup():
+         scripts=[
+             "bin/caldavd",
+         ],
+-        data_files=[
+-            ("caldavd", ["conf/caldavd.plist"]),
+-        ],
+         ext_modules=extensions,
+         py_modules=[],
+         setup_requires=setup_requirements,

Property changes on: head/www/calendarserver/files/patch-setup.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/calendarserver/pkg-plist
===================================================================
--- head/www/calendarserver/pkg-plist	(revision 420456)
+++ head/www/calendarserver/pkg-plist	(revision 420457)
@@ -1,133 +1,139 @@
 man/man8/caldavd.8.gz
 man/man8/calendarserver_command_gateway.8.gz
 man/man8/calendarserver_config.8.gz
 man/man8/calendarserver_export.8.gz
 man/man8/calendarserver_manage_principals.8.gz
 man/man8/calendarserver_manage_push.8.gz
 man/man8/calendarserver_manage_timezones.8.gz
 man/man8/calendarserver_migrate_resources.8.gz
 man/man8/calendarserver_monitor_notifications.8.gz
 man/man8/calendarserver_purge_attachments.8.gz
 man/man8/calendarserver_purge_events.8.gz
 man/man8/calendarserver_purge_principals.8.gz
 man/man8/calendarserver_shell.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/Admin/DirectoryService-Apache.rst
 %%PORTDOCS%%%%DOCSDIR%%/Admin/DirectoryService-OpenDirectory.rst
 %%PORTDOCS%%%%DOCSDIR%%/Admin/DirectoryService-XML.rst
 %%PORTDOCS%%%%DOCSDIR%%/Admin/DirectoryServices.rst
 %%PORTDOCS%%%%DOCSDIR%%/Admin/ExtendedLogItems.rst
 %%PORTDOCS%%%%DOCSDIR%%/Admin/Guide.rst
 %%PORTDOCS%%%%DOCSDIR%%/Admin/LoadSimulation.rst
 %%PORTDOCS%%%%DOCSDIR%%/Admin/MultiServerDeployment.rst
 %%PORTDOCS%%%%DOCSDIR%%/Admin/iSchedule.txt
 %%PORTDOCS%%%%DOCSDIR%%/Client-Server/Principal Bootstrap.graffle.zip
 %%PORTDOCS%%%%DOCSDIR%%/Client-Server/Principal Bootstrap.pdf
 %%PORTDOCS%%%%DOCSDIR%%/Client-Server/calendar-client.rst
 %%PORTDOCS%%%%DOCSDIR%%/Developer/Calendar Store API.graffle
 %%PORTDOCS%%%%DOCSDIR%%/Developer/Calendar Store Schema.graffle
 %%PORTDOCS%%%%DOCSDIR%%/Developer/CrossPodDesign.txt
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-ctag.txt
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-ctag.xml
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-notifications.txt
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-notifications.xml
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-privatecomments.txt
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-privatecomments.xml
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-privateevents.txt
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-privateevents.xml
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-proxy.txt
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-proxy.xml
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-pubsubdiscovery.txt
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-pubsubdiscovery.xml
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-recursplit.txt
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-recursplit.xml
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-schedulingchanges.txt
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-schedulingchanges.xml
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-sharing.txt
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-sharing.xml
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/calendarserver-bulk-change.txt
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/calendarserver-bulk-change.xml
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/icalendar-maskuids.txt
 %%PORTDOCS%%%%DOCSDIR%%/Extensions/icalendar-maskuids.xml
 %%PORTDOCS%%%%DOCSDIR%%/Notes/attendee-import.txt
 %%PORTDOCS%%%%DOCSDIR%%/Notes/index.txt
 %%PORTDOCS%%%%DOCSDIR%%/Notes/x-items.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/draft-daboo-caldav-extensions.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/draft-daboo-calendar-availability.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/draft-daboo-carddav-directory-gateway.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/draft-desruisseaux-ischedule.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc2616-HTTP.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc2617-HTTP Auth.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc3253-DeltaV.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc3283-Calendaring.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc3744-WebDAV ACL.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc4331-WebDAV Quota.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc4559-SPNEGO.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc4791-CalDAV.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc4918-WebDAV.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc5397-Current Principal.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc5545-iCalendar.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc5546-iTIP.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc5689-Extended MKCOL.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc5785-well-known-uris.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc5842-BIND.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc5995-POST addmember.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6047-iMIP.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6321-xCal.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6350-vCard4.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6351-xCard.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6352-CardDAV.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6578-WebDAV Sync.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6638-CalDAV-Scheduling.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/RFC6764-srv-CalDAV.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/RFC6868-Parameter Value Encoding.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/RFC7095-jCard.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/RFC7265-jcal.txt
 %%PORTDOCS%%%%DOCSDIR%%/RFC/RFC7529-RSCALE.txt
 %%PORTDOCS%%%%DOCSDIR%%/current.sql
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/accounts-test-pod.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/accounts-test-s2s.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/accounts-test.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/accounts.dtd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/accounts.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/augments-default.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/augments-test.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/augments-test-pod.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/augments-test-s2s.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/augments.dtd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/generate_test_accounts.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/proxies.dtd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/proxies-test-pod.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/proxies-test-s2s.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/proxies-test.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/resources-test-pod.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/resources-test-s2s.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/resources-test.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-apple.plist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-stdconfig.plist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-test.plist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-test-podA.plist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-test-podB.plist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-test-s2s.plist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd.plist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dkim-test-s2s/other_keys/example.com#ischedule
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dkim-test-s2s/priv.pem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dkim-test-s2s/pub.pem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dkim-test/other_keys/example.org#ischedule2
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dkim-test/priv.pem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dkim-test/pub.pem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/localservers-test.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/localservers.dtd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/localservers.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mime.types
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/remoteservers-test.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/remoteservers-test-s2s.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/remoteservers.dtd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/remoteservers.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/caldavd-resources.plist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/locations-resources-orig.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/locations-resources.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/users-groups.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/accounts.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-db.zones
-@dir etc/caldavd/auth
+@dir %%ETCDIR%%/auth
+@dir(%%USER%%,%%GROUP%%,755) %%RUNDIR%%
+@dir %%LOGDIR%%
+@dir(%%USER%%,%%GROUP%%,755) %%DBDIR%%
+@dir(%%USER%%,%%GROUP%%,755) %%DBDIR%%/Documents
+@dir(%%USER%%,%%GROUP%%,755) %%DBDIR%%/Data
+@dir(%%USER%%,%%GROUP%%,755) %%DBDIR%%/Data/Documents