Index: head/www/baikal/Makefile
===================================================================
--- head/www/baikal/Makefile	(revision 438450)
+++ head/www/baikal/Makefile	(revision 438451)
@@ -1,32 +1,32 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	baikal
 PORTVERSION=	0.4.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/fruux/Baikal/releases/download/${PORTVERSION}/
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Lightweight CalDAV/CardDAV server
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		php zip
 USE_PHP=	ctype dom filter imap json mbstring openssl pdo_sqlite \
 		session xml xmlreader xmlwriter
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 SUB_FILES=	pkg-message
 
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 
 .include <bsd.port.mk>
Index: head/www/baikal/files/patch-vendor_sabre_dav_lib_CardDAV_Xml_Filter_AddressData.php
===================================================================
--- head/www/baikal/files/patch-vendor_sabre_dav_lib_CardDAV_Xml_Filter_AddressData.php	(revision 438450)
+++ head/www/baikal/files/patch-vendor_sabre_dav_lib_CardDAV_Xml_Filter_AddressData.php	(revision 438451)
@@ -1,14 +1,14 @@
 --- vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php.orig	2017-04-13 09:07:03 UTC
 +++ vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php
-@@ -51,6 +51,11 @@ class AddressData implements XmlDeserial
+@@ -51,6 +51,10 @@ class AddressData implements XmlDeserial
              'version'     => $reader->getAttribute('version') ?: '3.0',
          ];
  
 +        $elems = (array)$reader->parseInnerTree();
 +        $result['addressDataProperties'] = array_map(function($element) {
 +            return $element['attributes']['name'];
 +        }, $elems);
 +
-         $reader->next();
+-        $reader->next();
          return $result;