Index: head/mail/rainloop/Makefile
===================================================================
--- head/mail/rainloop/Makefile	(revision 541183)
+++ head/mail/rainloop/Makefile	(revision 541184)
@@ -1,44 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	rainloop
 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/
 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
 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
 
 MYSQL_USE=	PHP=pdo_mysql
 PGSQL_USE=	PHP=pdo_pgsql
 SQLITE_USE=	PHP=pdo_sqlite
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}/data
 	${INSTALL_DATA} ${WRKSRC}/data/* ${STAGEDIR}${WWWDIR}/data
 	${INSTALL_DATA} ${WRKSRC}/index.php ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} rainloop ${STAGEDIR}${WWWDIR})
 # Prune empty dirs
 	@${FIND} ${STAGEDIR}${WWWDIR}/${PORTNAME}/v/${PORTVERSION} -type d -empty -delete
 
 .include <bsd.port.mk>
Index: head/mail/rainloop-community/Makefile
===================================================================
--- head/mail/rainloop-community/Makefile	(revision 541183)
+++ head/mail/rainloop-community/Makefile	(revision 541184)
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
 PORTNAME=	rainloop
 DISTVERSIONPREFIX=	community-
-PKGNAMESUFFIX=	-community
+PKGNAMESUFFIX=	-community${PHP_PKGNAMESUFFIX}
 
 COMMENT=	Modern and interactive webmail - community edition
 
 LICENSE=	AGPLv3
 
 MASTERDIR=	${.CURDIR}/../rainloop
 DISTINFO_FILE=	${.CURDIR}/distinfo
 PLIST=		${.CURDIR}/pkg-plist
 
 CONFLICTS_INSTALL=	rainloop-[0-9]*
 
 .include "${MASTERDIR}/Makefile"