CVS commit: pkgsrc/www/davical

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Jun 18 15:27:24 UTC 2017

Modified Files:
        pkgsrc/www/davical: Makefile PLIST distinfo
        pkgsrc/www/davical/patches: patch-aa patch-ab patch-ac patch-ad
            patch-ae
Removed Files:
        pkgsrc/www/davical/patches: patch-scripts_build-always.sh

Log Message:
Update davical to 1.1.5.

Changes are too many to write here, please refer ChangeLog.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/www/davical/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/davical/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/davical/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/davical/patches/patch-aa \
    pkgsrc/www/davical/patches/patch-ab pkgsrc/www/davical/patches/patch-ad \
    pkgsrc/www/davical/patches/patch-ae
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/www/davical/patches/patch-ac
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/davical/patches/patch-scripts_build-always.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/davical/Makefile
diff -u pkgsrc/www/davical/Makefile:1.30 pkgsrc/www/davical/Makefile:1.31
--- pkgsrc/www/davical/Makefile:1.30    Sun Mar 12 07:20:51 2017
+++ pkgsrc/www/davical/Makefile Sun Jun 18 15:27:24 2017
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.30 2017/03/12 07:20:51 maya Exp $
+# $NetBSD: Makefile,v 1.31 2017/06/18 15:27:24 taca Exp $
 #
 
 DISTNAME=      davical-${DAVICAL_VERSION}
-DAVICAL_VERSION=1.1.3.1
-PKGREVISION=   5
+PKGNAME=       ${PHP_PKG_PREFIX}-davical-${DAVICAL_VERSION}
 CATEGORIES=    www
-MASTER_SITES=  -https://gitlab.com/davical-project/davical/repository/archive.tar.gz?ref=r${DAVICAL_VERSION}
+MASTER_SITES=  -https://gitlab.com/davical-project/davical/repository/archive.tar.gz?ref=${GITLAB_TAG}
 
 MAINTAINER=    jym%NetBSD.org@localhost
 HOMEPAGE=      http://www.davical.org/
 COMMENT=       Simple CalDAV server using a PostgreSQL backend
-
 LICENSE=       gnu-gpl-v2 AND gnu-gpl-v3
 
+DAVICAL_VERSION=1.1.5
+GITLAB_TAG=    r${DAVICAL_VERSION}
+GITLAB_REV=    7ccc7c449176475891ec50d5524928628df6f8d1
+
 DAVICALDIR=    ${PREFIX}/share/davical
 EGDIR=         ${PREFIX}/share/examples/davical
 DOCDIR=                ${PREFIX}/share/doc/davical
@@ -23,7 +25,7 @@ BUILD_DEFS=   APACHE_USER APACHE_GROUP PGU
 DAVICAL_USER?= ${PGUSER}
 DAVICAL_GROUP?=        ${PGGROUP}
 
-USE_TOOLS=     gmake pax msgfmt perl:build
+USE_TOOLS=     gmake pax msgfmt perl
 
 PAXDIRS=       htdocs inc dba po scripts
 
@@ -60,7 +62,7 @@ CONF_FILES_PERMS+=    ${EGDIR}/config/examp
                        ${PKG_SYSCONFDIR}/config.php            \
                        ${APACHE_USER} ${APACHE_GROUP} 0640
 
-REPLACE_PERL=          dba/update-davical-database
+REPLACE_PERL=          dba/update-davical-database scripts/davical-cli
 
 REPLACE_INTERPRETER+=  php
 REPLACE.php.old=       .*php
@@ -87,6 +89,7 @@ SUBST_FILES.inc-path= davical.conf inc/a
 SUBST_FILES.inc-path+= scripts/po/rebuild-translations.sh
 SUBST_FILES.inc-path+= dba/create-database.sh
 SUBST_SED.inc-path+=   -e "s|@LIBAWLPATH@|${PREFIX}/${LIBAWLDIR}|g"
+SUBST_SED.inc-path+=   -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 SUBST_MESSAGE.inc-path=        Fixing AWL include path.
 
 SUBST_CLASSES+=                examples
@@ -101,9 +104,8 @@ SUBST_FILES.files=  davical.conf
 SUBST_SED.files+=      -e "s|@DAVICALDIR@|${DAVICALDIR}|g"
 SUBST_MESSAGE.files=   Fixing DAViCal configuration file for Apache.
 
-post-extract:
-       ${MV} ${WRKDIR}/davical-r${DAVICAL_VERSION}-* \
-               ${WRKDIR}/davical-${DAVICAL_VERSION}
+pre-patch:
+       ${MV} ${WRKDIR}/davical-${GITLAB_TAG}-${GITLAB_REV} ${WRKSRC}
        ${CP} ${FILESDIR}/davical.conf ${WRKSRC}/davical.conf
 
 pre-install:

Index: pkgsrc/www/davical/PLIST
diff -u pkgsrc/www/davical/PLIST:1.8 pkgsrc/www/davical/PLIST:1.9
--- pkgsrc/www/davical/PLIST:1.8        Fri Nov 13 12:13:13 2015
+++ pkgsrc/www/davical/PLIST    Sun Jun 18 15:27:24 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2015/11/13 12:13:13 hauke Exp $
+@comment $NetBSD: PLIST,v 1.9 2017/06/18 15:27:24 taca Exp $
 share/davical/dba/appuser_permissions.txt
 share/davical/dba/base-data.sql
 share/davical/dba/better_perms.sql
@@ -22,6 +22,7 @@ share/davical/dba/patches/1.2.1.sql
 share/davical/dba/patches/1.2.10.sql
 share/davical/dba/patches/1.2.10a.sql
 share/davical/dba/patches/1.2.11.sql
+share/davical/dba/patches/1.2.12.sql
 share/davical/dba/patches/1.2.1a.sql
 share/davical/dba/patches/1.2.1b.sql
 share/davical/dba/patches/1.2.2.sql
@@ -33,6 +34,8 @@ share/davical/dba/patches/1.2.6.sql
 share/davical/dba/patches/1.2.7.sql
 share/davical/dba/patches/1.2.8.sql
 share/davical/dba/patches/1.2.9.sql
+share/davical/dba/patches/1.3.1.sql
+share/davical/dba/patches/1.3.2.sql
 share/davical/dba/rrule_functions-8.1.sql
 share/davical/dba/rrule_functions.sql
 share/davical/dba/rrule_tests.sql
@@ -55,6 +58,7 @@ share/davical/htdocs/images/down.gif
 share/davical/htdocs/images/up.gif
 share/davical/htdocs/index.php
 share/davical/htdocs/js/browse.js
+share/davical/htdocs/metrics.php
 share/davical/htdocs/public.php
 share/davical/htdocs/robots.txt
 share/davical/htdocs/setup.php
@@ -70,7 +74,6 @@ share/davical/inc/DAViCalSession.php
 share/davical/inc/HTTPAuthSession.php
 share/davical/inc/Principal.php
 share/davical/inc/PublicSession.php
-share/davical/inc/RRule-v2.php
 share/davical/inc/RRule.php
 share/davical/inc/WritableCollection.php
 share/davical/inc/always.php.in
@@ -124,7 +127,6 @@ share/davical/inc/page-footer.php
 share/davical/inc/page-header.php
 share/davical/inc/pubsub.php
 share/davical/inc/schedule-functions.php
-share/davical/inc/test-RRULE.php
 share/davical/inc/tz/capabilities.php
 share/davical/inc/tz/expand.php
 share/davical/inc/tz/get.php
@@ -137,6 +139,7 @@ share/davical/inc/vcard.php
 share/davical/inc/vtimezone.php
 share/davical/inc/well-known.php
 share/davical/po/ar.po
+share/davical/po/ar.values
 share/davical/po/ca.po
 share/davical/po/cs_CZ.po
 share/davical/po/de.po
@@ -152,6 +155,7 @@ share/davical/po/es_VE.values
 share/davical/po/et.po
 share/davical/po/et.values
 share/davical/po/fi.po
+share/davical/po/fi.values
 share/davical/po/fr.po
 share/davical/po/fr.values
 share/davical/po/hu.po
@@ -162,6 +166,7 @@ share/davical/po/it.values
 share/davical/po/ja.po
 share/davical/po/ja.values
 share/davical/po/ko_KR.po
+share/davical/po/ko_KR.values
 share/davical/po/messages.pot
 share/davical/po/nb_NO.po
 share/davical/po/nb_NO.values
@@ -177,11 +182,13 @@ share/davical/po/pt_PT.values
 share/davical/po/ru.po
 share/davical/po/ru.values
 share/davical/po/sk_SK.po
+share/davical/po/sk_SK.values
 share/davical/po/sv.po
 share/davical/po/sv.values
 share/davical/scripts/archive-old-events.php
 share/davical/scripts/build-always.sh
 share/davical/scripts/cron-sync-ldap.php
+share/davical/scripts/davical-cli
 share/davical/scripts/export_calendar.php
 share/davical/scripts/load_calendar.php
 share/davical/scripts/po/rebuild-translations.sh
@@ -195,263 +202,12 @@ share/doc/davical/INSTALL
 share/doc/davical/README
 share/doc/davical/TODO
 share/doc/davical/VERSION
-share/doc/davical/api/awl/CalDAVSyncCalendar.html
-share/doc/davical/api/awl/_inc---CalDAVSyncCalendar.php.html
-share/doc/davical/api/awl/caldav/CalDAVClient.html
-share/doc/davical/api/awl/caldav/CalDAVSyncClient.html
-share/doc/davical/api/awl/caldav/CalendarInfo.html
-share/doc/davical/api/awl/caldav/RRule.html
-share/doc/davical/api/awl/caldav/RepeatRule.html
-share/doc/davical/api/awl/caldav/RepeatRuleDateRange.html
-share/doc/davical/api/awl/caldav/RepeatRuleDateTime.html
-share/doc/davical/api/awl/caldav/RepeatRuleTimeZone.html
-share/doc/davical/api/awl/caldav/Rfc5545Duration.html
-share/doc/davical/api/awl/caldav/_inc---CalDAVSyncClient.php.html
-share/doc/davical/api/awl/caldav/_inc---RRule-v2.php.html
-share/doc/davical/api/awl/caldav/_inc---RRule.php.html
-share/doc/davical/api/awl/caldav/_inc---caldav-client-v2.php.html
-share/doc/davical/api/awl/caldav/_inc---caldav-client.php.html
-share/doc/davical/api/awl/caldav/iCalDate.html
-share/doc/davical/api/blank.html
-share/doc/davical/api/classtrees_awl.html
-share/doc/davical/api/classtrees_davical.html
-share/doc/davical/api/davical/AtomEntry.html
-share/doc/davical/api/davical/AtomFeed.html
-share/doc/davical/api/davical/AtomXHTMLContent.html
-share/doc/davical/api/davical/CalDAVSyncCache.html
-share/doc/davical/api/davical/CalDAVSyncState.html
-share/doc/davical/api/davical/CheckResult.html
-share/doc/davical/api/davical/DAVTicket/DAVTicket.html
-share/doc/davical/api/davical/DAVTicket/_inc---DAVTicket.php.html
-share/doc/davical/api/davical/DAViCalSession/DAViCalSession.html
-share/doc/davical/api/davical/DAViCalSession/Tools.html
-share/doc/davical/api/davical/DAViCalSession/_htdocs---tools.php.html
-share/doc/davical/api/davical/DAViCalSession/_inc---DAViCalSession.php.html
-share/doc/davical/api/davical/FakeSession.html
-share/doc/davical/api/davical/HTTPAuthSession/HTTPAuthSession.html
-share/doc/davical/api/davical/HTTPAuthSession/_inc---HTTPAuthSession.php.html
-share/doc/davical/api/davical/Principal/DAVPrincipal.html
-share/doc/davical/api/davical/Principal/Principal.html
-share/doc/davical/api/davical/Principal/_inc---DAVPrincipal.php.html
-share/doc/davical/api/davical/Principal/_inc---Principal.php.html
-share/doc/davical/api/davical/PublicSession/PublicSession.html
-share/doc/davical/api/davical/PublicSession/_inc---PublicSession.php.html
-share/doc/davical/api/davical/RRuleTest.html
-share/doc/davical/api/davical/Request/CalDAVRequest.html
-share/doc/davical/api/davical/Request/_inc---CalDAVRequest.php.html
-share/doc/davical/api/davical/Resource/DAVResource.html
-share/doc/davical/api/davical/Resource/WritableCollection.html
-share/doc/davical/api/davical/Resource/_inc---DAVResource.php.html
-share/doc/davical/api/davical/SqlToArray.html
-share/doc/davical/api/davical/VCard.html
-share/doc/davical/api/davical/VTimezone.html
-share/doc/davical/api/davical/_htdocs---SqlToArray.php.html
-share/doc/davical/api/davical/_htdocs---admin.php.html
-share/doc/davical/api/davical/_htdocs---always.php.html
-share/doc/davical/api/davical/_htdocs---createdb.php.html
-share/doc/davical/api/davical/_htdocs---dbexec.php.html
-share/doc/davical/api/davical/_htdocs---feed.php.html
-share/doc/davical/api/davical/_htdocs---freebusy.php.html
-share/doc/davical/api/davical/_htdocs---help.php.html
-share/doc/davical/api/davical/_htdocs---iSchedule.php.html
-share/doc/davical/api/davical/_htdocs---index.php.html
-share/doc/davical/api/davical/_htdocs---newfile.php.html
-share/doc/davical/api/davical/_htdocs---setup.php.html
-share/doc/davical/api/davical/_htdocs---test.php.html
-share/doc/davical/api/davical/_htdocs---upgrade.php.html
-share/doc/davical/api/davical/_htdocs---well-known.php.html
-share/doc/davical/api/davical/_inc---AtomFeed.php.html
-share/doc/davical/api/davical/_inc---CalDAVSyncCache.php.html
-share/doc/davical/api/davical/_inc---CalDAVSyncState.php.html
-share/doc/davical/api/davical/_inc---FakeSession.php.html
-share/doc/davical/api/davical/_inc---WritableCollection.php.html
-share/doc/davical/api/davical/_inc---autodiscover-handler.php.html
-share/doc/davical/api/davical/_inc---caldav-LOCK.php.html
-share/doc/davical/api/davical/_inc---caldav-REPORT-calquery.php.html
-share/doc/davical/api/davical/_inc---caldav-REPORT-cardquery.php.html
-share/doc/davical/api/davical/_inc---caldav-REPORT-expand-property.php.html
-share/doc/davical/api/davical/_inc---caldav-REPORT-freebusy.php.html
-share/doc/davical/api/davical/_inc---caldav-REPORT-multiget.php.html
-share/doc/davical/api/davical/_inc---caldav-REPORT-principal-match.php.html
-share/doc/davical/api/davical/_inc---caldav-REPORT-principal.php.html
-share/doc/davical/api/davical/_inc---check_UTF8.php.html
-share/doc/davical/api/davical/_inc---davical_configuration_missing.php.html
-share/doc/davical/api/davical/_inc---freebusy-functions.php.html
-share/doc/davical/api/davical/_inc---interactive-page.php.html
-share/doc/davical/api/davical/_inc---other_translated_strings.php.html
-share/doc/davical/api/davical/_inc---page-footer.php.html
-share/doc/davical/api/davical/_inc---page-header.php.html
-share/doc/davical/api/davical/_inc---pubsub.php.html
-share/doc/davical/api/davical/_inc---test-RRULE-v2.php.html
-share/doc/davical/api/davical/_inc---test-RRULE.php.html
-share/doc/davical/api/davical/_inc---ui---collection-edit.php.html
-share/doc/davical/api/davical/_inc---ui---external-browse.php.html
-share/doc/davical/api/davical/_inc---ui---principal-browse.php.html
-share/doc/davical/api/davical/_inc---ui---principal-edit.php.html
-share/doc/davical/api/davical/_inc---vcard.php.html
-share/doc/davical/api/davical/_inc---vtimezone.php.html
-share/doc/davical/api/davical/_inc---well-known.php.html
-share/doc/davical/api/davical/authentication/_inc---auth-functions.php.html
-share/doc/davical/api/davical/caldav/_htdocs---caldav.php.html
-share/doc/davical/api/davical/caldav/_htdocs---public.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-ACL.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-BIND.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-DELETE.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-DELTICKET.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-GET-functions.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-GET.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-MKCOL.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-MKTICKET.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-MOVE.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-OPTIONS.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-POST.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-PROPPATCH.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-PUT-default.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-PUT-functions.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-PUT-vcalendar.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-PUT-vcard.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-REPORT-pps-set.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-REPORT-sync-collection.php.html
-share/doc/davical/api/davical/caldav/_inc---caldav-REPORT.php.html
-share/doc/davical/api/davical/caldav/_inc---schedule-functions.php.html
-share/doc/davical/api/davical/external-bind/_inc---external-fetch.php.html
-share/doc/davical/api/davical/iSchedule-POST/FakeSession.html
-share/doc/davical/api/davical/iSchedule-POST/_inc---iSchedule-POST.php.html
-share/doc/davical/api/davical/iSchedule/_inc---iSchedule.php.html
-share/doc/davical/api/davical/iSchedule/iSchedule.html
-share/doc/davical/api/davical/ldap/_inc---drivers_imap_pam.php.html
-share/doc/davical/api/davical/ldap/_inc---drivers_ldap.php.html
-share/doc/davical/api/davical/ldap/_inc---drivers_rimap.php.html
-share/doc/davical/api/davical/ldap/_inc---drivers_squid_pam.php.html
-share/doc/davical/api/davical/ldap/imapPamDrivers.html
-share/doc/davical/api/davical/ldap/ldapDrivers.html
-share/doc/davical/api/davical/ldap/squidPamDrivers.html
-share/doc/davical/api/davical/logging/_inc---log_caldav_action.php.html
-share/doc/davical/api/davical/propfind/_inc---caldav-PROPFIND.php.html
-share/doc/davical/api/davical/pwauth/_inc---drivers_pwauth_pam.php.html
-share/doc/davical/api/davical/pwauth/pwauthPamDrivers.html
-share/doc/davical/api/davical/tzservice/_htdocs---tz.php.html
-share/doc/davical/api/davical/tzservice/_inc---tz---capabilities.php.html
-share/doc/davical/api/davical/tzservice/_inc---tz---expand.php.html
-share/doc/davical/api/davical/tzservice/_inc---tz---get.php.html
-share/doc/davical/api/davical/tzservice/_inc---tz---list.php.html
-share/doc/davical/api/elementindex.html
-share/doc/davical/api/elementindex_awl.html
-share/doc/davical/api/elementindex_davical.html
-share/doc/davical/api/errors.html
-share/doc/davical/api/index.html
-share/doc/davical/api/li_awl.html
-share/doc/davical/api/li_davical.html
-share/doc/davical/api/media/banner.css
-share/doc/davical/api/media/images/AbstractClass.png
-share/doc/davical/api/media/images/AbstractClass_logo.png
-share/doc/davical/api/media/images/AbstractMethod.png
-share/doc/davical/api/media/images/AbstractPrivateClass.png
-share/doc/davical/api/media/images/AbstractPrivateClass_logo.png
-share/doc/davical/api/media/images/AbstractPrivateMethod.png
-share/doc/davical/api/media/images/Class.png
-share/doc/davical/api/media/images/Class_logo.png
-share/doc/davical/api/media/images/Constant.png
-share/doc/davical/api/media/images/Constructor.png
-share/doc/davical/api/media/images/Destructor.png
-share/doc/davical/api/media/images/Function.png
-share/doc/davical/api/media/images/Global.png
-share/doc/davical/api/media/images/I.png
-share/doc/davical/api/media/images/Index.png
-share/doc/davical/api/media/images/Interface.png
-share/doc/davical/api/media/images/Interface_logo.png
-share/doc/davical/api/media/images/L.png
-share/doc/davical/api/media/images/Lminus.png
-share/doc/davical/api/media/images/Lplus.png
-share/doc/davical/api/media/images/Method.png
-share/doc/davical/api/media/images/Page.png
-share/doc/davical/api/media/images/Page_logo.png
-share/doc/davical/api/media/images/PrivateClass.png
-share/doc/davical/api/media/images/PrivateClass_logo.png
-share/doc/davical/api/media/images/PrivateMethod.png
-share/doc/davical/api/media/images/PrivateVariable.png
-share/doc/davical/api/media/images/StaticMethod.png
-share/doc/davical/api/media/images/StaticVariable.png
-share/doc/davical/api/media/images/T.png
-share/doc/davical/api/media/images/Tminus.png
-share/doc/davical/api/media/images/Tplus.png
-share/doc/davical/api/media/images/Variable.png
-share/doc/davical/api/media/images/blank.png
-share/doc/davical/api/media/images/class_folder.png
-share/doc/davical/api/media/images/empty.png
-share/doc/davical/api/media/images/file.png
-share/doc/davical/api/media/images/folder.png
-share/doc/davical/api/media/images/function_folder.png
-share/doc/davical/api/media/images/next_button.png
-share/doc/davical/api/media/images/next_button_disabled.png
-share/doc/davical/api/media/images/package.png
-share/doc/davical/api/media/images/package_folder.png
-share/doc/davical/api/media/images/previous_button.png
-share/doc/davical/api/media/images/previous_button_disabled.png
-share/doc/davical/api/media/images/private_class_logo.png
-share/doc/davical/api/media/images/tutorial.png
-share/doc/davical/api/media/images/tutorial_folder.png
-share/doc/davical/api/media/images/up_button.png
-share/doc/davical/api/media/stylesheet.css
-share/doc/davical/api/packages.html
-share/doc/davical/api/phpdoc.ini
-share/doc/davical/api/todolist.html
 share/doc/davical/davical_en_user_guide.odt
+share/doc/davical/phpdoc.ini
 share/doc/davical/translation.rst
-share/doc/davical/website/administration.php
-share/doc/davical/website/background.php
-share/doc/davical/website/clients.php
-share/doc/davical/website/clients/Chandler-details.php
-share/doc/davical/website/clients/Chandler-dialog1.png
-share/doc/davical/website/clients/Chandler-dialog2.png
-share/doc/davical/website/clients/Chandler-dialog3.png
-share/doc/davical/website/clients/Chandler-icon.png
-share/doc/davical/website/clients/Chandler-screenshot.png
-share/doc/davical/website/clients/Evolution-details.php
-share/doc/davical/website/clients/Evolution-dialog1.png
-share/doc/davical/website/clients/Evolution-icon.png
-share/doc/davical/website/clients/Evolution-screenshot.png
-share/doc/davical/website/clients/Interoperability-details.php
-share/doc/davical/website/clients/Mozilla-details.php
-share/doc/davical/website/clients/Mozilla-dialog1.png
-share/doc/davical/website/clients/Mozilla-dialog2.png
-share/doc/davical/website/clients/Mozilla-dialog3.png
-share/doc/davical/website/clients/Mozilla-icon.png
-share/doc/davical/website/clients/Mozilla-screenshot.png
-share/doc/davical/website/clients/Mulberry-details.php
-share/doc/davical/website/clients/Mulberry-dialog1.png
-share/doc/davical/website/clients/Mulberry-dialog2.png
-share/doc/davical/website/clients/Mulberry-icon.png
-share/doc/davical/website/clients/Mulberry-screenshot.png
-share/doc/davical/website/clients/Other-details.php
-share/doc/davical/website/clients/iCal-details.php
-share/doc/davical/website/clients/iCal-dialog.png
-share/doc/davical/website/clients/iCal-icon.png
-share/doc/davical/website/clients/iCal-screenshot.png
-share/doc/davical/website/clients/iPhone-1.png
-share/doc/davical/website/clients/iPhone-2.png
-share/doc/davical/website/clients/iPhone-3.png
-share/doc/davical/website/clients/iPhone-4.png
-share/doc/davical/website/clients/iPhone-details.php
-share/doc/davical/website/clients/ical4/001.png
-share/doc/davical/website/clients/ical4/002.png
-share/doc/davical/website/clients/ical4/003.png
-share/doc/davical/website/images/davical_logo.ico
-share/doc/davical/website/images/davical_logo.svg
-share/doc/davical/website/images/icon.png
-share/doc/davical/website/images/larger.png
-share/doc/davical/website/images/logo.gif
-share/doc/davical/website/inc/page-footer.php
-share/doc/davical/website/inc/page-header.php
-share/doc/davical/website/inc/page-middle.php
-share/doc/davical/website/index.php
-share/doc/davical/website/installation.php
-share/doc/davical/website/style.css
-share/doc/davical/website/wikiheader.css
 share/examples/davical/config/apache-davical.conf
 share/examples/davical/config/debug-config.php
 share/examples/davical/config/example-administration.yml
 share/examples/davical/config/example-config.php
-share/examples/davical/config/imap_pam_conf_php.txt
 share/examples/davical/config/other-config.php
 share/examples/davical/davical.conf

Index: pkgsrc/www/davical/distinfo
diff -u pkgsrc/www/davical/distinfo:1.11 pkgsrc/www/davical/distinfo:1.12
--- pkgsrc/www/davical/distinfo:1.11    Fri Nov 13 12:13:13 2015
+++ pkgsrc/www/davical/distinfo Sun Jun 18 15:27:24 2017
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.11 2015/11/13 12:13:13 hauke Exp $
+$NetBSD: distinfo,v 1.12 2017/06/18 15:27:24 taca Exp $
 
-SHA1 (davical-1.1.3.1.tar.gz) = f5aaab4c8f078f99471d3450f3a035c84e02c195
-RMD160 (davical-1.1.3.1.tar.gz) = 751787ac7eb58f146441ad7735bf6c5e30511bc3
-SHA512 (davical-1.1.3.1.tar.gz) = 0d1d164c56a292529931f3fe0d75059c343f8022a0fc77918ba8b96fd9a424f8f444c1d32c50af061a78869cac5c737e316d095700364288b4d0e55568edb404
-Size (davical-1.1.3.1.tar.gz) = 3032719 bytes
-SHA1 (patch-aa) = 3172ea7a359e1779431d732d0f1cb106e3b4dd4e
-SHA1 (patch-ab) = d9c4c6729e7be6968306bdd96ed4269c0887a885
-SHA1 (patch-ac) = 74e9b103d502886736dff4fa659fb3e50bae5032
-SHA1 (patch-ad) = 7816ff4ee7440911e275f3152089760e82b5d180
-SHA1 (patch-ae) = e3f2b5c002c8289d40cd025a38c382d402fc659e
-SHA1 (patch-scripts_build-always.sh) = 528aef5225f83908786aa1ba6ee176e87db64a15
+SHA1 (davical-1.1.5.tar.gz) = 589a013d3545e20cade8c21b3fc77dc073b94f14
+RMD160 (davical-1.1.5.tar.gz) = e871532ae1341594d91b5c9a1eef7ea21ef7bfd2
+SHA512 (davical-1.1.5.tar.gz) = d48786c52b4ecffa53463b2246a701e14fa5ea68a7c91f77423df15e439298988ad725455145663fe87223e81a66b02b4ca10b43bf5797b01ee59ca00f1d0957
+Size (davical-1.1.5.tar.gz) = 1781265 bytes
+SHA1 (patch-aa) = a2a8be1a131cd47c6541c0a0793a00a33ba3a9f2
+SHA1 (patch-ab) = 7ae06c595f54d3a959db481d303978b29ebbd899
+SHA1 (patch-ac) = 29e805d37943a21d5ccd383651c19acb1a32038e
+SHA1 (patch-ad) = ecbac45e18ed6cea2915caadfb4dca1a2ce32667
+SHA1 (patch-ae) = cb753f0490ef3e5c5d8ff67b8d0aec7c4fe7d384

Index: pkgsrc/www/davical/patches/patch-aa
diff -u pkgsrc/www/davical/patches/patch-aa:1.2 pkgsrc/www/davical/patches/patch-aa:1.3
--- pkgsrc/www/davical/patches/patch-aa:1.2     Thu Sep  8 20:58:58 2011
+++ pkgsrc/www/davical/patches/patch-aa Sun Jun 18 15:27:24 2017
@@ -1,22 +1,24 @@
-$NetBSD: patch-aa,v 1.2 2011/09/08 20:58:58 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2017/06/18 15:27:24 taca Exp $
 
---- dba/create-database.sh.orig        2010-10-17 19:00:55.000000000 +0000
+Set pkgsrc AWLDIR.
+
+--- dba/create-database.sh.orig        2017-01-23 22:04:46.000000000 +0000
 +++ dba/create-database.sh
-@@ -16,7 +16,7 @@ testawldir() {
+@@ -12,7 +12,7 @@ INSTALL_NOTE_FN="`mktemp -t tmp.XXXXXXXX
+ 
  
- #
- # Attempt to locate the AWL directory
--AWLDIR="${DBADIR}/../../awl"
+ # Candidate locations of the AWL directory
+-awldirs="${DBADIR}/../../awl
 +AWLDIR="@LIBAWLPATH@"
- if ! testawldir "${AWLDIR}"; then
-   AWLDIR="/usr/share/awl"
-   if ! testawldir "${AWLDIR}"; then
-@@ -175,7 +175,7 @@ rm "${INSTALL_NOTE_FN}"
+ /usr/share/awl
+ /usr/share/php/awl
+ /usr/local/share/awl"
+@@ -184,7 +184,7 @@ rm "${INSTALL_NOTE_FN}"
  cat <<FRIENDLY
  *  The password for the 'admin' user has been set to '${ADMINPW}'
  
--Thanks for trying DAViCal!  Check in /usr/share/doc/davical/examples/ for
-+Thanks for trying DAViCal!  Check in @EGDIRCONFIG@/ for
- some configuration examples.  For help, visit #davical on irc.oftc.net.
+-Thanks for trying DAViCal! Check the configuration in /etc/davical/config.php.
++Thanks for trying DAViCal! Check the configuration in @PKG_SYSCONFDIR@/config.php.
+ For help, look at our website and wiki, or visit #davical on irc.oftc.net.
  
  FRIENDLY
Index: pkgsrc/www/davical/patches/patch-ab
diff -u pkgsrc/www/davical/patches/patch-ab:1.2 pkgsrc/www/davical/patches/patch-ab:1.3
--- pkgsrc/www/davical/patches/patch-ab:1.2     Thu Oct 13 15:57:03 2011
+++ pkgsrc/www/davical/patches/patch-ab Sun Jun 18 15:27:24 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2011/10/13 15:57:03 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2017/06/18 15:27:24 taca Exp $
+
+Handle for pkgsrc path.
 
 --- inc/always.php.in.orig     2011-09-25 09:04:29.000000000 +0000
 +++ inc/always.php.in
Index: pkgsrc/www/davical/patches/patch-ad
diff -u pkgsrc/www/davical/patches/patch-ad:1.2 pkgsrc/www/davical/patches/patch-ad:1.3
--- pkgsrc/www/davical/patches/patch-ad:1.2     Thu Oct 13 15:57:03 2011
+++ pkgsrc/www/davical/patches/patch-ad Sun Jun 18 15:27:24 2017
@@ -1,13 +1,15 @@
-$NetBSD: patch-ad,v 1.2 2011/10/13 15:57:03 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2017/06/18 15:27:24 taca Exp $
 
---- scripts/po/rebuild-translations.sh.orig    2011-09-11 11:46:40.000000000 +0000
+Handle for pkgsrc path.
+
+--- scripts/po/rebuild-translations.sh.orig    2017-01-23 22:04:46.000000000 +0000
 +++ scripts/po/rebuild-translations.sh
-@@ -10,7 +10,7 @@
+@@ -9,7 +9,7 @@
+ 
  PODIR="po"
- LOCALEDIR="locale"
- APPLICATION="davical"
--AWL_LOCATION="../awl"
-+AWL_LOCATION="@LIBAWLPATH@"
  
- if [ ! -d "${AWL_LOCATION}" ]; then
-   AWL_LOCATION="`find .. -type d -name 'awl-*.*'`"
+-awldirs="../awl
++awldirs="@LIBAWLPATH@"
+ `find .. -type d -name 'awl-*.*'`
+ /usr/share/awl
+ /usr/share/php/awl
Index: pkgsrc/www/davical/patches/patch-ae
diff -u pkgsrc/www/davical/patches/patch-ae:1.2 pkgsrc/www/davical/patches/patch-ae:1.3
--- pkgsrc/www/davical/patches/patch-ae:1.2     Thu Oct 13 15:57:03 2011
+++ pkgsrc/www/davical/patches/patch-ae Sun Jun 18 15:27:24 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2011/10/13 15:57:03 wiz Exp $
+$NetBSD: patch-ae,v 1.3 2017/06/18 15:27:24 taca Exp $
+
+Handle for pkgsrc path.
 
 --- inc/davical_configuration_missing.php.orig 2011-09-11 11:46:40.000000000 +0000
 +++ inc/davical_configuration_missing.php

Index: pkgsrc/www/davical/patches/patch-ac
diff -u pkgsrc/www/davical/patches/patch-ac:1.1.1.1 pkgsrc/www/davical/patches/patch-ac:1.2
--- pkgsrc/www/davical/patches/patch-ac:1.1.1.1 Sun May 23 21:36:30 2010
+++ pkgsrc/www/davical/patches/patch-ac Sun Jun 18 15:27:24 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/05/23 21:36:30 jym Exp $
+$NetBSD: patch-ac,v 1.2 2017/06/18 15:27:24 taca Exp $
+
+Honor PKG_SYSCONFDIR.
 
 --- dba/update-davical-database.orig   2010-03-09 02:51:21.000000000 +0000
 +++ dba/update-davical-database