From owner-dev-commits-ports-all@freebsd.org Sat May 15 09:20:43 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 69D3563FAC0; Sat, 15 May 2021 09:20:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fj0Hb1ypJz3PBx; Sat, 15 May 2021 09:20:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C7E2D22D32; Sat, 15 May 2021 09:20:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14F9KgQT071026; Sat, 15 May 2021 09:20:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14F9KgvE071025; Sat, 15 May 2021 09:20:42 GMT (envelope-from git) Date: Sat, 15 May 2021 09:20:42 GMT Message-Id: <202105150920.14F9KgvE071025@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: 9367fd9f7092 - main - x11-themes/kde-icons-nuovext2: Unbreak build after 3505159e72da2d8313ce2a8ddc527de700b5bc37 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9367fd9f7092c4bdfa22c6877cba54a30a2214e1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 May 2021 09:20:43 -0000 The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=9367fd9f7092c4bdfa22c6877cba54a30a2214e1 commit 9367fd9f7092c4bdfa22c6877cba54a30a2214e1 Author: Tobias Kortkamp AuthorDate: 2021-05-15 09:10:24 +0000 Commit: Tobias Kortkamp 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@BSDforge.com COMMENT= KDE nuoveXT 2 iconset LICENSE= LGPL3 -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING USES= tar:xz