Date: Thu, 6 May 2021 12:16:16 GMT From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9b02685c9c93 - main - *: Three ports missed in the RESTRICTED removal. Message-ID: <202105061216.146CGGed053869@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b02685c9c93344825d2f6816a53780e3562414f commit 9b02685c9c93344825d2f6816a53780e3562414f Author: Mathieu Arnold <mat@FreeBSD.org> AuthorDate: 2021-05-06 12:15:35 +0000 Commit: Mathieu Arnold <mat@FreeBSD.org> 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|' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105061216.146CGGed053869>