4 files changed, 37 insertions, 36 deletions

diff --git a/www/davical/Makefile b/www/davical/Makefile
index 3ccbdd1d1828..16a7b4eb0700 100644
--- a/www/davical/Makefile
+++ b/www/davical/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	davical
-PORTVERSION=	0.9.9
+PORTVERSION=	0.9.9.3
 CATEGORIES?=	www
 MASTER_SITES=	http://debian.mcmillan.net.nz/packages/davical/ \
 		SF/rscds/${PORTNAME}/${PORTVERSION}
@@ -19,14 +19,13 @@ 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.43:${PORTSDIR}/devel/php-libawl
+		php-libawl>=0.45:${PORTSDIR}/devel/php-libawl
 
 NO_BUILD=	yes
 USE_PGSQL=	yes
 USE_PHP=	gettext iconv pcre pdo pdo_pgsql pgsql xml
 
 SUB_FILES=	pkg-message httpd-davical.conf
-WWWDIR?=	${PREFIX}/www/${PORTNAME}
 
 do-install:
 	${MKDIR} ${WWWDIR} ${WWWDIR}/htdocs ${WWWDIR}/inc ${WWWDIR}/config
diff --git a/www/davical/distinfo b/www/davical/distinfo
index 84a138dc3b68..f66251308545 100644
--- a/www/davical/distinfo
+++ b/www/davical/distinfo
@@ -1,3 +1,2 @@
-MD5 (davical-0.9.9.tar.gz) = 7a6e3c91959dd99a791a9413ee6c0417
-SHA256 (davical-0.9.9.tar.gz) = 9052f844b8b1139d62ec9f1cc8cb31a4f34d86b783476fe674148fe6fd99c96c
-SIZE (davical-0.9.9.tar.gz) = 1949981
+SHA256 (davical-0.9.9.3.tar.gz) = d72f924f0dba4134f5e06f4e87b5a1b2f4e28b49898f385f48d9831c5191cc31
+SIZE (davical-0.9.9.3.tar.gz) = 2021073
diff --git a/www/davical/files/httpd-davical.conf.in b/www/davical/files/httpd-davical.conf.in
index c951014ca256..7d645beadda7 100644
--- a/www/davical/files/httpd-davical.conf.in
+++ b/www/davical/files/httpd-davical.conf.in
@@ -1,9 +1,9 @@
 # Settings for davical
 #
 
-Alias /davical "%%PREFIX%%/www/davical/htdocs"
+Alias /davical "%%WWWDIR%%/htdocs"
 
-<Directory "%%PREFIX%%/www/davical/htdocs">
+<Directory "%%WWWDIR%%/htdocs">
 	Options Indexes FollowSymLinks MultiViews
 	AllowOverride All
 	Order allow,deny
diff --git a/www/davical/pkg-plist b/www/davical/pkg-plist
index f1a0969c273d..c883fdaa77e4 100644
--- a/www/davical/pkg-plist
+++ b/www/davical/pkg-plist
@@ -34,6 +34,7 @@
 %%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/patches/1.2.9.sql
 %%PORTDOCS%%%%DOCSDIR%%/dba/rrule_functions-8.1.sql
 %%PORTDOCS%%%%DOCSDIR%%/dba/rrule_functions.sql
 %%PORTDOCS%%%%DOCSDIR%%/dba/rrule_tests.sql
@@ -45,17 +46,12 @@
 %%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
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/AwlDatabase/AwlDatabase.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/AwlDatabase/_inc---AwlDBDialect.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/AwlDatabase/_inc---AwlDatabase.php.html
 %%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/RepeatRuleTimeZone.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
@@ -64,13 +60,12 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/blank.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/classtrees_awl.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/classtrees_davical.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/Admin/_htdocs---users.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/DAVTicket/DAVTicket.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/DAVTicket/_inc---DAVTicket.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/DAViCalSession/DAViCalSession.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/DAViCalSession/Tools.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/DAViCalSession/_htdocs---tools.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/DAViCalSession/_inc---DAViCalSession.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/DAViCalUser/DAViCalUser.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/DAViCalUser/_inc---DAViCalUser.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/HTTPAuthSession/HTTPAuthSession.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/HTTPAuthSession/_inc---HTTPAuthSession.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/Principal/CalDAVPrincipal.html
@@ -82,28 +77,26 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/Request/_inc---CalDAVRequest.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/Resource/DAVResource.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/Resource/_inc---DAVResource.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/VCard.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---admin.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---collection.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---always.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---freebusy.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---help.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---index.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---relationship_types.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---roles.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---setup.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---test.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---testpdo.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---upgrade.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---usr.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---always.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---well-known.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-LOCK.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-REPORT-calquery.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-REPORT-cardquery.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-REPORT-expand-property.php.html
 %%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---freebusy-functions.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
@@ -114,29 +107,38 @@
 %%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/_inc---vcard.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
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-BIND.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-DELETE.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-DELTICKET.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-GET.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-MKCOL.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-MKTICKET.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-POST.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-PROPPATCH.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-PUT-default.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-PUT-functions.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-PUT-vcard.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/iSchedule/_inc---iSchedule.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/iSchedule/iSchedule.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
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/ldap/squidPamDrivers.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/logging/_inc---log_caldav_action.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/propfind/_inc---caldav-PROPFIND.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/xmpp.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/pwauth/_inc---drivers_pwauth_pam.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/pwauth/pwauthPamDrivers.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/elementindex.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/elementindex_awl.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/elementindex_davical.html
@@ -271,10 +273,7 @@
 %%WWWDIR%%/htdocs/setup.php
 %%WWWDIR%%/htdocs/tools.php
 %%WWWDIR%%/htdocs/upgrade.php
-%%WWWDIR%%/inc/AwlDBDialect.php
-%%WWWDIR%%/inc/AwlDatabase.php
-%%WWWDIR%%/inc/AwlQuery.php
-%%WWWDIR%%/inc/AwlUpgrader.php
+%%WWWDIR%%/htdocs/well-known.php
 %%WWWDIR%%/inc/CalDAVPrincipal.php
 %%WWWDIR%%/inc/CalDAVRequest.php
 %%WWWDIR%%/inc/DAVResource.php
@@ -300,8 +299,10 @@
 %%WWWDIR%%/inc/caldav-PROPPATCH.php
 %%WWWDIR%%/inc/caldav-PUT-default.php
 %%WWWDIR%%/inc/caldav-PUT-functions.php
+%%WWWDIR%%/inc/caldav-PUT-vcard.php
 %%WWWDIR%%/inc/caldav-PUT.php
 %%WWWDIR%%/inc/caldav-REPORT-calquery.php
+%%WWWDIR%%/inc/caldav-REPORT-cardquery.php
 %%WWWDIR%%/inc/caldav-REPORT-expand-property.php
 %%WWWDIR%%/inc/caldav-REPORT-freebusy.php
 %%WWWDIR%%/inc/caldav-REPORT-multiget.php
@@ -314,8 +315,10 @@
 %%WWWDIR%%/inc/check_UTF8.php
 %%WWWDIR%%/inc/davical_configuration_missing.php
 %%WWWDIR%%/inc/drivers_ldap.php
+%%WWWDIR%%/inc/drivers_pwauth_pam.php
 %%WWWDIR%%/inc/drivers_squid_pam.php
-%%WWWDIR%%/inc/freebusy-GET.php
+%%WWWDIR%%/inc/freebusy-functions.php
+%%WWWDIR%%/inc/iSchedule.php
 %%WWWDIR%%/inc/interactive-page.php
 %%WWWDIR%%/inc/log_caldav_action.php
 %%WWWDIR%%/inc/other_translated_strings.php
@@ -326,14 +329,15 @@
 %%WWWDIR%%/inc/ui/collection-edit.php
 %%WWWDIR%%/inc/ui/principal-browse.php
 %%WWWDIR%%/inc/ui/principal-edit.php
+%%WWWDIR%%/inc/vcard.php
 @dirrm %%WWWDIR%%/inc/ui
 @dirrm %%WWWDIR%%/inc
 @dirrm %%WWWDIR%%/htdocs/js
 @dirrm %%WWWDIR%%/htdocs/images
 @dirrm %%WWWDIR%%/htdocs/css
 @dirrm %%WWWDIR%%/htdocs
-@dirrmtry %%WWWDIR%%/config
-@dirrmtry %%WWWDIR%%
+@dirrm %%WWWDIR%%/config
+@dirrm %%WWWDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/scripts/po
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/scripts
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/website/inc
@@ -342,9 +346,11 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/website
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/media/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/media
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/pwauth
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/propfind
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/logging
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/ldap
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/iSchedule
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/caldav
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/authentication
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/Resource
@@ -352,13 +358,10 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/PublicSession
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/Principal
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/HTTPAuthSession
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/DAViCalUser
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/DAViCalSession
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/Admin
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/DAVTicket
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/awl/caldav
-%%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