Index: head/www/davical/Makefile
===================================================================
--- head/www/davical/Makefile	(revision 433085)
+++ head/www/davical/Makefile	(revision 433086)
@@ -1,70 +1,69 @@
 # Created by: Maurice Castro <maurice@castro.aus.net>
 # $FreeBSD$
 
 PORTNAME=	davical
-PORTVERSION=	1.1.2
+PORTVERSION=	1.1.5
 DISTVERSIONPREFIX=	r
-PORTREVISION=	1
 CATEGORIES?=	www
+MASTER_SITES=	https://gitlab.com/${PORTNAME}-project/${PORTNAME}/repository/archive.tar.gz?ref=${DISTVERSIONPREFIX}${PORTVERSION}&dummy=/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple CalDAV server using a postgres backend
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
 		p5-YAML>=0:textproc/p5-YAML \
 		p5-DBD-Pg>=0:databases/p5-DBD-Pg \
 		${LOCALBASE}/bin/pwgen:sysutils/pwgen \
 		php-libawl>=0.54:devel/php-libawl
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	DAViCal
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${PORTVERSION}-7ccc7c449176475891ec50d5524928628df6f8d1
 
 NO_BUILD=	yes
+USES=		shebangfix pgsql php
 USE_PHP=	gettext iconv pcre pdo pdo_pgsql pgsql xml calendar
-USES=		shebangfix pgsql
 SHEBANG_FILES=	scripts/sync-remote-caldav.php
 SUB_FILES=	pkg-message httpd-davical.conf
-PORTDOCS=	api website \
-		README INSTALL davical_en_user_guide.odt translation.rst
+PORTDOCS=	README INSTALL davical_en_user_guide.odt translation.rst \
+		phpdoc.ini
 PORTEXAMPLES=	config
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-extract:
-	@${FIND} ${WRKSRC} -name .gitignore -delete
+	${FIND} ${WRKSRC} -name .gitignore -delete
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}/htdocs \
 		${STAGEDIR}${WWWDIR}/inc \
 		${STAGEDIR}${WWWDIR}/config \
 		${STAGEDIR}${EXAMPLESDIR} \
 		${STAGEDIR}${DATADIR} \
 		${STAGEDIR}${DOCSDIR}
 	# WWWDIR
 	(cd ${WRKSRC}/htdocs && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/htdocs)
 	(cd ${WRKSRC}/inc && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${WWWDIR}/inc "! -name always.php.in")
 	${INSTALL_DATA} ${WRKSRC}/config/example-config.php \
 		${STAGEDIR}${WWWDIR}/config/config.php.sample
 	# DATADIR
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} scripts ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} dba ${STAGEDIR}${DATADIR} \
 		"! -name update-davical-database")
 	${INSTALL_DATA} ${WRKDIR}/httpd-davical.conf ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/dba/update-davical-database \
 		${STAGEDIR}${DATADIR}/dba
 	# DOCSDIR
 	(cd ${WRKSRC}/docs && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
 	# EXAMPLESDIR
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} config ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
Index: head/www/davical/distinfo
===================================================================
--- head/www/davical/distinfo	(revision 433085)
+++ head/www/davical/distinfo	(revision 433086)
@@ -1,2 +1,3 @@
-SHA256 (DAViCal-davical-r1.1.2_GH0.tar.gz) = 9e4f3ea3664781035b443821a48f15fa483066070e03cafe711906e815193f07
-SIZE (DAViCal-davical-r1.1.2_GH0.tar.gz) = 2986022
+TIMESTAMP = 1485803035
+SHA256 (davical-r1.1.5.tar.gz) = 3b4e1e3007eb0261cdd23544a5516bb46085cdfa2954ab4a35443d762eedd19c
+SIZE (davical-r1.1.5.tar.gz) = 1781265
Index: head/www/davical/files/patch-htdocs_caldav.php
===================================================================
--- head/www/davical/files/patch-htdocs_caldav.php	(revision 433085)
+++ head/www/davical/files/patch-htdocs_caldav.php	(revision 433086)
@@ -1,11 +1,11 @@
---- htdocs/caldav.php.orig	2013-07-15 01:12:05 UTC
+--- htdocs/caldav.php.orig	2017-01-30 20:16:26 UTC
 +++ htdocs/caldav.php
-@@ -114,6 +114,8 @@ switch ( $request->method ) {
-       include('caldav-POST.php');
-       break;
-     }
-+    error_log('the value of add_member is : ', $add_member);
-+    $add_member = true;
-   case 'PUT':
-     switch( $request->content_type ) {
-       case 'text/calendar':
+@@ -119,6 +119,8 @@ try {
+         include('caldav-POST.php');
+         break;
+       }
++      error_log('the value of add_member is : ', $add_member);
++      $add_member = true;
+       // fall through if POST add member
+     case 'PUT':
+       switch( $request->content_type ) {
Index: head/www/davical/pkg-plist
===================================================================
--- head/www/davical/pkg-plist	(revision 433085)
+++ head/www/davical/pkg-plist	(revision 433086)
@@ -1,147 +1,150 @@
 %%DATADIR%%/dba/appuser_permissions.txt
 %%DATADIR%%/dba/base-data.sql
 %%DATADIR%%/dba/better_perms.sql
 %%DATADIR%%/dba/caldav_functions.sql
 %%DATADIR%%/dba/create-database.sh
 %%DATADIR%%/dba/davical.sql
 %%DATADIR%%/dba/patches/1.1.10.sql
 %%DATADIR%%/dba/patches/1.1.11.sql
 %%DATADIR%%/dba/patches/1.1.11a.sql
 %%DATADIR%%/dba/patches/1.1.12.sql
 %%DATADIR%%/dba/patches/1.1.12a.sql
 %%DATADIR%%/dba/patches/1.1.2.sql
 %%DATADIR%%/dba/patches/1.1.3.sql
 %%DATADIR%%/dba/patches/1.1.4.sql
 %%DATADIR%%/dba/patches/1.1.5.sql
 %%DATADIR%%/dba/patches/1.1.6.sql
 %%DATADIR%%/dba/patches/1.1.7.sql
 %%DATADIR%%/dba/patches/1.1.8.sql
 %%DATADIR%%/dba/patches/1.1.9.sql
 %%DATADIR%%/dba/patches/1.2.1.sql
 %%DATADIR%%/dba/patches/1.2.10.sql
 %%DATADIR%%/dba/patches/1.2.10a.sql
 %%DATADIR%%/dba/patches/1.2.11.sql
+%%DATADIR%%/dba/patches/1.2.12.sql
 %%DATADIR%%/dba/patches/1.2.1a.sql
 %%DATADIR%%/dba/patches/1.2.1b.sql
 %%DATADIR%%/dba/patches/1.2.2.sql
 %%DATADIR%%/dba/patches/1.2.3.sql
 %%DATADIR%%/dba/patches/1.2.3a.sql
 %%DATADIR%%/dba/patches/1.2.4.sql
 %%DATADIR%%/dba/patches/1.2.5.sql
 %%DATADIR%%/dba/patches/1.2.6.sql
 %%DATADIR%%/dba/patches/1.2.7.sql
 %%DATADIR%%/dba/patches/1.2.8.sql
 %%DATADIR%%/dba/patches/1.2.9.sql
+%%DATADIR%%/dba/patches/1.3.1.sql
+%%DATADIR%%/dba/patches/1.3.2.sql
 %%DATADIR%%/dba/rrule_functions-8.1.sql
 %%DATADIR%%/dba/rrule_functions.sql
 %%DATADIR%%/dba/rrule_tests.sql
 %%DATADIR%%/dba/supported_locales.sql
 %%DATADIR%%/dba/update-davical-database
 %%DATADIR%%/dba/views/dav_principal.sql
 %%DATADIR%%/dba/windows/create-database.bat
 %%DATADIR%%/httpd-davical.conf
 %%DATADIR%%/scripts/archive-old-events.php
 %%DATADIR%%/scripts/build-always.sh
 %%DATADIR%%/scripts/cron-sync-ldap.php
+%%DATADIR%%/scripts/davical-cli
 %%DATADIR%%/scripts/export_calendar.php
 %%DATADIR%%/scripts/load_calendar.php
 %%DATADIR%%/scripts/po/rebuild-translations.sh
 %%DATADIR%%/scripts/refresh-alarms.php
 %%DATADIR%%/scripts/sync-remote-caldav.php
 %%DATADIR%%/scripts/tz-update.php
-@sample %%WWWDIR%%/config/config.php.sample
 %%WWWDIR%%/htdocs/.htaccess
 %%WWWDIR%%/htdocs/admin.php
 %%WWWDIR%%/htdocs/always.php
 %%WWWDIR%%/htdocs/caldav.php
 %%WWWDIR%%/htdocs/css/browse.css
 %%WWWDIR%%/htdocs/css/edit.css
 %%WWWDIR%%/htdocs/davical.css
 %%WWWDIR%%/htdocs/feed.php
 %%WWWDIR%%/htdocs/freebusy.php
 %%WWWDIR%%/htdocs/help.php
 %%WWWDIR%%/htdocs/iSchedule.php
 %%WWWDIR%%/htdocs/images/down.gif
 %%WWWDIR%%/htdocs/images/up.gif
 %%WWWDIR%%/htdocs/index.php
 %%WWWDIR%%/htdocs/js/browse.js
+%%WWWDIR%%/htdocs/metrics.php
 %%WWWDIR%%/htdocs/public.php
 %%WWWDIR%%/htdocs/robots.txt
 %%WWWDIR%%/htdocs/setup.php
 %%WWWDIR%%/htdocs/tools.php
 %%WWWDIR%%/htdocs/tz.php
 %%WWWDIR%%/htdocs/upgrade.php
 %%WWWDIR%%/inc/AtomFeed.php
 %%WWWDIR%%/inc/CalDAVRequest.php
 %%WWWDIR%%/inc/DAVPrincipal.php
 %%WWWDIR%%/inc/DAVResource.php
 %%WWWDIR%%/inc/DAVTicket.php
 %%WWWDIR%%/inc/DAViCalSession.php
 %%WWWDIR%%/inc/HTTPAuthSession.php
 %%WWWDIR%%/inc/Principal.php
 %%WWWDIR%%/inc/PublicSession.php
-%%WWWDIR%%/inc/RRule-v2.php
 %%WWWDIR%%/inc/RRule.php
 %%WWWDIR%%/inc/WritableCollection.php
 %%WWWDIR%%/inc/auth-functions.php
 %%WWWDIR%%/inc/autodiscover-handler.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-functions.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-vcalendar.php
 %%WWWDIR%%/inc/caldav-PUT-vcard.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
 %%WWWDIR%%/inc/caldav-REPORT-pps-set.php
 %%WWWDIR%%/inc/caldav-REPORT-principal-match.php
 %%WWWDIR%%/inc/caldav-REPORT-principal.php
 %%WWWDIR%%/inc/caldav-REPORT-sync-collection.php
 %%WWWDIR%%/inc/caldav-REPORT.php
 %%WWWDIR%%/inc/caldav-client-v2.php
 %%WWWDIR%%/inc/caldav-client.php
 %%WWWDIR%%/inc/check_UTF8.php
 %%WWWDIR%%/inc/davical_configuration_missing.php
 %%WWWDIR%%/inc/drivers_imap_pam.php
 %%WWWDIR%%/inc/drivers_ldap.php
 %%WWWDIR%%/inc/drivers_pwauth_pam.php
 %%WWWDIR%%/inc/drivers_rimap.php
 %%WWWDIR%%/inc/drivers_squid_pam.php
 %%WWWDIR%%/inc/external-fetch.php
 %%WWWDIR%%/inc/freebusy-functions.php
 %%WWWDIR%%/inc/iSchedule-POST.php
 %%WWWDIR%%/inc/iSchedule.php
 %%WWWDIR%%/inc/interactive-page.php
 %%WWWDIR%%/inc/log_caldav_action.php
 %%WWWDIR%%/inc/other_translated_strings.php
 %%WWWDIR%%/inc/page-footer.php
 %%WWWDIR%%/inc/page-header.php
 %%WWWDIR%%/inc/pubsub.php
 %%WWWDIR%%/inc/schedule-functions.php
-%%WWWDIR%%/inc/test-RRULE.php
 %%WWWDIR%%/inc/tz/capabilities.php
 %%WWWDIR%%/inc/tz/expand.php
 %%WWWDIR%%/inc/tz/get.php
 %%WWWDIR%%/inc/tz/list.php
 %%WWWDIR%%/inc/ui/collection-edit.php
 %%WWWDIR%%/inc/ui/external-browse.php
 %%WWWDIR%%/inc/ui/principal-browse.php
 %%WWWDIR%%/inc/ui/principal-edit.php
 %%WWWDIR%%/inc/vcard.php
 %%WWWDIR%%/inc/vtimezone.php
 %%WWWDIR%%/inc/well-known.php
+@sample %%WWWDIR%%/config/config.php.sample