5 files changed, 83 insertions, 113 deletions

diff --git a/www/davical/Makefile b/www/davical/Makefile
index b978d32fe0de..3ccbdd1d1828 100644
--- a/www/davical/Makefile
+++ b/www/davical/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	davical
-PORTVERSION=	0.9.8.4
+PORTVERSION=	0.9.9
 CATEGORIES?=	www
 MASTER_SITES=	http://debian.mcmillan.net.nz/packages/davical/ \
 		SF/rscds/${PORTNAME}/${PORTVERSION}
@@ -15,33 +15,23 @@ DISTNAME=	davical-${PORTVERSION}
 MAINTAINER=	maurice@castro.aus.net
 COMMENT=	A simple CalDAV server using a postgres backend
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
-		${LOCALBASE}/include/php/ext/pgsql:${PORTSDIR}/databases/php5-pgsql \
-		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo.so:${PORTSDIR}/databases/php5-pdo \
-		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql \
-		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
 		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML \
 		${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg \
 		${LOCALBASE}/bin/pwgen:${PORTSDIR}/sysutils/pwgen \
-		php-libawl>=0.42:${PORTSDIR}/devel/php-libawl \
-		postgresql-client>=8.2:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client
+		php-libawl>=0.43:${PORTSDIR}/devel/php-libawl
 
 NO_BUILD=	yes
 USE_PGSQL=	yes
-
-USE_PHP=	gettext pcre xml iconv
+USE_PHP=	gettext iconv pcre pdo pdo_pgsql pgsql xml
 
 SUB_FILES=	pkg-message httpd-davical.conf
 WWWDIR?=	${PREFIX}/www/${PORTNAME}
 
-post-patch:
-	${RM} ${WRKSRC}/inc/always.php.orig
-	${RM} ${WRKSRC}/dba/create-database.sh.orig
-
 do-install:
 	${MKDIR} ${WWWDIR} ${WWWDIR}/htdocs ${WWWDIR}/inc ${WWWDIR}/config
 	cd ${WRKSRC}/htdocs && ${COPYTREE_SHARE} . ${WWWDIR}/htdocs
-	cd ${WRKSRC}/inc && ${COPYTREE_SHARE} . ${WWWDIR}/inc
+	cd ${WRKSRC}/inc && ${COPYTREE_SHARE} . ${WWWDIR}/inc "! -name *.in"
 	${CP} -pv ${WRKSRC}/config/example-config.php ${WWWDIR}/config/
 
 post-install:
diff --git a/www/davical/distinfo b/www/davical/distinfo
index 28db37697ec2..84a138dc3b68 100644
--- a/www/davical/distinfo
+++ b/www/davical/distinfo
@@ -1,3 +1,3 @@
-MD5 (davical-0.9.8.4.tar.gz) = 10332efe115fd5453d045e536dbd4201
-SHA256 (davical-0.9.8.4.tar.gz) = 15dc0e2c70dceef4ed5337a37e7a0d22d00b13b5029e991088c9112558e12750
-SIZE (davical-0.9.8.4.tar.gz) = 1968920
+MD5 (davical-0.9.9.tar.gz) = 7a6e3c91959dd99a791a9413ee6c0417
+SHA256 (davical-0.9.9.tar.gz) = 9052f844b8b1139d62ec9f1cc8cb31a4f34d86b783476fe674148fe6fd99c96c
+SIZE (davical-0.9.9.tar.gz) = 1949981
diff --git a/www/davical/files/patch-create-database.sh b/www/davical/files/patch-create-database.sh
deleted file mode 100644
index bb8e00f19e28..000000000000
--- a/www/davical/files/patch-create-database.sh
+++ /dev/null
@@ -1,8 +0,0 @@
---- dba/create-database.sh.orig	2010-02-25 09:18:18.000000000 +1100
-+++ dba/create-database.sh	2010-02-25 09:17:48.000000000 +1100
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/local/bin/bash
- #
- # Build the DAViCal database
- #
diff --git a/www/davical/files/patch-inc-always.php b/www/davical/files/patch-inc-always.php
deleted file mode 100644
index 5f940ea92110..000000000000
--- a/www/davical/files/patch-inc-always.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- inc/always.php.orig	2009-10-31 21:11:51.000000000 -0200
-+++ inc/always.php	2009-10-31 21:12:29.000000000 -0200
-@@ -43,7 +43,7 @@
- $c->readonly_webdav_collections = true;    // WebDAV access is readonly
- 
- // Ensure that ../inc is in our included paths as early as possible
--set_include_path( '../inc'. PATH_SEPARATOR. get_include_path());
-+set_include_path( '../inc'. PATH_SEPARATOR. '/usr/local/share/awl/inc'. PATH_SEPARATOR. get_include_path());
- 
- // Kind of private configuration values
- $c->total_query_time = 0;
diff --git a/www/davical/pkg-plist b/www/davical/pkg-plist
index 07377696b691..f1a0969c273d 100644
--- a/www/davical/pkg-plist
+++ b/www/davical/pkg-plist
@@ -1,9 +1,50 @@
-%%PORTDOCS%%%%DOCSDIR%%/config/.gitignore
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/config/debug-config.php
 %%PORTDOCS%%%%DOCSDIR%%/config/example-administration.yml
 %%PORTDOCS%%%%DOCSDIR%%/config/example-config.php
 %%PORTDOCS%%%%DOCSDIR%%/config/other-config.php
-%%PORTDOCS%%%%DOCSDIR%%/docs/.gitignore
+%%PORTDOCS%%%%DOCSDIR%%/dba/appuser_permissions.txt
+%%PORTDOCS%%%%DOCSDIR%%/dba/base-data.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/better_perms.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/caldav_functions.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/create-database.sh
+%%PORTDOCS%%%%DOCSDIR%%/dba/davical.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.10.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.11.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.11a.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.12.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.12a.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.2.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.3.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.4.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.5.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.6.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.7.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.8.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.9.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.1.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.1a.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.1b.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.2.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.3.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.3a.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.4.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.5.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.6.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.7.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.8.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/rrule_functions-8.1.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/rrule_functions.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/rrule_tests.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/sample-data.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/supported_locales.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/update-davical-database
+%%PORTDOCS%%%%DOCSDIR%%/dba/views/dav_principal.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/windows/awl-tables.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/windows/create-database.bat
+%%PORTDOCS%%%%DOCSDIR%%/dba/windows/rscds.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/windows/schema-management.sql
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/AWLDB/AwlQuery.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/AWLDB/_inc---AwlQuery.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/AwlDatabase/AwlDBDialect.html
@@ -13,12 +54,12 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/CalDAVClient.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/CalendarInfo.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RRule.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRule.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRuleDateTime.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/_inc---RRule-v2.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/_inc---RRule.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/_inc---caldav-client-v2.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/_inc---caldav-client.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/_inc---RRule-v2.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRuleDateTime.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRule.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/iCalDate.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/blank.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/classtrees_awl.html
@@ -60,7 +101,20 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-REPORT-freebusy.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-REPORT-multiget.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-REPORT-principal.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---check_UTF8.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---davical_configuration_missing.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---freebusy-GET.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---interactive-page.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---other_translated_strings.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---page-footer.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---page-header.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---pubsub.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---test-RRULE-v2.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---test-RRULE.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---ui---collection-edit.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---ui---principal-browse.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---ui---principal-edit.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/authentication/_inc---auth-functions.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_htdocs---caldav.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_htdocs---public.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-ACL.php.html
@@ -69,26 +123,13 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-MKCOL.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-MOVE.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-OPTIONS.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-REPORT-pps-set.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-POST.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-PROPPATCH.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-PUT-functions.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-PUT.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-REPORT-pps-set.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-REPORT-sync-collection.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-REPORT.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---check_UTF8.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---davical_configuration_missing.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---freebusy-GET.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---interactive-page.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---other_translated_strings.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---page-footer.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---page-header.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---pubsub.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---test-RRULE.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---ui---collection-edit.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---ui---principal-browse.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---ui---principal-edit.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/authentication/_inc---auth-functions.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/ldap/_inc---drivers_ldap.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/ldap/_inc---drivers_squid_pam.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/ldap/ldapDrivers.html
@@ -158,7 +199,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/phpdoc.ini
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/todolist.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/davical_en_user_guide.odt
-%%PORTDOCS%%%%DOCSDIR%%/docs/website/.gitignore
 %%PORTDOCS%%%%DOCSDIR%%/docs/website/administration.php
 %%PORTDOCS%%%%DOCSDIR%%/docs/website/background.php
 %%PORTDOCS%%%%DOCSDIR%%/docs/website/clients.php
@@ -208,57 +248,16 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/website/installation.php
 %%PORTDOCS%%%%DOCSDIR%%/docs/website/style.css
 %%PORTDOCS%%%%DOCSDIR%%/docs/website/wikiheader.css
+%%PORTDOCS%%%%DOCSDIR%%/httpd-davical.conf
 %%PORTDOCS%%%%DOCSDIR%%/scripts/build-always.sh
 %%PORTDOCS%%%%DOCSDIR%%/scripts/po/extract.pl
 %%PORTDOCS%%%%DOCSDIR%%/scripts/po/rebuild-translations.sh
-%%PORTDOCS%%%%DOCSDIR%%/dba/appuser_permissions.txt
-%%PORTDOCS%%%%DOCSDIR%%/dba/base-data.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/better_perms.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/caldav_functions.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/create-database.sh
-%%PORTDOCS%%%%DOCSDIR%%/dba/davical.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.10.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.11.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.11a.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.12.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.12a.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.2.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.3.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.4.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.5.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.6.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.7.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.8.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.9.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.1.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.1a.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.1b.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.2.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.3.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.3a.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.4.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.5.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.6.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.7.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/rrule_functions-8.1.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/rrule_functions.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/rrule_tests.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/sample-data.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/supported_locales.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/update-davical-database
-%%PORTDOCS%%%%DOCSDIR%%/dba/views/dav_principal.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/windows/awl-tables.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/windows/create-database.bat
-%%PORTDOCS%%%%DOCSDIR%%/dba/windows/rscds.sql
-%%PORTDOCS%%%%DOCSDIR%%/dba/windows/schema-management.sql
-%%PORTDOCS%%%%DOCSDIR%%/httpd-davical.conf
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/scripts/sync-remote-caldav.php
+%%WWWDIR%%/config/example-config.php
 %%WWWDIR%%/htdocs/.htaccess
-%%WWWDIR%%/htdocs/.gitignore
 %%WWWDIR%%/htdocs/admin.php
+%%WWWDIR%%/htdocs/always.php
 %%WWWDIR%%/htdocs/caldav.php
-%%WWWDIR%%/htdocs/collection.php
 %%WWWDIR%%/htdocs/css/browse.css
 %%WWWDIR%%/htdocs/css/edit.css
 %%WWWDIR%%/htdocs/davical.css
@@ -269,36 +268,37 @@
 %%WWWDIR%%/htdocs/index.php
 %%WWWDIR%%/htdocs/js/browse.js
 %%WWWDIR%%/htdocs/public.php
-%%WWWDIR%%/htdocs/relationship_types.php
 %%WWWDIR%%/htdocs/setup.php
 %%WWWDIR%%/htdocs/tools.php
 %%WWWDIR%%/htdocs/upgrade.php
-%%WWWDIR%%/inc/.gitignore
 %%WWWDIR%%/inc/AwlDBDialect.php
 %%WWWDIR%%/inc/AwlDatabase.php
 %%WWWDIR%%/inc/AwlQuery.php
+%%WWWDIR%%/inc/AwlUpgrader.php
 %%WWWDIR%%/inc/CalDAVPrincipal.php
 %%WWWDIR%%/inc/CalDAVRequest.php
 %%WWWDIR%%/inc/DAVResource.php
+%%WWWDIR%%/inc/DAVTicket.php
 %%WWWDIR%%/inc/DAViCalSession.php
-%%WWWDIR%%/inc/DAViCalUser.php
 %%WWWDIR%%/inc/HTTPAuthSession.php
 %%WWWDIR%%/inc/PublicSession.php
-%%WWWDIR%%/inc/RRule.php
 %%WWWDIR%%/inc/RRule-v2.php
-%%WWWDIR%%/inc/always.php
-%%WWWDIR%%/inc/always.php.in
+%%WWWDIR%%/inc/RRule.php
 %%WWWDIR%%/inc/auth-functions.php
 %%WWWDIR%%/inc/caldav-ACL.php
+%%WWWDIR%%/inc/caldav-BIND.php
 %%WWWDIR%%/inc/caldav-DELETE.php
+%%WWWDIR%%/inc/caldav-DELTICKET.php
 %%WWWDIR%%/inc/caldav-GET.php
 %%WWWDIR%%/inc/caldav-LOCK.php
 %%WWWDIR%%/inc/caldav-MKCOL.php
+%%WWWDIR%%/inc/caldav-MKTICKET.php
 %%WWWDIR%%/inc/caldav-MOVE.php
 %%WWWDIR%%/inc/caldav-OPTIONS.php
 %%WWWDIR%%/inc/caldav-POST.php
 %%WWWDIR%%/inc/caldav-PROPFIND.php
 %%WWWDIR%%/inc/caldav-PROPPATCH.php
+%%WWWDIR%%/inc/caldav-PUT-default.php
 %%WWWDIR%%/inc/caldav-PUT-functions.php
 %%WWWDIR%%/inc/caldav-PUT.php
 %%WWWDIR%%/inc/caldav-REPORT-calquery.php
@@ -309,7 +309,6 @@
 %%WWWDIR%%/inc/caldav-REPORT-principal.php
 %%WWWDIR%%/inc/caldav-REPORT-sync-collection.php
 %%WWWDIR%%/inc/caldav-REPORT.php
-%%WWWDIR%%/inc/pubsub.php
 %%WWWDIR%%/inc/caldav-client-v2.php
 %%WWWDIR%%/inc/caldav-client.php
 %%WWWDIR%%/inc/check_UTF8.php
@@ -322,11 +321,11 @@
 %%WWWDIR%%/inc/other_translated_strings.php
 %%WWWDIR%%/inc/page-footer.php
 %%WWWDIR%%/inc/page-header.php
+%%WWWDIR%%/inc/pubsub.php
 %%WWWDIR%%/inc/test-RRULE.php
 %%WWWDIR%%/inc/ui/collection-edit.php
 %%WWWDIR%%/inc/ui/principal-browse.php
 %%WWWDIR%%/inc/ui/principal-edit.php
-%%WWWDIR%%/config/example-config.php
 @dirrm %%WWWDIR%%/inc/ui
 @dirrm %%WWWDIR%%/inc
 @dirrm %%WWWDIR%%/htdocs/js
@@ -348,8 +347,8 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/ldap
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/caldav
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/authentication
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/Request
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/Resource
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/Request
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/PublicSession
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/Principal
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/HTTPAuthSession
@@ -358,14 +357,14 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/Admin
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/awl/caldav
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/awl/AWLDB
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/awl/AwlDatabase
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/awl/AWLDB
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/awl
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/dba/windows
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/dba/patches
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/dba/views
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/dba/patches
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/dba
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/config
 %%PORTDOCS%%@dirrm %%DOCSDIR%%