diff --git a/x11-themes/kde-icons-noia/Makefile.icons b/x11-themes/kde-icons-noia/Makefile.icons
index d59a46737154..d99eded230c0 100644
--- a/x11-themes/kde-icons-noia/Makefile.icons
+++ b/x11-themes/kde-icons-noia/Makefile.icons
@@ -1,96 +1,104 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 
 CATEGORIES?=	x11-themes kde
 PKGNAMEPREFIX=	kde-icons-
 DIST_SUBDIR=	KDE
 
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	KDE iconset theme
 
 .ifndef(WITHOUT_RESTRICTIONS)
 # Converted from RESTRICTED
+LICENSE_NAME_theme=	theme
+LICENSE_TEXT_theme=	may contain iconic, visual, graphical or other\
+			elements that may not be distributed without the\
+			consent of either the trademark or the patent holder
+LICENSE_PERMS_theme=	auto-accept
+.if defined(LICENSE)
+LICENSE+=	theme
+LICENSE_COMB=	multi
+.else
 LICENSE=	theme
-LICENSE_NAME=	theme
-LICENSE_TEXT?=	may contain iconic, visual, graphical or other\
-		elements that may not be distributed without the\
-		consent of either the trademark or the patent holder
-LICENSE_PERMS=	auto-accept
+LICENSE_NAME=	${LICENSE_NAME_theme}
+LICENSE_TEXT=	${LICENSE_TEXT_theme}
+LICENSE_PERMS=	${LICENSE_PERMS_theme}
+.endif
 .endif
 
 NO_BUILD=	yes
 
 # default installation directory
 PORT_SHAREDIR?=	${DISTNAME}
 
 INDEX_FILES=	index.desktop index.theme
 
 # do not create some dirs
 PLIST_DIR_PATTERN=	-v ^\.$$
 PLIST_DIR_PATTERN_EXTRA?=	^\./
 
 # do not install some files
 PLIST_FILE_PATTERN=	-i -v "(Thumbs\.db|(\.(bak|txt)|/(copying|readme))\$$)"
 PLIST_FILE_PATTERN_EXTRA?=	.
 
 post-patch:
 # correctly inherits crystal per default
 .for file in ${INDEX_FILES}
 	@if [ -f ${WRKSRC:Q}/${file:Q} ]; then \
 		${REINPLACE_CMD} -E \
 		-e 's|
||' \
 		-e 's|^Inherits.*$$|Inherits=crystalsvg|' \
 		${WRKSRC:Q}/${file:Q} ; \
 		fi
 .endfor
 
 # annotate what should be installed
 annotate-install:
 # annotate dirs
 	@cd ${WRKSRC} ; ${FIND} . -type d ! -empty \
 		| ${GREP} -E ${PLIST_DIR_PATTERN} \
 		| ${GREP} -E ${PLIST_DIR_PATTERN_EXTRA} \
 		| ${SORT} -r \
 		> ${WRKDIR}/dirs.list
 # annotate files
 	@cd ${WRKSRC} ; ${FIND} . -type f ! -empty \
 		| ${GREP} -E ${PLIST_FILE_PATTERN} \
 		| ${GREP} -E ${PLIST_FILE_PATTERN_EXTRA} \
 		| ${SORT} \
 		> ${WRKDIR}/files.list
 
 # prepare scripts for installation based on aforementioned annotations
 generate-install-scripts:
 # annotate dirs
 	@${CAT} ${WRKDIR}/dirs.list \
 		| ${SED} -E \
 			-e 's|^\.(.+)$$|${MKDIR} -m 755 ${STAGEDIR}${PREFIX:Q}/share/icons/${PORT_SHAREDIR:S/"//g:Q}/\"\1\"|' \
 			> ${WRKDIR}/dirs.sh
 # annotate files
 	@${CAT} ${WRKDIR}/files.list \
 		| ${SED} -E \
 			-e 's|^\./(.+)$$|${INSTALL_DATA} ${WRKSRC:Q}/\"\1\" ${STAGEDIR}${PREFIX:Q}/share/icons/${PORT_SHAREDIR:S/"//g:Q}/\"\1\"|' \
 			> ${WRKDIR}/files.sh
 
 # generate on the fly packaging lists based on aforementioned annotations
 generate-tmpplist:
 # annotate files
 	@${CAT} ${WRKDIR}/files.list \
 		| ${SED} -E \
 			-e 's|^\.|share/icons/${PORT_SHAREDIR:S/"//g}|' \
 			> ${TMPPLIST}
 
 # use generated installation scripts
 install-run-scripts:
 .for script in dirs files
 	@${SH} ${WRKDIR}/${script}.sh
 .endfor
 
 do-install: annotate-install generate-install-scripts generate-tmpplist install-run-scripts
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "powerpc" && ${PORTNAME} == "crystal-project"
 BROKEN=		Does not install on powerpc: syntax error in files.sh
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-themes/kde-icons-nuovext2/Makefile b/x11-themes/kde-icons-nuovext2/Makefile
index 848154a35a5d..ce44f6629bad 100644
--- a/x11-themes/kde-icons-nuovext2/Makefile
+++ b/x11-themes/kde-icons-nuovext2/Makefile
@@ -1,16 +1,16 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 
 PORTNAME=	nuoveXT2
 PORTVERSION=	2.2.2
 MASTER_SITES=	https://BSDforge.com/projects/source/x11-themes/kde-icons-nuovext2/
 DISTNAME=	nuoveXT-${PORTVERSION}_KDE
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	KDE nuoveXT 2 iconset
 
 LICENSE=	LGPL3
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING
 
 USES=		tar:xz
 
 .include "${.CURDIR}/../kde-icons-noia/Makefile.icons"