svn commit: r411661 - in head/multimedia: ffmpeg ffmpeg0 libav

[Jan Beich]

Author: jbeich
Date: Tue Mar 22 13:39:59 2016
New Revision: 411661
URL: https://svnweb.freebsd.org/changeset/ports/411661

Log:
  multimedia/ffmpeg: chase r405873 by clarifying license
  
  From on WRKSRC/configure:
  
    license="LGPL version 2.1 or later"
    if enabled nonfree; then
        license="nonfree and unredistributable"
    elif enabled gplv3; then
        license="GPL version 3 or later"
    elif enabled lgplv3; then
        license="LGPL version 3 or later"
    elif enabled gpl; then
        license="GPL version 2 or later"
    fi

Modified:
  head/multimedia/ffmpeg/Makefile   (contents, props changed)
  head/multimedia/ffmpeg0/Makefile   (contents, props changed)
  head/multimedia/libav/Makefile   (contents, props changed)

Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile	Tue Mar 22 13:14:58 2016	(r411660)
+++ head/multimedia/ffmpeg/Makefile	Tue Mar 22 13:39:59 2016	(r411661)
@@ -10,7 +10,7 @@ MASTER_SITES=	http://ffmpeg.org/releases
 MAINTAINER=	multimedia at 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
 

Modified: head/multimedia/ffmpeg0/Makefile
==============================================================================
--- head/multimedia/ffmpeg0/Makefile	Tue Mar 22 13:14:58 2016	(r411660)
+++ head/multimedia/ffmpeg0/Makefile	Tue Mar 22 13:39:59 2016	(r411661)
@@ -12,7 +12,7 @@ PKGNAMESUFFIX=	0
 MAINTAINER=	wg at 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

Modified: head/multimedia/libav/Makefile
==============================================================================
--- head/multimedia/libav/Makefile	Tue Mar 22 13:14:58 2016	(r411660)
+++ head/multimedia/libav/Makefile	Tue Mar 22 13:39:59 2016	(r411661)
@@ -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: