git: 9367fd9f7092 - main - x11-themes/kde-icons-nuovext2: Unbreak build after 3505159e72da2d8313ce2a8ddc527de700b5bc37

[Tobias Kortkamp]

The branch main has been updated by tobik:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9367fd9f7092c4bdfa22c6877cba54a30a2214e1

commit 9367fd9f7092c4bdfa22c6877cba54a30a2214e1
Author:     Tobias Kortkamp <tobik at FreeBSD.org>
AuthorDate: 2021-05-15 09:10:24 +0000
Commit:     Tobias Kortkamp <tobik at FreeBSD.org>
CommitDate: 2021-05-15 09:20:05 +0000

    x11-themes/kde-icons-nuovext2: Unbreak build after 3505159e72da2d8313ce2a8ddc527de700b5bc37
    
    ===>  License not correctly defined: defining both LICENSE_FILE and LICENSE_TEXT is not allowed
---
 x11-themes/kde-icons-noia/Makefile.icons | 18 +++++++++++++-----
 x11-themes/kde-icons-nuovext2/Makefile   |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

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
@@ -9,12 +9,20 @@ 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
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
@@ -9,7 +9,7 @@ MAINTAINER=	portmaster at BSDforge.com
 COMMENT=	KDE nuoveXT 2 iconset
 
 LICENSE=	LGPL3
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING
 
 USES=		tar:xz