Index: head/mail/roundcube-carddav/Makefile
===================================================================
--- head/mail/roundcube-carddav/Makefile	(revision 557425)
+++ head/mail/roundcube-carddav/Makefile	(revision 557426)
@@ -1,40 +1,41 @@
 # Created by: gahr
 # $FreeBSD$
 
 PORTNAME=	carddav
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/blind-coder/rcmcarddav/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	roundcube-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Roundcube CardDAV plugin
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.0:mail/roundcube@${PHP_FLAVOR}
 RUN_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.0:mail/roundcube@${PHP_FLAVOR}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 # Cannot use USE_GITHUB, as the original tarball doesn't come with the bundled
 # sabre library.
 #USE_GITHUB=	yes
 #GH_ACCOUNT=	blind-coder
 #GH_PROJECT=	rcmcarddav
 
 USES=		php:flavors tar:bz2
 USE_PHP=	simplexml sockets curl
 
 WWWDIR=		${PREFIX}/www/roundcube/plugins/carddav
 
 do-install:
 	${FIND} ${WRKSRC} -name "*.orig" -delete
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	cd ${WRKSRC} && ${PAX} -r -w . ${STAGEDIR}${WWWDIR}
 
 .include <bsd.port.mk>
Index: head/mail/roundcube-carddav/files/patch-carddav.php
===================================================================
--- head/mail/roundcube-carddav/files/patch-carddav.php	(nonexistent)
+++ head/mail/roundcube-carddav/files/patch-carddav.php	(revision 557426)
@@ -0,0 +1,20 @@
+--- carddav.php.orig	2020-12-10 08:52:54 UTC
++++ carddav.php
+@@ -349,8 +349,15 @@ class carddav extends rcube_plugin
+ 
+ 		if (self::no_override('username', $abook, $prefs)) {
+ 			// %V parses username for macosx, replaces periods and @ by _, work around bugs in contacts.app
+-			$content_username = $abook['username'] === '%V' ? str_replace('@','_', str_replace('.','_',$_SESSION['username'])) : $abook['username'] === '%u' ? $_SESSION['username'] : $abook['username'] === '%l' ? $rcmail->user->get_username('local') : $abook['username'];
+-
++			if ($abook['username'] === '%V') {
++				$content_username = str_replace('@','_', str_replace('.','_',$_SESSION['username']));
++			} elseif ($abook['username'] === '%u') {
++				$content_username = $_SESSION['username'];
++			} elseif ($abook['username'] === '%l') {
++				$content_username = $rcmail->user->get_username('local');
++			} else {
++				$content_username = $abook['username'];
++			}
+ 		} else {
+ 			// input box for username
+ 			$input = new html_inputfield(array('name' => $abookid.'_cd_username', 'type' => 'text', 'autocomplete' => 'off', 'value' => $abook['username']));

Property changes on: head/mail/roundcube-carddav/files/patch-carddav.php
___________________________________________________________________
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