From 9d185ae92e1baae8ea0e1c287dc394c7c2d9744d Mon Sep 17 00:00:00 2001 From: kevlo Date: Thu, 22 Apr 2010 10:39:28 +0000 Subject: [PATCH] upgrade to 0.7 ok landry@ --- geo/gmapcatcher/Makefile | 7 ++++--- geo/gmapcatcher/distinfo | 10 +++++----- geo/gmapcatcher/patches/patch-download_py | 12 ++++++++++++ geo/gmapcatcher/patches/patch-src_xmlUtils_py | 17 ----------------- geo/gmapcatcher/pkg/PLIST | 8 +++++++- 5 files changed, 28 insertions(+), 26 deletions(-) create mode 100644 geo/gmapcatcher/patches/patch-download_py delete mode 100644 geo/gmapcatcher/patches/patch-src_xmlUtils_py diff --git a/geo/gmapcatcher/Makefile b/geo/gmapcatcher/Makefile index 202ca3f93a3..4193a6d3eb9 100644 --- a/geo/gmapcatcher/Makefile +++ b/geo/gmapcatcher/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2010/03/25 10:13:26 kevlo Exp $ +# $OpenBSD: Makefile,v 1.2 2010/04/22 10:39:28 kevlo Exp $ COMMENT= offline maps viewer -VERSION= 0.6.3.0 +VERSION= 0.7.0.0 DISTNAME= GMapCatcher-${VERSION} PKGNAME= gmapcatcher-${VERSION} @@ -23,7 +23,8 @@ MASTER_SITES= http://gmapcatcher.googlecode.com/files/ MODULES= lang/python BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= :py-gtk2->=1.10:x11/py-gtk2 \ - ::graphics/py-Imaging + :py-sqlite2-*:databases/py-sqlite2 \ + ::graphics/py-Imaging USE_X11= Yes diff --git a/geo/gmapcatcher/distinfo b/geo/gmapcatcher/distinfo index 09419290bd5..9a542f51bd0 100644 --- a/geo/gmapcatcher/distinfo +++ b/geo/gmapcatcher/distinfo @@ -1,5 +1,5 @@ -MD5 (GMapCatcher-0.6.3.0.tar.gz) = pqPfGoT8jBldqAgf7oVRKw== -RMD160 (GMapCatcher-0.6.3.0.tar.gz) = 1om3lJLGOjWiINBpk86E6pVQUy8= -SHA1 (GMapCatcher-0.6.3.0.tar.gz) = 9J6koj+6jsiZRqqoETMqQGbJRC8= -SHA256 (GMapCatcher-0.6.3.0.tar.gz) = UM9mG5izNKGTlMLHzcD6nRBCg3bmjRi+TllxnK3r+Gg= -SIZE (GMapCatcher-0.6.3.0.tar.gz) = 374462 +MD5 (GMapCatcher-0.7.0.0.tar.gz) = +vzquWkFkkE2oRNvifKxeg== +RMD160 (GMapCatcher-0.7.0.0.tar.gz) = LTJHBzZ8YpnbjRz0TDqsXXZa5jY= +SHA1 (GMapCatcher-0.7.0.0.tar.gz) = nSypi91DUtSmb5baxVwHOweWltI= +SHA256 (GMapCatcher-0.7.0.0.tar.gz) = 8LwMemgZLO5k1+U9aePPXW9Xm3ubYHjtlcGp7Wy+/h4= +SIZE (GMapCatcher-0.7.0.0.tar.gz) = 296807 diff --git a/geo/gmapcatcher/patches/patch-download_py b/geo/gmapcatcher/patches/patch-download_py new file mode 100644 index 00000000000..25f22bd6ac3 --- /dev/null +++ b/geo/gmapcatcher/patches/patch-download_py @@ -0,0 +1,12 @@ +$OpenBSD: patch-download_py,v 1.1 2010/04/22 10:39:28 kevlo Exp $ +--- download.py.orig Thu Apr 22 13:59:41 2010 ++++ download.py Thu Apr 22 13:59:53 2010 +@@ -12,7 +12,7 @@ from gmapcatcher.mapServices import MapServ + from gmapcatcher.mapDownloader import MapDownloader + + mConf = mapConf.MapConf() +-ctx_map = MapServ(conf.init_path, conf.repository_type) ++ctx_map = MapServ(mConf.init_path, mConf.repository_type) + downloader = None + + def do_nothing(*args, **kwargs): diff --git a/geo/gmapcatcher/patches/patch-src_xmlUtils_py b/geo/gmapcatcher/patches/patch-src_xmlUtils_py deleted file mode 100644 index 668892f0f19..00000000000 --- a/geo/gmapcatcher/patches/patch-src_xmlUtils_py +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-src_xmlUtils_py,v 1.1.1.1 2010/03/25 10:13:26 kevlo Exp $ ---- src/xmlUtils.py.orig Thu Mar 25 10:51:15 2010 -+++ src/xmlUtils.py Thu Mar 25 10:51:38 2010 -@@ -1,3 +1,4 @@ -+from __future__ import with_statement - from mapUtils import altitude_to_zoom - - def kml_to_markers(strFileName, marker): -@@ -15,7 +16,7 @@ def kml_to_markers(strFileName, marker): - fileString = unicode(f.read(), errors='ignore') - dom = parseString(fileString) - PlacemarkElements = dom.getElementsByTagName("Placemark") -- except Exception as excInst: -+ except Exception, excInst: - return excInst - - for element in PlacemarkElements: diff --git a/geo/gmapcatcher/pkg/PLIST b/geo/gmapcatcher/pkg/PLIST index fe156cb27dc..ddc4ff0baed 100644 --- a/geo/gmapcatcher/pkg/PLIST +++ b/geo/gmapcatcher/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2010/03/25 10:13:26 kevlo Exp $ +@comment $OpenBSD: PLIST,v 1.2 2010/04/22 10:39:28 kevlo Exp $ bin/gmapcatcher bin/gmapcatcher-download lib/python${MODPY_VERSION}/site-packages/gmapcatcher/ @@ -127,8 +127,14 @@ lib/python${MODPY_VERSION}/site-packages/gmapcatcher/pyGPSD/nmea/track.py lib/python${MODPY_VERSION}/site-packages/gmapcatcher/pyGPSD/nmea/track.pyc lib/python${MODPY_VERSION}/site-packages/gmapcatcher/pyGPSD/scan.py lib/python${MODPY_VERSION}/site-packages/gmapcatcher/pyGPSD/scan.pyc +lib/python${MODPY_VERSION}/site-packages/gmapcatcher/tilesRepo.py +lib/python${MODPY_VERSION}/site-packages/gmapcatcher/tilesRepo.pyc lib/python${MODPY_VERSION}/site-packages/gmapcatcher/tilesRepoFS.py lib/python${MODPY_VERSION}/site-packages/gmapcatcher/tilesRepoFS.pyc +lib/python${MODPY_VERSION}/site-packages/gmapcatcher/tilesRepoFactory.py +lib/python${MODPY_VERSION}/site-packages/gmapcatcher/tilesRepoFactory.pyc +lib/python${MODPY_VERSION}/site-packages/gmapcatcher/tilesRepoSQLite3.py +lib/python${MODPY_VERSION}/site-packages/gmapcatcher/tilesRepoSQLite3.pyc lib/python${MODPY_VERSION}/site-packages/gmapcatcher/widChangeTheme.py lib/python${MODPY_VERSION}/site-packages/gmapcatcher/widChangeTheme.pyc lib/python${MODPY_VERSION}/site-packages/gmapcatcher/widDrawingArea.py