From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 22 11:40:10 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A006737B401 for ; Tue, 22 Apr 2003 11:40:10 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B260543F93 for ; Tue, 22 Apr 2003 11:40:08 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h3MIe8Up063173 for ; Tue, 22 Apr 2003 11:40:08 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h3MIe8AU063172; Tue, 22 Apr 2003 11:40:08 -0700 (PDT) Resent-Date: Tue, 22 Apr 2003 11:40:08 -0700 (PDT) Resent-Message-Id: <200304221840.h3MIe8AU063172@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Kirill Ponomarew Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B60BB37B401 for ; Tue, 22 Apr 2003 11:37:43 -0700 (PDT) Received: from office.LF.net (office.LF.net [212.9.190.165]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4AC843F93 for ; Tue, 22 Apr 2003 11:37:42 -0700 (PDT) (envelope-from krion@voodoo.oberon.net) Received: from voodoo.oberon.net ([212.118.165.100]) by office.LF.net with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.10) id 1982e7-0009mr-00 for FreeBSD-gnats-submit@freebsd.org; Tue, 22 Apr 2003 20:37:35 +0200 Received: from krion by voodoo.oberon.net with local (Exim 4.10) id 1982eM-0008tR-00 for FreeBSD-gnats-submit@freebsd.org; зд, 22 Сав 2003 20:37:50 +0200 Message-Id: From: Kirill Ponomarew Sender: krion To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/51290: Update devel/sip: patchout license confirmation X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 22 Apr 2003 18:40:11 -0000 X-Original-Date: зд, 22 Сав 2003 20:37:50 +0200 X-List-Received-Date: Tue, 22 Apr 2003 18:40:11 -0000 >Number: 51290 >Category: ports >Synopsis: Update devel/sip: patchout license confirmation >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Apr 22 11:40:07 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Kirill Ponomarew >Release: FreeBSD 4.8-RELEASE i386 >Organization: Oberon.net >Environment: >Description: Update devel/sip: Patchout license confirmation Fix license issue Build port without license confirmation >How-To-Repeat: >Fix: diff -ruN sip.orig/files/patch-build.py sip/files/patch-build.py --- sip.orig/files/patch-build.py Thu Jan 1 01:00:00 1970 +++ sip/files/patch-build.py Tue Apr 22 20:04:14 2003 @@ -0,0 +1,60 @@ +--- build.py.orig Tue Apr 22 20:02:14 2003 ++++ build.py Tue Apr 22 20:03:56 2003 +@@ -444,15 +444,6 @@ + + inform("Qt %s %sis being used." % (qtversstr,qteditionstr)) + +- # Check the licenses are compatible. +- if qtedition: +- global licType +- +- if (qtedition == "free" and licType != "GPL") or \ +- (qtedition != "free" and licType == "GPL"): +- error("This version of SIP and the %s edition of Qt have incompatible licenses." % (qtedition)) +- +- + def checkQtLibrary(): + """Check which Qt library is to be used. + """ +@@ -529,41 +520,6 @@ + + if not os.access(progName,os.F_OK): + error("This program must be run from the top level directory of the package, ie. the directory containing this program.") +- +- global licType +- +- try: +- import license +- licType = license.LicenseType +- licname = license.LicenseName +- except: +- licType = "GPL" +- licname = "GNU General Public License" +- +- inform("This is the %s version of SIP and is licensed under the %s." % (licType,licname),0) +- +- print +- print "Type 'L' to view the license." +- print "Type 'yes' to accept the terms of the license." +- print "Type 'no' to decline the terms of the license." +- print +- +- while 1: +- try: +- resp = raw_input("Do you accept the terms of the license? ") +- except: +- resp = "" +- +- resp = resp.strip().lower() +- +- if resp == "yes": +- break +- +- if resp == "no": +- sys.exit(0) +- +- if resp == "l": +- os.system("more LICENSE") + + inform("Building the %s version of SIP 3.5 for Python %s on %s." % (licType,pyFullVers,sys.platform)) + >Release-Note: >Audit-Trail: >Unformatted: