git: 5be116444693 - main - RESTRICTED removal, two more ports.

[Mathieu Arnold]

The branch main has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5be116444693389c61fe2cc56d8add238c2f5199

commit 5be116444693389c61fe2cc56d8add238c2f5199
Author:     Mathieu Arnold <mat at FreeBSD.org>
AuthorDate: 2021-05-06 12:23:02 +0000
Commit:     Mathieu Arnold <mat at FreeBSD.org>
CommitDate: 2021-05-06 12:23:02 +0000

    RESTRICTED removal, two more ports.
---
 multimedia/ffmpeg/Makefile | 11 ++++++++++-
 multimedia/x264/Makefile   |  8 ++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 8603a47781e1..6e6f5891b3f0 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -610,7 +610,6 @@ LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING.GPLv3
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/COPYING.LGPLv3
 
 NONFREE_CONFIGURE_ENABLE=nonfree
-NONFREE_VARS=		RESTRICTED="enabling OPENSSL or FDK_AAC restricts redistribution"
 
 INSTALL_TARGET=	install-progs install-doc install-data \
 		install-libs install-headers install-examples
@@ -641,6 +640,16 @@ DOC_FILES=	Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \
 DOC_DOCFILES=	APIchanges *.txt
 PORTDOCS=	*
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNONFREE}
+LICENSE+=	NONFREE
+LICENSE_COMB=	multi
+LICENSE_NAME_NONFREE=	Non free code
+LICENSE_TEXT_NONFREE=	enabling OPENSSL or FDK_AAC restricts redistribution
+LICENSE_PERMS_NONFREE=	auto-accept
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == powerpc64 && ${PORT_OPTIONS:MLTO} && ${CHOSEN_COMPILER_TYPE} == clang
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 8cb3626e5a50..434d005f329b 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -94,8 +94,12 @@ PGO_ALL_TARGET=		fprofiled
 Y4M_VIDEO=		example.y4m
 Y4M_VIDEO_DISTFILE=	example.y4m.bz2
 PGO_VARS=		USE_GCC=any \
-			RESTRICTED="${Y4M_VIDEO_DISTFILE} file may not be mirrored" \
-			RESTRICTED_FILES="${Y4M_VIDEO_DISTFILE}"
+			LICENSE+=PGO LICENSE_COMB=multi
+
+# ${Y4M_VIDEO_DISTFILE} file may not be mirrored
+LICENSE_NAME_PGO=	PGO
+LICENSE_DISTFILES_PGO=	${Y4M_VIDEO_DISTFILE}
+LICENSE_PERMS_PGO=	auto-accept
 
 SWSCALE_LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg \
 			libswscale.so:multimedia/ffmpeg