diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2021-05-06 12:23:02 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2021-05-06 12:23:02 +0000 |
| commit | 5be116444693389c61fe2cc56d8add238c2f5199 (patch) | |
| tree | 4aa9d54e4929e4e35756a2c9580c3ed8f8966d9f | |
| parent | 9b02685c9c93344825d2f6816a53780e3562414f (diff) | |
| download | ports-5be116444693389c61fe2cc56d8add238c2f5199.tar.gz ports-5be116444693389c61fe2cc56d8add238c2f5199.zip | |
RESTRICTED removal, two more ports.
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 11 | ||||
| -rw-r--r-- | 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 |