From owner-svn-ports-all@FreeBSD.ORG Tue Jan 21 20:15:24 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 717329BA; Tue, 21 Jan 2014 20:15:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5D2D0149E; Tue, 21 Jan 2014 20:15:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0LKFOrT038786; Tue, 21 Jan 2014 20:15:24 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0LKFOlj038785; Tue, 21 Jan 2014 20:15:24 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201401212015.s0LKFOlj038785@svn.freebsd.org> From: Raphael Kubo da Costa Date: Tue, 21 Jan 2014 20:15:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340649 - head/graphics/libraw X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jan 2014 20:15:24 -0000 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