From kubito@gmail.com  Mon Dec 23 01:20:21 2013
Return-Path: <kubito@gmail.com>
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 3A8C199A;
	Mon, 23 Dec 2013 01:20:21 +0000 (UTC)
Received: from mail-la0-x22a.google.com (mail-la0-x22a.google.com [IPv6:2a00:1450:4010:c03::22a])
	(using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 897991835;
	Mon, 23 Dec 2013 01:20:20 +0000 (UTC)
Received: by mail-la0-f42.google.com with SMTP id ec20so2044546lab.1
        for <multiple recipients>; Sun, 22 Dec 2013 17:20:17 -0800 (PST)
Received: from localhost (a91-154-115-217.elisa-laajakaista.fi. [91.154.115.217])
        by mx.google.com with ESMTPSA id mv9sm10406415lbc.0.2013.12.22.17.20.16
        for <multiple recipients>
        (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Sun, 22 Dec 2013 17:20:16 -0800 (PST)
Message-Id: <52b78fd0.a9d2700a.44bc.ffff8733@mx.google.com>
Date: Sun, 22 Dec 2013 17:20:16 -0800 (PST)
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Sender: Raphael Kubo da Costa <kubito@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: osa@FreeBSD.org
Subject: [PATCH] graphics/libraw: Properly set license when using the demosaic packs
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         185119
>Category:       ports
>Synopsis:       [PATCH] graphics/libraw: Properly set license when using the demosaic packs
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    osa
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 23 01:30:00 UTC 2013
>Closed-Date:    Tue Jan 21 20:15:53 UTC 2014
>Last-Modified:  Tue Jan 21 20:20:00 UTC 2014
>Originator:     Raphael Kubo da Costa
>Release:        FreeBSD 11.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD orwell 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r256429: Sun Oct 13 19:04:57 EEST
>Description:
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.

Port maintainer (osa@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- libraw-0.14.7.patch begins here ---
diff -ruN /usr/ports/graphics/libraw/Makefile ./Makefile
--- /usr/ports/graphics/libraw/Makefile	2013-09-20 21:35:44.000000000 +0300
+++ ./Makefile	2013-12-23 03:17:04.000000000 +0200
@@ -1,5 +1,5 @@
 # Created by: Sergey A. Osokin <osa@FreeBSD.org>
-# $FreeBSD: graphics/libraw/Makefile 327733 2013-09-20 18:35:44Z bapt $
+# $FreeBSD: head/graphics/libraw/Makefile 327733 2013-09-20 18:35:44Z bapt $
 
 PORTNAME=	libraw
 PORTVERSION=	0.14.7
@@ -54,7 +54,8 @@
 .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 @@
 .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
--- libraw-0.14.7.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->osa 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Dec 23 01:30:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185119 
State-Changed-From-To: open->closed 
State-Changed-By: rakuco 
State-Changed-When: Tue Jan 21 20:15:53 UTC 2014 
State-Changed-Why:  
Committed as r340649. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185119 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185119: commit references a PR
Date: Tue, 21 Jan 2014 20:15:31 +0000 (UTC)

 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
