www/davical: update 1.1.2 -> 1.1.5

- moved MASTER_SITE to gitlab
- Please note that there are long-standing sync issues with KDE
  Korganizer (and Kontact) clients when there are multiple clients
  syncing to the same calendar.
  For example, see https://bugs.kde.org/show_bug.cgi?id=325224

PR:		215847
Changes:	https://gitlab.com/davical-project/davical/blob/master/ChangeLog
Submitted by:	packet@nerdheim.de

4 files changed, 26 insertions, 23 deletions

diff --git a/www/davical/Makefile b/www/davical/Makefile
index 999fd776daf0..42103b5c5acc 100644
--- a/www/davical/Makefile
+++ b/www/davical/Makefile
@@ -2,10 +2,10 @@
 # $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
@@ -20,22 +20,21 @@ RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
 		${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 \
diff --git a/www/davical/distinfo b/www/davical/distinfo
index 1986fa87220c..6cd0f9537661 100644
--- a/www/davical/distinfo
+++ b/www/davical/distinfo
@@ -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
diff --git a/www/davical/files/patch-htdocs_caldav.php b/www/davical/files/patch-htdocs_caldav.php
index 5e24af6ee02a..3b8c0a807e77 100644
--- a/www/davical/files/patch-htdocs_caldav.php
+++ b/www/davical/files/patch-htdocs_caldav.php
@@ -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 ) {
diff --git a/www/davical/pkg-plist b/www/davical/pkg-plist
index 685e573c4459..5cb8c764a7f4 100644
--- a/www/davical/pkg-plist
+++ b/www/davical/pkg-plist
@@ -21,6 +21,7 @@
 %%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
@@ -32,6 +33,8 @@
 %%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
@@ -43,13 +46,13 @@
 %%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
@@ -65,6 +68,7 @@
 %%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
@@ -80,7 +84,6 @@
 %%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
@@ -133,7 +136,6 @@
 %%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
@@ -145,3 +147,4 @@
 %%WWWDIR%%/inc/vcard.php
 %%WWWDIR%%/inc/vtimezone.php
 %%WWWDIR%%/inc/well-known.php
+@sample %%WWWDIR%%/config/config.php.sample