Index: mail/rainloop/Makefile
===================================================================
--- mail/rainloop/Makefile	(revision 540341)
+++ mail/rainloop/Makefile	(working copy)
@@ -4,11 +4,12 @@
 PORTVERSION=	1.14.0
 CATEGORIES=	mail www
 MASTER_SITES=	https://github.com/RainLoop/rainloop-webmail/releases/download/v${PORTVERSION}/
+PKGNAMESUFFIX?=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@utahime.org
 COMMENT?=	Modern and interactive webmail
 
-.if !defined(PKGNAMESUFFIX)
+.if "${PKGNAMESUFFIX"} == "${PHP_PKGNAMESUFFIX}"
 LICENSE=	RainLoop
 LICENSE_NAME=	RainLoop Software License
 LICENSE_TEXT=	License can be found at: http://www.rainloop.net/licensing/
@@ -15,10 +16,7 @@
 LICENSE_PERMS=	auto-accept
 .endif
 
-.if !defined(PKGNAMESUFFIX)
-RESTRICTED=	Redistribution in any form is prohibited
-.endif
-USES=		php:web zip
+USES=		php:web,flavors zip
 NO_BUILD=	yes
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
@@ -25,6 +23,10 @@
 USE_PHP=	curl iconv json xml dom openssl pcre spl zlib
 PLIST_SUB=	VER="${PORTVERSION}" WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
+.if "${PKGNAMESUFFIX}" == "${PHP_PKGNAMESUFFIX}"
+RESTRICTED=	Redistribution in any form is prohibited
+.endif
+
 OPTIONS_RADIO=		DB
 OPTIONS_RADIO_DB=	MYSQL PGSQL SQLITE
 OPTIONS_DEFAULT=	SQLITE
Index: mail/rainloop-community/Makefile
===================================================================
--- mail/rainloop-community/Makefile	(revision 540341)
+++ mail/rainloop-community/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	rainloop
 DISTVERSIONPREFIX=	community-
-PKGNAMESUFFIX=	-community
+PKGNAMESUFFIX=	-community${PHP_PKGNAMESUFFIX}
 
 COMMENT=	Modern and interactive webmail - community edition