Date: Tue, 21 Jan 2014 20:15:24 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340649 - head/graphics/libraw Message-ID: <201401212015.s0LKFOlj038785@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Tue Jan 21 20:15:23 2014 New Revision: 340649 URL: http://svnweb.freebsd.org/changeset/ports/340649 QAT: https://qat.redports.org/buildarchive/r340649/ Log: Properly set license when using the demosaic packs. According to the port's README.demosaic-packs, when the demosaic packs are used the software must be licensed under either the GPLv2 or the GPLv3, depending on the packs being used (if both packs are used, the GPLv3 should take precedence). This patch changes the way LICENSE is set when those options are set: the new licenses are exclusive with the others. PR: ports/185119 Submitted by: rakuco@ Approved by: maintainer timeout (29 days) Modified: head/graphics/libraw/Makefile Modified: head/graphics/libraw/Makefile ============================================================================== --- head/graphics/libraw/Makefile Tue Jan 21 20:06:33 2014 (r340648) +++ head/graphics/libraw/Makefile Tue Jan 21 20:15:23 2014 (r340649) @@ -54,7 +54,8 @@ CONFIGURE_ARGS+=--disable-lcms .endif .if ${PORT_OPTIONS:MDEMOSAIC_PACK_GPL2} -LICENSE+= GPLv2 +LICENSE= GPLv2 +LICENSE_COMB= single DISTFILES+= LibRaw-demosaic-pack-GPL2-${PORTVERSION}.tar.gz CONFIGURE_ARGS+=--enable-demosaic-pack-gpl2=../LibRaw-demosaic-pack-GPL2-${PORTVERSION} .else @@ -62,7 +63,8 @@ CONFIGURE_ARGS+=--disable-demosaic-pack- .endif .if ${PORT_OPTIONS:MDEMOSAIC_PACK_GPL3} -LICENSE+= GPLv3 +LICENSE= GPLv3 +LICENSE_COMB= single DISTFILES+= LibRaw-demosaic-pack-GPL3-${PORTVERSION}.tar.gz CONFIGURE_ARGS+=--enable-demosaic-pack-gpl3=../LibRaw-demosaic-pack-GPL3-${PORTVERSION} .else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401212015.s0LKFOlj038785>