From owner-dev-commits-ports-all@freebsd.org Thu May 6 12:16:16 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 DCEDC5FEC77; Thu, 6 May 2021 12:16:16 +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 4FbXcJ5xMZz4cxK; Thu, 6 May 2021 12:16:16 +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 B4E1A1802E; Thu, 6 May 2021 12:16:16 +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 146CGG7C053870; Thu, 6 May 2021 12:16:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 146CGGed053869; Thu, 6 May 2021 12:16:16 GMT (envelope-from git) Date: Thu, 6 May 2021 12:16:16 GMT Message-Id: <202105061216.146CGGed053869@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mathieu Arnold Subject: git: 9b02685c9c93 - main - *: Three ports missed in the RESTRICTED removal. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mat X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b02685c9c93344825d2f6816a53780e3562414f 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: Thu, 06 May 2021 12:16:16 -0000 The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b02685c9c93344825d2f6816a53780e3562414f commit 9b02685c9c93344825d2f6816a53780e3562414f Author: Mathieu Arnold AuthorDate: 2021-05-06 12:15:35 +0000 Commit: Mathieu Arnold CommitDate: 2021-05-06 12:15:35 +0000 *: Three ports missed in the RESTRICTED removal. --- emulators/virtualbox-ose-legacy/Makefile | 7 +++++-- emulators/virtualbox-ose/Makefile | 7 +++++-- multimedia/libav/Makefile | 9 ++++++++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile index 4863f1c5590d..81a872060084 100644 --- a/emulators/virtualbox-ose-legacy/Makefile +++ b/emulators/virtualbox-ose-legacy/Makefile @@ -132,8 +132,11 @@ KMK_BUILDTYPE= release .if ${PORT_OPTIONS:MGUESTADDITIONS} GUESTADDITIONS= VBoxGuestAdditions_${PORTVERSION}.iso -RESTRICTED= for personal use only -RESTRICTED_FILES= ${GUESTADDITIONS} +LICENSE+= Additions +LICENSE_COMB= multi +LICENSE_NAME_Additions= Guest Additions +LICENSE_PERMS_Additions= auto-accept +LICENSE_DISTFILES_Additions= ${GUESTADDITIONS} .endif .if ${PORT_OPTIONS:MMANUAL} diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 41b2a607842f..bc7ef3e08e17 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -131,8 +131,11 @@ KMK_BUILDTYPE= release .if ${PORT_OPTIONS:MGUESTADDITIONS} GUESTADDITIONS= VBoxGuestAdditions_${PORTVERSION}.iso -RESTRICTED= for personal use only -RESTRICTED_FILES= ${GUESTADDITIONS} +LICENSE+= Additions +LICENSE_COMB= multi +LICENSE_NAME_Additions= Guest Additions +LICENSE_PERMS_Additions= auto-accept +LICENSE_DISTFILES_Additions= ${GUESTADDITIONS} .endif .if ${PORT_OPTIONS:MMANUAL} diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile index 9363d8f652bb..25b028372ba7 100644 --- a/multimedia/libav/Makefile +++ b/multimedia/libav/Makefile @@ -192,7 +192,6 @@ USES+= compiler:c++11-lang # License definitions .if ${PORT_OPTIONS:MFAAC} || ${PORT_OPTIONS:MFDK_AAC} || ${PORT_OPTIONS:MOPENSSL} -RESTRICTED= linking to libfaac or libaacplus or using OpenSSL support restricts redistribution CONFIGURE_ARGS+= --enable-nonfree AV_NONFREE= true .endif @@ -219,6 +218,14 @@ LICENSE= LGPL3+ LICENSE= LGPL21+ .endif +.if defined(AV_NONFREE) +LICENSE+= AV +LICENSE_COMB= multi +LICENSE_NAME_AV= Restricted redistribution +LICENSE_TEXT_AV= linking to libfaac or libaacplus or using OpenSSL support restricts redistribution +LICENSE_PERMS_AV= auto-accept +.endif + post-patch: @${REINPLACE_CMD} -e 's|freetype/freetype.h|freetype2/freetype.h|' \ -e 's|-ldc1394 -lraw1394|-ldc1394|' \