diff options
| author | mm <mm@FreeBSD.org> | 2012-08-06 19:32:27 +0800 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-08-06 19:32:27 +0800 |
| commit | 3c766a9cd4a8f91619ab92b9643cddd0289ceece (patch) | |
| tree | 00dde4626e822d46b5774d4afdf9cb4e644a3c01 /multimedia | |
| parent | 38fb5c1e0d7d6cc606263d8573a4dc8d6bfc5650 (diff) | |
| download | freebsd-ports-gnome-3c766a9cd4a8f91619ab92b9643cddd0289ceece.tar.gz freebsd-ports-gnome-3c766a9cd4a8f91619ab92b9643cddd0289ceece.tar.zst freebsd-ports-gnome-3c766a9cd4a8f91619ab92b9643cddd0289ceece.zip | |
Reorder ffmpeg licensing knobs
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg-devel/Makefile | 11 | ||||
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 19 |
2 files changed, 12 insertions, 18 deletions
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile index 539ad222e41b..01968d2ca849 100644 --- a/multimedia/ffmpeg-devel/Makefile +++ b/multimedia/ffmpeg-devel/Makefile @@ -15,6 +15,7 @@ DISTNAME= ffmpeg-${GIT_SUFFIX} MAINTAINER= mm@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server +LICENSE_COMB= multi LICENSE= GPLv2 LGPL21 LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2 LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPLv2.1 @@ -457,17 +458,13 @@ CONFIGURE_ARGS+= --disable-libxvid LICENSE= RESTRICTED= linking to libfaac or libaacplus restricts redistribution CONFIGURE_ARGS+= --enable-nonfree -. if defined(FFMPEG_LICENSE_GPL3) -CONFIGURE_ARGS+= --enable-version3 -. endif -.else -LICENSE_COMB= multi -. if defined(FFMPEG_LICENSE_GPL3) +.endif + +.if defined(FFMPEG_LICENSE_GPL3) CONFIGURE_ARGS+= --enable-version3 LICENSE= GPLv3 LGPL3 LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 -. endif .endif do-fetch: diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index ab6addaf7203..4dac2994dc16 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -14,6 +14,11 @@ MASTER_SITES= http://ffmpeg.org/releases/ MAINTAINER= mm@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server +LICENSE_COMB= multi +LICENSE= GPLv2 LGPL21 +LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2 +LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPLv2.1 + BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \ ${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html @@ -377,21 +382,13 @@ CONFIGURE_ARGS+= --disable-libxvid .if defined(FFMPEG_NONFREE) RESTRICTED= linking to libfaac or libaacplus restricts redistribution CONFIGURE_ARGS+= --enable-nonfree -. if defined(FFMPEG_LICENSE_GPL3) -CONFIGURE_ARGS+= --enable-version3 -. endif -.else -LICENSE_COMB= multi -. if defined(FFMPEG_LICENSE_GPL3) +.endif + +.if defined(FFMPEG_LICENSE_GPL3) LICENSE= GPLv3 LGPL3 LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 CONFIGURE_ARGS+= --enable-version3 -. else -LICENSE= GPLv2 LGPL21 -LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2 -LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPLv2.1 -. endif .endif post-patch: |