svn commit: r302164 - in head/multimedia: ffmpeg ffmpeg-devel

[Martin Matuska]

Author: mm
Date: Mon Aug  6 11:33:09 2012
New Revision: 302164
URL: http://svn.freebsd.org/changeset/ports/302164

Log:
  Fix order if LICENSE_COMB and LICENSE in ffmpeg ports

Modified:
  head/multimedia/ffmpeg-devel/Makefile
  head/multimedia/ffmpeg/Makefile

Modified: head/multimedia/ffmpeg-devel/Makefile
==============================================================================
--- head/multimedia/ffmpeg-devel/Makefile	Mon Aug  6 11:32:27 2012	(r302163)
+++ head/multimedia/ffmpeg-devel/Makefile	Mon Aug  6 11:33:09 2012	(r302164)
@@ -15,8 +15,8 @@ DISTNAME=	ffmpeg-${GIT_SUFFIX}
 MAINTAINER=	mm at FreeBSD.org
 COMMENT=	Realtime audio/video encoder/converter and streaming server
 
-LICENSE_COMB=		multi
 LICENSE=		GPLv2 LGPL21
+LICENSE_COMB=		multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.GPLv2
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPLv2.1
 

Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile	Mon Aug  6 11:32:27 2012	(r302163)
+++ head/multimedia/ffmpeg/Makefile	Mon Aug  6 11:33:09 2012	(r302164)
@@ -14,8 +14,8 @@ MASTER_SITES=	http://ffmpeg.org/releases
 MAINTAINER=	mm at FreeBSD.org
 COMMENT=	Realtime audio/video encoder/converter and streaming server
 
-LICENSE_COMB=		multi
 LICENSE=		GPLv2 LGPL21
+LICENSE_COMB=		multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.GPLv2
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPLv2.1