Update to 0.7.7.2

6 files changed, 61 insertions, 37 deletions

diff --git a/astro/gmapcatcher/Makefile b/astro/gmapcatcher/Makefile
index ee502e21da5e..45e3d49afa97 100644
--- a/astro/gmapcatcher/Makefile
+++ b/astro/gmapcatcher/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	gmapcatcher
-PORTVERSION=	0.7.6.1
-PORTREVISION=	1
+PORTVERSION=	0.7.7.2
 CATEGORIES=	astro geography
 MASTER_SITES=	http://gmapcatcher.googlecode.com/files/
 DISTNAME=	GMapCatcher-${PORTVERSION}
 
 MAINTAINER=	kevlo@FreeBSD.org
-COMMENT=	An offline map viewer
+COMMENT=	Offline map viewer
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
 		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
diff --git a/astro/gmapcatcher/distinfo b/astro/gmapcatcher/distinfo
index 7b087526311e..f08c9ac99b82 100644
--- a/astro/gmapcatcher/distinfo
+++ b/astro/gmapcatcher/distinfo
@@ -1,2 +1,2 @@
-SHA256 (GMapCatcher-0.7.6.1.tar.gz) = 20a60dd4825a32a5f94ca45949928fc51969de69dfb6017cc19638e8f1d7eebf
-SIZE (GMapCatcher-0.7.6.1.tar.gz) = 1118496
+SHA256 (GMapCatcher-0.7.7.2.tar.gz) = 5633808e0f1cc5908a75998b9361c2988c7742ea4f8564957f58ce6eb0a46863
+SIZE (GMapCatcher-0.7.7.2.tar.gz) = 1037863
diff --git a/astro/gmapcatcher/files/patch-gmapcatcher_mapArgs.py b/astro/gmapcatcher/files/patch-gmapcatcher_mapArgs.py
index 7c6499b387e8..1a6eb691da81 100644
--- a/astro/gmapcatcher/files/patch-gmapcatcher_mapArgs.py
+++ b/astro/gmapcatcher/files/patch-gmapcatcher_mapArgs.py
@@ -1,19 +1,21 @@
---- gmapcatcher/mapArgs.py.orig	2010-09-08 10:52:32.000000000 +0800
-+++ gmapcatcher/mapArgs.py	2010-09-08 10:52:55.000000000 +0800
-@@ -42,9 +42,9 @@
+--- gmapcatcher/mapArgs.py.orig	2012-04-28 21:35:10.000000000 +0800
++++ gmapcatcher/mapArgs.py	2012-09-07 10:57:29.000000000 +0800
+@@ -45,10 +45,10 @@
          print '                very useful to download maps of entire world'
          print ' '
          print 'SAMPLE USAGE'
 -        print '  download --location="Paris, France"'
 -        print '  download --min-zoom=13 --full-range'
 -        print '  download --latitude=37.979180 --longitude=23.716647'
+-        print '  download --gpx=myfile.gpx --width=2'
 +        print '  mapdownloader --location="Paris, France"'
 +        print '  mapdownloader --min-zoom=13 --full-range'
 +        print '  mapdownloader --latitude=37.979180 --longitude=23.716647'
++        print '  mapdownloader --gpx=myfile.gpx --width=2'
  
      def __init__(self, arrArgs=()):
          if len(arrArgs) > 1:
-@@ -89,7 +89,7 @@
+@@ -96,7 +96,7 @@
                          self.lng_range = 179
  
      def __str__(self):
diff --git a/astro/gmapcatcher/files/patch-setup.py b/astro/gmapcatcher/files/patch-setup.py
index 19cf6422a9f7..cd806607f195 100644
--- a/astro/gmapcatcher/files/patch-setup.py
+++ b/astro/gmapcatcher/files/patch-setup.py
@@ -1,22 +1,26 @@
---- setup.py.orig	2010-08-23 02:36:19.000000000 +0800
-+++ setup.py	2010-11-12 14:34:24.000000000 +0800
-@@ -13,15 +13,13 @@
+--- setup.py.orig	2012-04-28 21:35:10.000000000 +0800
++++ setup.py	2012-09-07 11:21:38.000000000 +0800
+@@ -13,18 +13,16 @@
          description = 'Offline Map Viewer',
          version = VERSION,
          url = WEB_ADDRESS,
 -        data_files = [('share/doc/mapcatcher', ['README', 'changelog']),
 -                    ('share/applications', ['gmapcatcher.desktop']),
--                    ('share/man/man1', 
+-                    ('share/man/man1',
 -                        ['man/mapcatcher.1.gz', 'man/mapdownloader.1.gz']),
 -                    ('share/pixmaps', ['images/mapcatcher.png']),
-+        data_files = [('share/applications', ['gmapcatcher.desktop']),
-+                    ('man/man1', 
++	data_files = [('share/applications', ['gmapcatcher.desktop']),
++                    ('man/man1',
 +                        ['man/mapcatcher.1', 'man/mapdownloader.1']),
 +                    ('share/pixmaps', ['images/map.png']),
                      ('share/pixmaps/gmapcatcher',
                      map(lambda(thestr): "images/" + thestr, os.listdir('images')))
          ],
 -        scripts = ['mapcatcher', 'mapdownloader'],
-         packages = ['gmapcatcher', 'gmapcatcher.mapServers', 
+         packages = ['gmapcatcher', 'gmapcatcher.mapServers',
                      'gmapcatcher.pyGPSD', 'gmapcatcher.pyGPSD.nmea',
-                     'gmapcatcher.pyGPSD.nmea.serial']
+-                    'gmapcatcher.pyGPSD.nmea.serial']
++                    'gmapcatcher.pyGPSD.nmea.serial', 'gmapcatcher.tilesRepo']
+     )
+ else:
+     import py2exe
diff --git a/astro/gmapcatcher/pkg-descr b/astro/gmapcatcher/pkg-descr
index a22cf63a4ebc..7394f655fb57 100644
--- a/astro/gmapcatcher/pkg-descr
+++ b/astro/gmapcatcher/pkg-descr
@@ -2,4 +2,4 @@ GMapCatcher is an offline maps viewer. It downloads CloudMade,
 OpenStreetMap or Yahoo Maps tiles automatically, display them 
 using a specific GUI. User can view the maps while offline. 
 
-WWW:	http://code.google.com/p/gmapcatcher/
+WWW: http://code.google.com/p/gmapcatcher/
diff --git a/astro/gmapcatcher/pkg-plist b/astro/gmapcatcher/pkg-plist
index d761b3bcae2a..3f05f1b84d95 100644
--- a/astro/gmapcatcher/pkg-plist
+++ b/astro/gmapcatcher/pkg-plist
@@ -81,6 +81,9 @@ bin/mapdownloader
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/seznam.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/seznam.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/seznam.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/stamenMaps.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/stamenMaps.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/stamenMaps.pyo
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/virtualEarth.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/virtualEarth.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/virtualEarth.pyo
@@ -204,24 +207,39 @@ bin/mapdownloader
 %%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/scan.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/scan.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/scan.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tileFStoMGMaps.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tileFStoMGMaps.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tileFStoMGMaps.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepoFactory.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepoFactory.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepoFactory.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepoFS.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepoFS.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepoFS.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepoMGMaps.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepoMGMaps.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepoMGMaps.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepoSQLite3.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepoSQLite3.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepoSQLite3.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/Factory.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/Factory.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/Factory.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/__init__.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tileFStoMGMaps.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tileFStoMGMaps.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tileFStoMGMaps.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tileFStoOSM.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tileFStoOSM.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tileFStoOSM.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepo.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepo.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepo.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoFS.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoFS.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoFS.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoFactory.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoFactory.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoFactory.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoMGMaps.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoMGMaps.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoMGMaps.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoOSM.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoOSM.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoOSM.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoRMaps.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoRMaps.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoRMaps.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoSQLite3.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoSQLite3.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/tilesRepoSQLite3.pyo
 %%PYTHON_SITELIBDIR%%/gmapcatcher/widChangeTheme.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/widChangeTheme.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/widChangeTheme.pyo
@@ -249,15 +267,16 @@ share/applications/gmapcatcher.desktop
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 share/pixmaps/gmapcatcher/downloading.png
 share/pixmaps/gmapcatcher/map.png
-share/pixmaps/gmapcatcher/map.svg
 share/pixmaps/gmapcatcher/maps.ico
 share/pixmaps/gmapcatcher/marker.png
 share/pixmaps/gmapcatcher/marker1.png
 share/pixmaps/gmapcatcher/marker_gps.png
+share/pixmaps/gmapcatcher/marker_s.png
 share/pixmaps/gmapcatcher/missing.png
 share/pixmaps/gmapcatcher/setup.bmp
 share/pixmaps/map.png
 @dirrm share/pixmaps/gmapcatcher
+@dirrm %%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo
 @dirrm %%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial
 @dirrm %%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea
 @dirrm %%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD