Hi, This updates gmapcatcher to the latest version 0.7.0.0. Tested on amd64.
ok/comments? Kevin Index: Makefile =================================================================== RCS file: /cvs/ports/geo/gmapcatcher/Makefile,v retrieving revision 1.1.1.1 diff -N -u -p Makefile --- Makefile 25 Mar 2010 10:13:26 -0000 1.1.1.1 +++ Makefile 22 Apr 2010 06:37:18 -0000 @@ -2,7 +2,7 @@ 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 Index: distinfo =================================================================== RCS file: /cvs/ports/geo/gmapcatcher/distinfo,v retrieving revision 1.1.1.1 diff -N -u -p distinfo --- distinfo 25 Mar 2010 10:13:26 -0000 1.1.1.1 +++ distinfo 22 Apr 2010 06:37:18 -0000 @@ -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 Index: patches/patch-download_py =================================================================== RCS file: patches/patch-download_py diff -N -u -p patches/patch-download_py --- /dev/null 22 Apr 2010 06:37:18 -0000 +++ patches/patch-download_py 22 Apr 2010 06:37:18 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- 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): Index: patches/patch-src_xmlUtils_py =================================================================== RCS file: /cvs/ports/geo/gmapcatcher/patches/patch-src_xmlUtils_py,v retrieving revision 1.1.1.1 diff -N -u -p patches/patch-src_xmlUtils_py --- patches/patch-src_xmlUtils_py 25 Mar 2010 10:13:26 -0000 1.1.1.1 +++ /dev/null 28 Sep 2008 10:50:08 -0000 @@ -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: Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/geo/gmapcatcher/pkg/PLIST,v retrieving revision 1.1.1.1 diff -N -u -p pkg/PLIST --- pkg/PLIST 25 Mar 2010 10:13:26 -0000 1.1.1.1 +++ pkg/PLIST 22 Apr 2010 06:37:18 -0000 @@ -127,8 +127,14 @@ lib/python ${MODPY_VERSION}/site-packages/gmapcatcher/p 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