diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-03-22 13:39:59 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-03-22 13:39:59 +0000 |
| commit | bbb7a892a1a9e9527b523111d11c05f5a5549278 (patch) | |
| tree | 2c028b749daa2656c57978a41c2ce23369b72e6a | |
| parent | d47418b901ce9887ea7b5dd0b8e9e2ef8e146e50 (diff) | |
| download | ports-bbb7a892a1a9e9527b523111d11c05f5a5549278.tar.gz ports-bbb7a892a1a9e9527b523111d11c05f5a5549278.zip | |
Notes
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg0/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/libav/Makefile | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index f40c15014da6..40cf23810a6c 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= http://ffmpeg.org/releases/ MAINTAINER= multimedia@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server -LICENSE= GPLv2 LGPL21 +LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ @@ -383,7 +383,7 @@ ZVBI_CONFIGURE_ENABLE= libzvbi # License knobs GPL3_CONFIGURE_ENABLE= version3 -GPL3_VARS= LICENSE="GPLv3 LGPL3" +GPL3_VARS= LICENSE="GPLv3+ LGPL3+" LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile index 1d35314d5009..ae09f9f6d88c 100644 --- a/multimedia/ffmpeg0/Makefile +++ b/multimedia/ffmpeg0/Makefile @@ -12,7 +12,7 @@ PKGNAMESUFFIX= 0 MAINTAINER= wg@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server -LICENSE= GPLv2 LGPL21 +LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2 LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPLv2.1 @@ -303,7 +303,7 @@ CONFIGURE_ARGS+= --enable-nonfree .endif .if defined(FFMPEG_LICENSE_GPL3) -LICENSE+= GPLv3 LGPL3 +LICENSE+= GPLv3+ LGPL3+ LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 CONFIGURE_ARGS+= --enable-version3 diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile index d445f6c3746f..738e29dfd269 100644 --- a/multimedia/libav/Makefile +++ b/multimedia/libav/Makefile @@ -182,7 +182,7 @@ AV_NONFREE= true .if ${PORT_OPTIONS:MCDIO} || ${PORT_OPTIONS:MX264} || ${PORT_OPTIONS:MXVID} || ${PORT_OPTIONS:MX11GRAB} CONFIGURE_ARGS+= --enable-gpl .if !defined(AV_NONFREE) -LICENSE= GPLv2 +LICENSE= GPLv2+ AV_ISGPL= true .endif .endif @@ -191,15 +191,15 @@ AV_ISGPL= true CONFIGURE_ARGS+= --enable-version3 .if !defined(AV_NONFREE) .if defined(AV_ISGPL) -LICENSE= GPLv3 +LICENSE= GPLv3+ .else -LICENSE= LGPL3 +LICENSE= LGPL3+ .endif .endif .endif .if !defined(AV_NONFREE) && !defined(AV_ISGPL) && !defined(LICENSE) -LICENSE= LGPL21 +LICENSE= LGPL21+ .endif post-patch: |