Update to 0.8.0.0

5 files changed, 172 insertions, 186 deletions

diff --git a/astro/gmapcatcher/Makefile b/astro/gmapcatcher/Makefile
index 45e3d49afa97..bed6a788dd29 100644
--- a/astro/gmapcatcher/Makefile
+++ b/astro/gmapcatcher/Makefile
@@ -1,15 +1,10 @@
-# New ports collection makefile for:	gmapcatcher
-# Date created:		24 March 2010
-# Whom:			Kevin Lo <kevlo@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	gmapcatcher
-PORTVERSION=	0.7.7.2
+PORTVERSION=	0.8.0.0
 CATEGORIES=	astro geography
 MASTER_SITES=	http://gmapcatcher.googlecode.com/files/
-DISTNAME=	GMapCatcher-${PORTVERSION}
+DISTNAME=	mapcatcher_${PORTVERSION}
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Offline map viewer
@@ -17,22 +12,20 @@ COMMENT=	Offline map viewer
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
 		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/g}
+USE_GNOME=	pygtk2
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
-USE_GNOME=	pygtk2
-PYDISTUTILS_EGGINFO=${DISTNAME}-py${PYTHON_VER}.egg-info
-
-WRKSRC=		${WRKDIR}/${DISTNAME}
-
-MAN1=		mapcatcher.1 \
-		mapdownloader.1
+PYDISTUTILS_NOEGGINFO=	yes
+PLIST_SUB=	PYTHON_VER=${PYTHON_VER}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/share/pixmaps,${PREFIX}/share/pixmaps,g' \
-		${WRKSRC}/gmapcatcher/mapPixbuf.py
+		${WRKSRC}/gmapcatcher/widgets/mapPixbuf.py
+
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/download.py ${PREFIX}/bin/mapdownloader
-	${INSTALL_SCRIPT} ${WRKSRC}/maps.py ${PREFIX}/bin/mapcatcher
+	${INSTALL_SCRIPT} ${WRKSRC}/mapcatcher ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/mapdownloader ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
diff --git a/astro/gmapcatcher/distinfo b/astro/gmapcatcher/distinfo
index f08c9ac99b82..7e95339af375 100644
--- a/astro/gmapcatcher/distinfo
+++ b/astro/gmapcatcher/distinfo
@@ -1,2 +1,2 @@
-SHA256 (GMapCatcher-0.7.7.2.tar.gz) = 5633808e0f1cc5908a75998b9361c2988c7742ea4f8564957f58ce6eb0a46863
-SIZE (GMapCatcher-0.7.7.2.tar.gz) = 1037863
+SHA256 (mapcatcher_0.8.0.0.tar.gz) = bc006859e3f619e95fa810caa3a30ac122a132b316ec2e5e3ba25f6b41a0f9e3
+SIZE (mapcatcher_0.8.0.0.tar.gz) = 438995
diff --git a/astro/gmapcatcher/files/patch-gmapcatcher_mapArgs.py b/astro/gmapcatcher/files/patch-gmapcatcher_mapArgs.py
index 1a6eb691da81..5d06dd885401 100644
--- a/astro/gmapcatcher/files/patch-gmapcatcher_mapArgs.py
+++ b/astro/gmapcatcher/files/patch-gmapcatcher_mapArgs.py
@@ -1,6 +1,6 @@
---- 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 @@
+--- gmapcatcher/mapArgs.py.orig	2012-10-17 02:09:15.000000000 +0800
++++ gmapcatcher/mapArgs.py	2012-12-12 13:58:33.000000000 +0800
+@@ -46,10 +46,10 @@
          print '                very useful to download maps of entire world'
          print ' '
          print 'SAMPLE USAGE'
@@ -15,12 +15,12 @@
  
      def __init__(self, arrArgs=()):
          if len(arrArgs) > 1:
-@@ -96,7 +96,7 @@
+@@ -99,7 +99,7 @@
                          self.lng_range = 179
  
      def __str__(self):
--        return ("download.py --max-zoom=%s --min-zoom=%s" \
-+        return ("mapdownloader --max-zoom=%s --min-zoom=%s" \
-                 + " --latitude=%s --longitude=%s" \
-                 + " --width=%s --height=%s") % \
+-        return ("download.py --max-zoom=%s --min-zoom=%s" +
++        return ("mapdownloader --max-zoom=%s --min-zoom=%s" +
+                 " --latitude=%s --longitude=%s" +
+                 " --width=%s --height=%s") % \
                 (self.max_zl, self.min_zl,
diff --git a/astro/gmapcatcher/files/patch-setup.py b/astro/gmapcatcher/files/patch-setup.py
index cd806607f195..ba5a82f6741b 100644
--- a/astro/gmapcatcher/files/patch-setup.py
+++ b/astro/gmapcatcher/files/patch-setup.py
@@ -1,26 +1,20 @@
---- 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 @@
+--- setup.py.orig	2012-10-17 02:09:15.000000000 +0800
++++ setup.py	2012-12-12 13:13:04.000000000 +0800
+@@ -13,15 +13,13 @@
          description = 'Offline Map Viewer',
          version = VERSION,
          url = WEB_ADDRESS,
 -        data_files = [('share/doc/mapcatcher', ['README', 'changelog']),
 -                    ('share/applications', ['gmapcatcher.desktop']),
 -                    ('share/man/man1',
--                        ['man/mapcatcher.1.gz', 'man/mapdownloader.1.gz']),
--                    ('share/pixmaps', ['images/mapcatcher.png']),
-+	data_files = [('share/applications', ['gmapcatcher.desktop']),
++        data_files = [('share/applications', ['gmapcatcher.desktop']),
 +                    ('man/man1',
-+                        ['man/mapcatcher.1', 'man/mapdownloader.1']),
-+                    ('share/pixmaps', ['images/map.png']),
+                         ['man/mapcatcher.1.gz', 'man/mapdownloader.1.gz']),
+                     ('share/pixmaps', ['images/mapcatcher.png']),
                      ('share/pixmaps/gmapcatcher',
                      map(lambda(thestr): "images/" + thestr, os.listdir('images')))
          ],
 -        scripts = ['mapcatcher', 'mapdownloader'],
          packages = ['gmapcatcher', 'gmapcatcher.mapServers',
-                     'gmapcatcher.pyGPSD', 'gmapcatcher.pyGPSD.nmea',
--                    'gmapcatcher.pyGPSD.nmea.serial']
-+                    'gmapcatcher.pyGPSD.nmea.serial', 'gmapcatcher.tilesRepo']
-     )
- else:
-     import py2exe
+                     'gmapcatcher.tilesRepo', 'gmapcatcher.widgets',
+                     'gmapcatcher.gpxpy', 'gmapcatcher.gps']
diff --git a/astro/gmapcatcher/pkg-plist b/astro/gmapcatcher/pkg-plist
index 3f05f1b84d95..4156dc3a87c6 100644
--- a/astro/gmapcatcher/pkg-plist
+++ b/astro/gmapcatcher/pkg-plist
@@ -1,35 +1,48 @@
 bin/mapcatcher
 bin/mapdownloader
-%%PYTHON_SITELIBDIR%%/gmapcatcher/DLWindow.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/DLWindow.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/DLWindow.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/EXWindow.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/EXWindow.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/EXWindow.pyo
+%%PYTHON_SITELIBDIR%%/GMapCatcher-0.8.0.0-py%%PYTHON_VER%%.egg-info
 %%PYTHON_SITELIBDIR%%/gmapcatcher/__init__.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/changeableConst.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/changeableConst.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/changeableConst.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/customMsgBox.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/customMsgBox.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/customMsgBox.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/customWidgets.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/customWidgets.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/customWidgets.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/cmRoute.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/cmRoute.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/cmRoute.pyo
 %%PYTHON_SITELIBDIR%%/gmapcatcher/fileUtils.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/fileUtils.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/fileUtils.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/gps.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/gps.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/gps.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gps/__init__.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gps/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gps/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gps/client.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gps/client.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gps/client.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gps/fake.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gps/fake.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gps/fake.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gps/gps.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gps/gps.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gps/gps.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gps/misc.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gps/misc.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gps/misc.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gpxpy/__init__.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gpxpy/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gpxpy/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gpxpy/geo.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gpxpy/geo.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gpxpy/geo.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gpxpy/gpx.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gpxpy/gpx.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gpxpy/gpx.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gpxpy/parser.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gpxpy/parser.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gpxpy/parser.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gpxpy/utils.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gpxpy/utils.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/gpxpy/utils.pyo
 %%PYTHON_SITELIBDIR%%/gmapcatcher/gtkThread.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/gtkThread.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/gtkThread.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/inputValidation.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/inputValidation.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/inputValidation.pyo
 %%PYTHON_SITELIBDIR%%/gmapcatcher/lrucache.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/lrucache.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/lrucache.pyo
@@ -48,21 +61,30 @@ bin/mapdownloader
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapGPS.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapGPS.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapGPS.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/mapMark.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/mapMark.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/mapMark.pyo
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapLogging.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapLogging.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapLogging.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/mapPixbuf.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/mapPixbuf.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/mapPixbuf.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapMark.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapMark.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapMark.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/WorldHI.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/WorldHI.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/WorldHI.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/WorldLO.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/WorldLO.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/WorldLO.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/WorldVFR.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/WorldVFR.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/WorldVFR.pyo
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/__init__.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/__init__.pyo
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/cloudMade.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/cloudMade.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/cloudMade.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/eniro.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/eniro.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/eniro.pyo
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/googleMapMaker.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/googleMapMaker.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/googleMapMaker.pyo
@@ -72,15 +94,33 @@ bin/mapdownloader
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/informationFreeway.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/informationFreeway.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/informationFreeway.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/nokia.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/nokia.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/nokia.pyo
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/openCycleMap.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/openCycleMap.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/openCycleMap.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/openSeaMap.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/openSeaMap.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/openSeaMap.pyo
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/openStreetMaps.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/openStreetMaps.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/openStreetMaps.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/refugesInfo.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/refugesInfo.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/refugesInfo.pyo
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/seznam.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/seznam.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/seznam.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/seznamCyclo.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/seznamCyclo.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/seznamCyclo.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/seznamHiking.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/seznamHiking.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/seznamHiking.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/seznamHist.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/seznamHist.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/seznamHist.pyo
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/stamenMaps.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/stamenMaps.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers/stamenMaps.pyo
@@ -99,9 +139,6 @@ bin/mapdownloader
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapTilesTransfer.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapTilesTransfer.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapTilesTransfer.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/mapTools.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/mapTools.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/mapTools.pyo
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapUpdate.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapUpdate.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/mapUpdate.pyo
@@ -114,99 +151,9 @@ bin/mapdownloader
 %%PYTHON_SITELIBDIR%%/gmapcatcher/openhttp.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/openhttp.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/openhttp.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/__init__.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/client_test.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/client_test.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/client_test.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/gpsView.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/gpsView.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/gpsView.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/gpsd.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/gpsd.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/gpsd.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/helper.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/helper.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/helper.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/miniterm.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/miniterm.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/miniterm.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/__init__.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/_port.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/_port.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/_port.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/_types.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/_types.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/_types.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/constants.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/constants.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/constants.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/gps.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/gps.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/gps.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/nmea_playback.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/nmea_playback.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/nmea_playback.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/nmea_record.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/nmea_record.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/nmea_record.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/parse.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/parse.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/parse.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/__init__.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/loopback_connection.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/loopback_connection.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/loopback_connection.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/rfc2217.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/rfc2217.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/rfc2217.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/serialcli.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/serialcli.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/serialcli.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/serialjava.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/serialjava.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/serialjava.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/serialposix.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/serialposix.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/serialposix.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/serialutil.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/serialutil.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/serialutil.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/serialwin32.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/serialwin32.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/serialwin32.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/sermsdos.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/sermsdos.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/sermsdos.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/socket_connection.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/socket_connection.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/socket_connection.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/win32.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/win32.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial/win32.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serialport.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serialport.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serialport.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/setup.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/setup.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/setup.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/tcpport.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/tcpport.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/tcpport.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/tests.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/tests.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/tests.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/track.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/track.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/track.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/scan.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/scan.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/scan.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/serialGPS.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/serialGPS.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/serialGPS.pyo
 %%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/Factory.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/Factory.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo/Factory.pyo
@@ -240,33 +187,84 @@ bin/mapdownloader
 %%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
-%%PYTHON_SITELIBDIR%%/gmapcatcher/widCredits.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/widCredits.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/widCredits.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/widDrawingArea.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/widDrawingArea.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/widDrawingArea.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/widMyGPS.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/widMyGPS.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/widMyGPS.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/widMySettings.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/widMySettings.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/widMySettings.pyo
-%%PYTHON_SITELIBDIR%%/gmapcatcher/widTreeView.py
-%%PYTHON_SITELIBDIR%%/gmapcatcher/widTreeView.pyc
-%%PYTHON_SITELIBDIR%%/gmapcatcher/widTreeView.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/DLWindow.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/DLWindow.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/DLWindow.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/EXWindow.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/EXWindow.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/EXWindow.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/__init__.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/customMsgBox.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/customMsgBox.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/customMsgBox.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/customWidgets.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/customWidgets.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/customWidgets.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/gpsWindow.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/gpsWindow.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/gpsWindow.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/inputValidation.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/inputValidation.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/inputValidation.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/mapDrawingArea.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/mapDrawingArea.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/mapDrawingArea.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/mapHideMapServers.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/mapHideMapServers.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/mapHideMapServers.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/mapPixbuf.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/mapPixbuf.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/mapPixbuf.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/mapTools.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/mapTools.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/mapTools.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/trackWindow.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/trackWindow.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/trackWindow.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widChangeTheme.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widChangeTheme.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widChangeTheme.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widComboBoxEntry.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widComboBoxEntry.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widComboBoxEntry.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widComboBoxLayer.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widComboBoxLayer.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widComboBoxLayer.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widCredits.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widCredits.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widCredits.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widDrawingArea.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widDrawingArea.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widDrawingArea.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widMapServers.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widMapServers.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widMapServers.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widMyGPS.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widMyGPS.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widMyGPS.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widMySettings.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widMySettings.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widMySettings.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widStatusBar.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widStatusBar.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widStatusBar.pyo
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widTreeView.py
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widTreeView.pyc
+%%PYTHON_SITELIBDIR%%/gmapcatcher/widgets/widTreeView.pyo
 %%PYTHON_SITELIBDIR%%/gmapcatcher/xmlUtils.py
 %%PYTHON_SITELIBDIR%%/gmapcatcher/xmlUtils.pyc
 %%PYTHON_SITELIBDIR%%/gmapcatcher/xmlUtils.pyo
+man/man1/mapcatcher.1.gz
+man/man1/mapdownloader.1.gz
 share/applications/gmapcatcher.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/changelog
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 share/pixmaps/gmapcatcher/downloading.png
 share/pixmaps/gmapcatcher/map.png
+share/pixmaps/gmapcatcher/mapcatcher.png
 share/pixmaps/gmapcatcher/maps.ico
 share/pixmaps/gmapcatcher/marker.png
 share/pixmaps/gmapcatcher/marker1.png
@@ -274,12 +272,13 @@ 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
+share/pixmaps/mapcatcher.png
 @dirrm share/pixmaps/gmapcatcher
+@dirrm %%PYTHON_SITELIBDIR%%/gmapcatcher/widgets
 @dirrm %%PYTHON_SITELIBDIR%%/gmapcatcher/tilesRepo
-@dirrm %%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea/serial
-@dirrm %%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD/nmea
-@dirrm %%PYTHON_SITELIBDIR%%/gmapcatcher/pyGPSD
 @dirrm %%PYTHON_SITELIBDIR%%/gmapcatcher/mapServers
+@dirrm %%PYTHON_SITELIBDIR%%/gmapcatcher/gpxpy
+@dirrm %%PYTHON_SITELIBDIR%%/gmapcatcher/gps
 @dirrm %%PYTHON_SITELIBDIR%%/gmapcatcher
+@dirrm %%PYTHON_SITELIBDIR%%
 @dirrmtry share/applications