From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 8 15:50:04 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 45DEE16A420 for ; Wed, 8 Mar 2006 15:50:04 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3C2C43D4C for ; Wed, 8 Mar 2006 15:50:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k28Fo2As036608 for ; Wed, 8 Mar 2006 15:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k28Fo2cP036607; Wed, 8 Mar 2006 15:50:02 GMT (envelope-from gnats) Resent-Date: Wed, 8 Mar 2006 15:50:02 GMT Resent-Message-Id: <200603081550.k28Fo2cP036607@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, Jean-François BOEUF Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 52F6416A420 for ; Wed, 8 Mar 2006 15:40:16 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00C0543D46 for ; Wed, 8 Mar 2006 15:40:16 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k28FeFo2086178 for ; Wed, 8 Mar 2006 15:40:15 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k28FeFFu086177; Wed, 8 Mar 2006 15:40:15 GMT (envelope-from nobody) Message-Id: <200603081540.k28FeFFu086177@www.freebsd.org> Date: Wed, 8 Mar 2006 15:40:15 GMT From: Jean-François BOEUF To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/94230: [PATCH] math/py-gato : fix unfetchable by upgrading X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 15:50:04 -0000 >Number: 94230 >Category: ports >Synopsis: [PATCH] math/py-gato : fix unfetchable by upgrading >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: Wed Mar 08 15:50:02 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jean-François BOEUF >Release: FreeBSD 6.0-RELEASE-p4 i386 >Organization: >Environment: >Description: - distfile unfetchable (reported by fenner's port survey) - last release is 0.98Q >How-To-Repeat: >Fix: The patch updates the port taking into account project page moving. py-gato.diff ================================================================== --- ports/math/py-gato/Makefile Sat Jul 2 17:33:37 2005 +++ ports/math/py-gato/Makefile Wed Mar 8 16:01:06 2006 @@ -6,12 +6,11 @@ # PORTNAME= gato -PORTVERSION= 0.98.J +PORTVERSION= 0.98.Q CATEGORIES= math python -MASTER_SITES= http://www.zpr.uni-koeln.de/~gato/Download/ +MASTER_SITES= http://gato.sourceforge.net/Download/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Gato-${PORTVERSION:U:C|\.([^.]*)$|\1|} -EXTRACT_SUFX= .tar MAINTAINER= ports@FreeBSD.org COMMENT= A Python-based toolbox to visualise algorithms on graphs @@ -22,7 +21,6 @@ WRKSRC= ${WRKDIR}/Gato GATO_DIR= ${PREFIX}/lib/${PYTHON_VERSION}/site-packages/Gato EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME} -CPIO= cpio --quiet -pdum -R pre-build: @ ${TOUCH} ${WRKSRC}/__init__.py @@ -34,8 +32,8 @@ do-install: @ ${MKDIR} ${GATO_DIR} @ cd ${WRKSRC} && ${FIND} *.py *.pyc *.pyo \ - -name Gato.py\* -o -name Gred.py\* -o -print \ - | ${CPIO} ${BINOWN}:${BINGRP} ${GATO_DIR} + -name Gato.py\* -o -print \ + | ${CPIO} --verbose -pdum -R ${BINOWN}:${BINGRP} ${GATO_DIR} .for script in Gato Gred @ ${INSTALL_SCRIPT} ${WRKSRC}/${script}.py ${PREFIX}/bin/${script} .endfor --- ports/math/py-gato/distinfo Tue Nov 29 12:24:13 2005 +++ ports/math/py-gato/distinfo Tue Mar 7 23:41:46 2006 @@ -1,3 +1,3 @@ -MD5 (Gato-0.98J.tar) = c6235e2b90cd30365c79abc6bc18c91a -SHA256 (Gato-0.98J.tar) = bbdc48375b28af81bc96c858af032e6a541e5d41057750523fc29354c27f9acc -SIZE (Gato-0.98J.tar) = 653312 +MD5 (Gato-0.98Q.tar.gz) = c46a1e4b79632aad628caf452a0b3b69 +SHA256 (Gato-0.98Q.tar.gz) = 2c1749d312c45e50b81e3c4916de912f4309251c9502448a5a5f8856aae770a9 +SIZE (Gato-0.98Q.tar.gz) = 178578 --- ports/math/py-gato/files/patch-Gato.py Thu Dec 18 08:07:37 2003 +++ ports/math/py-gato/files/patch-Gato.py Wed Mar 8 15:23:47 2006 @@ -1,6 +1,19 @@ ---- Gato.py.dist Thu Dec 18 00:34:01 2003 -+++ Gato.py Thu Dec 18 00:35:50 2003 -@@ -54,15 +54,15 @@ +--- Gato.py Fri Jan 20 15:15:55 2006 ++++ Gato.py Wed Mar 8 15:23:21 2006 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2.3 ++#!/usr/bin/env python + ################################################################################ + # + # This file is part of Gato (Graph Animation Toolbox) +@@ -48,22 +48,22 @@ + import tkFont + import copy + +-import Gred ++from Gato import Gred + + from Tkinter import * from tkFileDialog import askopenfilename, asksaveasfilename from tkMessageBox import askokcancel, showerror, askyesno from ScrolledText import ScrolledText @@ -13,6 +26,7 @@ -from GatoDialogs import AboutBox, SplashScreen, HTMLViewer -import GatoIcons -import GatoSystemConfiguration +-from AnimationHistory import AnimationHistory +from Gato.GatoConfiguration import GatoConfiguration +from Gato.Graph import Graph +from Gato.GraphUtil import * @@ -21,24 +35,25 @@ +from Gato.GatoGlobals import * +from Gato.GatoDialogs import AboutBox, SplashScreen, HTMLViewer +from Gato import GatoIcons -+import Gato.GatoSystemConfiguration ++from Gato import GatoSystemConfiguration ++from Gato.AnimationHistory import AnimationHistory # put someplace else def WMExtrasGeometry(window): -@@ -1397,11 +1397,11 @@ - self.algoGlobals['A'] = self.GUI.graphDisplay - # XXX - # explictely loading packages we want to make available to the algorithm -- modules = ['DataStructures', -- 'AnimatedDataStructures', -- 'AnimatedAlgorithms', -- 'GraphUtil', -- 'GatoUtil'] -+ modules = ['Gato.DataStructures', -+ 'Gato.AnimatedDataStructures', -+ 'Gato.AnimatedAlgorithms', -+ 'Gato.GraphUtil', -+ 'Gato.GatoUtil'] - - for m in modules: - exec("from %s import *" % m, self.algoGlobals, self.algoGlobals) +@@ -1419,11 +1419,11 @@ + self.algoGlobals['A'] = self.GUI.graphDisplay + # XXX + # explictely loading packages we want to make available to the algorithm +- modules = ['DataStructures', +- 'AnimatedDataStructures', +- 'AnimatedAlgorithms', +- 'GraphUtil', +- 'GatoUtil'] ++ modules = ['Gato.DataStructures', ++ 'Gato.AnimatedDataStructures', ++ 'Gato.AnimatedAlgorithms', ++ 'Gato.GraphUtil', ++ 'Gato.GatoUtil'] + + for m in modules: + exec("from %s import *" % m, self.algoGlobals, self.algoGlobals) --- /dev/null Thu Jan 1 01:00:00 1970 +++ ports/math/py-gato/files/patch-GatoFile.py Wed Mar 8 10:53:57 2006 @@ -0,0 +1,8 @@ +--- GatoFile.py Wed Mar 8 10:47:35 2006 ++++ GatoFile.py Wed Mar 8 10:47:47 2006 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2.3 ++#!/usr/bin/env python + ################################################################################ + # + # This file is part of Gato (Graph Animation Toolbox) --- ports/math/py-gato/files/patch-GraphUtil.py Thu Dec 18 08:07:37 2003 +++ /dev/null Thu Jan 1 01:00:00 1970 @@ -1,76 +0,0 @@ ---- GraphUtil.py.orig Wed May 16 13:16:58 2001 -+++ GraphUtil.py Mon Sep 3 12:21:49 2001 -@@ -223,13 +223,13 @@ - break - - if lineNr == 2: # Read directed and euclidian -- splitLine = split(line[:-1],';') -- G.directed = eval(split(splitLine[0],':')[1]) -- G.simple = eval(split(splitLine[1],':')[1]) -- G.euclidian = eval(split(splitLine[2],':')[1]) -- intWeights = eval(split(splitLine[3],':')[1]) -- nrOfEdgeWeights = eval(split(splitLine[4],':')[1]) -- nrOfVertexWeights = eval(split(splitLine[5],':')[1]) -+ splitLine = split(';',line[:-1]) -+ G.directed = eval(split(':',splitLine[0])[1]) -+ G.simple = eval(split(':',splitLine[1])[1]) -+ G.euclidian = eval(split(':',splitLine[2])[1]) -+ intWeights = eval(split(':',splitLine[3])[1]) -+ nrOfEdgeWeights = eval(split(':',splitLine[4])[1]) -+ nrOfVertexWeights = eval(split(':',splitLine[5])[1]) - for i in xrange(nrOfEdgeWeights): - G.edgeWeights[i] = EdgeWeight(G) - for i in xrange(nrOfVertexWeights): -@@ -237,33 +237,33 @@ - - - if lineNr == 5: # Read nr of vertices -- nrOfVertices = eval(split(line[:-2],':')[1]) # Strip of "\n" and ; -+ nrOfVertices = eval(split(':',line[:-2])[1]) # Strip of "\n" and ; - firstVertexLineNr = lineNr + 1 - lastVertexLineNr = lineNr + nrOfVertices - - if firstVertexLineNr <= lineNr and lineNr <= lastVertexLineNr: -- splitLine = split(line[:-1],';') -+ splitLine = split(';',line[:-1]) - v = G.AddVertex() -- x = eval(split(splitLine[1],':')[1]) -- y = eval(split(splitLine[2],':')[1]) -+ x = eval(split(':',splitLine[1])[1]) -+ y = eval(split(':',splitLine[2])[1]) - for i in xrange(nrOfVertexWeights): -- w = eval(split(splitLine[3+i],':')[1]) -+ w = eval(split(':',splitLine[3+i])[1]) - G.vertexWeights[i][v] = w - - E[v] = Point2D(x,y) - - if lineNr == lastVertexLineNr + 1: # Read Nr of edges -- nrOfEdges = eval(split(line[:-2],':')[1]) # Strip of "\n" and ; -+ nrOfEdges = eval(split(':',line[:-2])[1]) # Strip of "\n" and ; - firstEdgeLineNr = lineNr + 1 - lastEdgeLineNr = lineNr + nrOfEdges - - if firstEdgeLineNr <= lineNr and lineNr <= lastEdgeLineNr: -- splitLine = split(line[:-1],';') -- h = eval(split(splitLine[0],':')[1]) -- t = eval(split(splitLine[1],':')[1]) -+ splitLine = split(';',line[:-1]) -+ h = eval(split(':',splitLine[0])[1]) -+ t = eval(split(':',splitLine[1])[1]) - G.AddEdge(t,h) - for i in xrange(nrOfEdgeWeights): -- G.edgeWeights[i][(t,h)] = eval(split(splitLine[3+i],':')[1]) -+ G.edgeWeights[i][(t,h)] = eval(split(':',splitLine[3+i])[1]) - - lineNr = lineNr + 1 - -@@ -345,7 +345,7 @@ - if not line: - return retval - -- token = filter(lambda x: x != '', split(line[:-1],"[\t ]*")) -+ token = filter(lambda x: x != '', split("[\t ]*",line[:-1])) - - if len(token) == 1 and token[0] == ']': - return retval --- ports/math/py-gato/files/patch-Gred.py Thu Dec 18 08:07:37 2003 +++ ports/math/py-gato/files/patch-Gred.py Wed Mar 8 12:29:09 2006 @@ -1,5 +1,11 @@ ---- Gred.py.orig Fri Dec 5 13:08:46 2003 -+++ Gred.py Thu Dec 18 00:43:24 2003 +--- Gred.py Fri Jan 20 15:15:55 2006 ++++ Gred.py Wed Mar 8 12:28:28 2006 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2.3 ++#!/usr/bin/env python + ################################################################################ + # + # This file is part of Gato (Graph Animation Toolbox) @@ -34,17 +34,17 @@ # last change by $Author: schliep $. # @@ -8,13 +14,13 @@ -import GatoGlobals # Needed for help viewer.XXX -from Graph import Graph -from DataStructures import EdgeWeight, VertexWeight --from GraphUtil import OpenCATBoxGraph, OpenGMLGraph, SaveCATBoxGraph, WeightedGraphInformer +-from GraphUtil import OpenCATBoxGraph, OpenGMLGraph, OpenDotGraph, SaveCATBoxGraph, WeightedGraphInformer -from GraphEditor import GraphEditor +from Gato.GatoGlobals import * +import Gato.GatoGlobals # Needed for help viewer.XXX +from Gato.Graph import Graph +from Gato.DataStructures import EdgeWeight, VertexWeight -+from Gato.GraphUtil import OpenCATBoxGraph, OpenGMLGraph, SaveCATBoxGraph, WeightedGraphInformer ++from Gato.GraphUtil import OpenCATBoxGraph, OpenGMLGraph, OpenDotGraph, SaveCATBoxGraph, WeightedGraphInformer +from Gato.GraphEditor import GraphEditor from Tkinter import * import tkFont @@ -27,13 +33,21 @@ from ScrolledText import * from tkFileDialog import askopenfilename, asksaveasfilename -@@ -55,7 +55,8 @@ +@@ -55,7 +55,7 @@ import sys import os -import GraphCreator, Embedder -+from Gato import GraphCreator -+from Gato import Embedder ++from Gato import GraphCreator, Embedder class GredSplashScreen(GatoDialogs.SplashScreen): +@@ -843,7 +843,7 @@ + ## globals()['gVertexRadius'] = 12 + ## globals()['gVertexFrameWidth'] = 0 + ## globals()['gEdgeWidth'] = 2 +- GatoGlobals.cVertexDefault = '#000099' ++ Gato.GatoGlobals.cVertexDefault = '#000099' + ## globals()['cEdgeDefault'] = '#999999' + ## globals()['cLabelDefault'] = 'white' + --- /dev/null Thu Jan 1 01:00:00 1970 +++ ports/math/py-gato/files/patch-TextTreeWidget.py Wed Mar 8 10:55:45 2006 @@ -0,0 +1,8 @@ +--- TextTreeWidget.py Wed Mar 8 10:47:35 2006 ++++ TextTreeWidget.py Wed Mar 8 10:47:47 2006 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2.3 ++#!/usr/bin/env python + ################################################################################ + # + # This file is part of Gato (Graph Animation Toolbox) --- ports/math/py-gato/pkg-descr Mon Sep 3 12:45:17 2001 +++ ports/math/py-gato/pkg-descr Tue Mar 7 23:37:36 2006 @@ -11,6 +11,6 @@ input - by terms of blinking, changing colors and other visual effects. Author: Alexander Schliep -WWW: http://www.zpr.uni-koeln.de/~gato/ +WWW: http://gato.sourceforge.net/index.html -- Johann Visagie --- ports/math/py-gato/pkg-plist Thu Dec 18 08:07:37 2003 +++ ports/math/py-gato/pkg-plist Wed Mar 8 15:26:35 2006 @@ -5,6 +5,9 @@ %%PORTDOCS%%share/examples/gato/sample.cat bin/Gato bin/Gred +lib/%%PYTHON_VERSION%%/site-packages/Gato/AnimationHistory.py +lib/%%PYTHON_VERSION%%/site-packages/Gato/AnimationHistory.pyc +lib/%%PYTHON_VERSION%%/site-packages/Gato/AnimationHistory.pyo lib/%%PYTHON_VERSION%%/site-packages/Gato/AnimatedAlgorithms.py lib/%%PYTHON_VERSION%%/site-packages/Gato/AnimatedAlgorithms.pyc lib/%%PYTHON_VERSION%%/site-packages/Gato/AnimatedAlgorithms.pyo @@ -59,6 +62,9 @@ lib/%%PYTHON_VERSION%%/site-packages/Gato/GraphUtil.py lib/%%PYTHON_VERSION%%/site-packages/Gato/GraphUtil.pyc lib/%%PYTHON_VERSION%%/site-packages/Gato/GraphUtil.pyo +lib/%%PYTHON_VERSION%%/site-packages/Gato/Gred.py +lib/%%PYTHON_VERSION%%/site-packages/Gato/Gred.pyc +lib/%%PYTHON_VERSION%%/site-packages/Gato/Gred.pyo lib/%%PYTHON_VERSION%%/site-packages/Gato/PlanarEmbedding.py lib/%%PYTHON_VERSION%%/site-packages/Gato/PlanarEmbedding.pyc lib/%%PYTHON_VERSION%%/site-packages/Gato/PlanarEmbedding.pyo >Release-Note: >Audit-Trail: >Unformatted: