Index: head/www/davical/Makefile
===================================================================
--- head/www/davical/Makefile	(revision 452930)
+++ head/www/davical/Makefile	(revision 452931)
@@ -1,70 +1,70 @@
 # Created by: Maurice Castro <maurice@castro.aus.net>
 # $FreeBSD$
 
 PORTNAME=	davical
 DISTVERSIONPREFIX=	r
 DISTVERSION=	1.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	www
 MASTER_SITES=	https://gitlab.com/${PORTNAME}-project/${PORTNAME}/repository/archive.tar.gz?ref=${DISTVERSIONPREFIX}${PORTVERSION}&dummy=/
 
 MAINTAINER=	lbdm@privacychain.ch
 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
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${PORTVERSION}-7ccc7c449176475891ec50d5524928628df6f8d1
 
 NO_BUILD=	yes
 USES=		pgsql php shebangfix
 USE_PHP=	calendar curl gettext iconv pcre pdo pdo_pgsql pgsql xml
 SHEBANG_FILES=	scripts/sync-remote-caldav.php
 SUB_FILES=	pkg-message httpd-davical.conf
 PORTDOCS=	README INSTALL davical_en_user_guide.odt phpdoc.ini \
 		translation.rst
 PORTEXAMPLES=	config
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-extract:
 	${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/files/patch-git_39001794
===================================================================
--- head/www/davical/files/patch-git_39001794	(nonexistent)
+++ head/www/davical/files/patch-git_39001794	(revision 452931)
@@ -0,0 +1,59 @@
+From 39001794a3121c33c8cba50398b653a94328be40 Mon Sep 17 00:00:00 2001
+From: Florian Schlichting <fsfs@debian.org>
+Date: Tue, 3 Oct 2017 22:36:29 +0200
+Subject: [PATCH] Update caldav_functions.sql for Postgresql 10
+
+From version 10, Postgresql does not allow set-returning functions in
+CASE statements. As we're using the functions recursively, we cannot
+use LATERAL as suggested in the error message, but we can switch the
+condition inside-out with only a limited amount of repetition.
+
+--- dba/caldav_functions.sql
++++ dba/caldav_functions.sql
+@@ -897,21 +897,37 @@ LANGUAGE plpgsql IMMUTABLE STRICT;
+ 
+ -- Expanded group memberships out to some depth
+ CREATE or REPLACE FUNCTION expand_memberships( INT8, INT ) RETURNS SETOF INT8 AS $$
+-  SELECT group_id FROM group_member WHERE member_id = $1
+-      UNION
+-  SELECT expanded.g_id FROM (SELECT CASE WHEN $2 > 0 THEN expand_memberships( group_id, $2 - 1) END AS g_id
+-                               FROM group_member WHERE member_id = $1) AS expanded
+-                       WHERE expanded.g_id IS NOT NULL;
+-$$ LANGUAGE sql STABLE STRICT;
++BEGIN
++  IF $2 > 0 THEN
++    RETURN QUERY
++      SELECT group_id FROM group_member WHERE member_id = $1
++        UNION
++      SELECT expanded.g_id FROM (SELECT expand_memberships( group_id, $2 - 1) AS g_id
++                                 FROM group_member WHERE member_id = $1) AS expanded
++                            WHERE expanded.g_id IS NOT NULL;
++  ELSE
++    RETURN QUERY
++      SELECT group_id FROM group_member WHERE member_id = $1;
++  END IF;
++END
++$$ LANGUAGE plpgsql IMMUTABLE STRICT;
+ 
+ -- Expanded group members out to some depth
+ CREATE or REPLACE FUNCTION expand_members( INT8, INT ) RETURNS SETOF INT8 AS $$
+-  SELECT member_id FROM group_member WHERE group_id = $1
+-      UNION
+-  SELECT expanded.m_id FROM (SELECT CASE WHEN $2 > 0 THEN expand_members( member_id, $2 - 1) END AS m_id
+-                               FROM group_member WHERE group_id = $1) AS expanded
+-                       WHERE expanded.m_id IS NOT NULL;
+-$$ LANGUAGE sql STABLE STRICT;
++BEGIN
++  IF $2 > 0 THEN
++    RETURN QUERY
++      SELECT member_id FROM group_member WHERE group_id = $1
++        UNION
++      SELECT expanded.m_id FROM (SELECT expand_members( member_id, $2 - 1) AS m_id
++                                 FROM group_member WHERE group_id = $1) AS expanded
++                            WHERE expanded.m_id IS NOT NULL;
++  ELSE
++    RETURN QUERY
++      SELECT member_id FROM group_member WHERE group_id = $1;
++  END IF;
++END
++$$ LANGUAGE plpgsql IMMUTABLE STRICT;

Property changes on: head/www/davical/files/patch-git_39001794
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property