-update to 0.17.2

 changes: bugfixes
-make it build against gpsd-2.96

4 files changed, 68 insertions, 10 deletions

diff --git a/geography/merkaartor/Makefile b/geography/merkaartor/Makefile
index 77510c92ef9..629785d33a5 100644
--- a/geography/merkaartor/Makefile
+++ b/geography/merkaartor/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2011/03/30 19:07:07 gdt Exp $
+# $NetBSD: Makefile,v 1.22 2011/04/11 20:15:00 drochner Exp $
 #
 
-DISTNAME=	merkaartor-0.17.0
-PKGREVISION=	2
+DISTNAME=	merkaartor-0.17.2
 CATEGORIES=	geography
-MASTER_SITES=	http://merkaartor.be/attachments/download/192/
+MASTER_SITES=	http://merkaartor.be/attachments/download/253/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jkunz@NetBSD.org
@@ -16,7 +15,7 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 QMAKE=			${QTDIR}/bin/qmake
 CONFIGURE_ARGS=		PREFIX=${PREFIX} NODEBUG=1 OSMARENDER=1 PROJ=1 GDAL=1 \
-			GEOIMAGE=1 GPSD=1 RELEASE=1
+			GEOIMAGE=1 GPSDLIB=1 RELEASE=1
 
 SUBST_CLASSES+=			installtarget
 SUBST_MESSAGE.installtarget=	Fixing wrong install target
diff --git a/geography/merkaartor/PLIST b/geography/merkaartor/PLIST
index 227c0d363e2..87fad68cf73 100644
--- a/geography/merkaartor/PLIST
+++ b/geography/merkaartor/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2010/06/16 19:43:52 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/04/11 20:15:00 drochner Exp $
 bin/merkaartor
+lib/merkaartor/plugins/background/libMCadastreFranceBackgroundPlugin.la
 lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.la
+lib/merkaartor/plugins/background/libMGeoTiffBackgroundPlugin.la
+lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.la
 lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.la
 lib/merkaartor/plugins/background/libMYahooBackgroundPlugin.la
 lib/merkaartor/plugins/background/libMYahooTiledBackgroundPlugin.la
@@ -15,7 +18,10 @@ share/merkaartor/translations/merkaartor_ar.qm
 share/merkaartor/translations/merkaartor_cs.qm
 share/merkaartor/translations/merkaartor_de.qm
 share/merkaartor/translations/merkaartor_es.qm
+share/merkaartor/translations/merkaartor_et.qm
 share/merkaartor/translations/merkaartor_fr.qm
+share/merkaartor/translations/merkaartor_hr.qm
+share/merkaartor/translations/merkaartor_hu.qm
 share/merkaartor/translations/merkaartor_it.qm
 share/merkaartor/translations/merkaartor_ja.qm
 share/merkaartor/translations/merkaartor_nl.qm
diff --git a/geography/merkaartor/distinfo b/geography/merkaartor/distinfo
index 877537421a0..1f3d30d9c00 100644
--- a/geography/merkaartor/distinfo
+++ b/geography/merkaartor/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2011/01/13 22:24:34 jkunz Exp $
+$NetBSD: distinfo,v 1.8 2011/04/11 20:15:00 drochner Exp $
 
-SHA1 (merkaartor-0.17.0.tar.bz2) = bd7a162a6bac0073e05b4960db2d941ae41b6e7e
-RMD160 (merkaartor-0.17.0.tar.bz2) = c342bdf3c19c4d76c96c62ec9801b3e6a50c9254
-Size (merkaartor-0.17.0.tar.bz2) = 7138228 bytes
+SHA1 (merkaartor-0.17.2.tar.bz2) = f789141db427bf25bb3b61801fefc98ab0430012
+RMD160 (merkaartor-0.17.2.tar.bz2) = c5c8944872828ba5ada6003cd5821f33899da3cb
+Size (merkaartor-0.17.2.tar.bz2) = 7138991 bytes
+SHA1 (patch-aa) = a5bdc832ed6a14c9fffe0a6db046cf9842686877
diff --git a/geography/merkaartor/patches/patch-aa b/geography/merkaartor/patches/patch-aa
new file mode 100644
index 00000000000..38fb84a4c76
--- /dev/null
+++ b/geography/merkaartor/patches/patch-aa
@@ -0,0 +1,52 @@
+$NetBSD: patch-aa,v 1.3 2011/04/11 20:15:00 drochner Exp $
+
+--- src/GPS/qgpsdevice.cpp.orig	2011-02-10 12:00:35.000000000 +0000
++++ src/GPS/qgpsdevice.cpp
+@@ -959,10 +959,9 @@ void QGPSDDevice::run()
+ //    exec();
+     QEventLoop l;
+ 
+-    Server = new gpsmm();
+     errno = 0;
+-    gpsdata = Server->open(M_PREFS->getGpsdHost().toAscii().data(),QString::number(M_PREFS->getGpsdPort()).toAscii().data());
+-    if (!gpsdata) {
++    Server = new gpsmm(M_PREFS->getGpsdHost().toAscii().data(),QString::number(M_PREFS->getGpsdPort()).toAscii().data());
++    if (!Server) {
+ #ifndef Q_OS_WIN32
+         QString msg( (errno<0) ? gps_errstr(errno) : strerror(errno) );
+ #else
+@@ -978,7 +977,7 @@ void QGPSDDevice::run()
+ 
+     forever {
+ #if GPSD_API_MAJOR_VERSION > 3
+-        if (Server->waiting())
++        if (Server->waiting(0))
+ #endif
+             onDataAvailable();
+         l.processEvents();
+@@ -994,7 +993,7 @@ void QGPSDDevice::onDataAvailable()
+        if (!gpsdata)
+            return;
+     #else
+-       if ( Server->waiting() )
++       if ( Server->waiting(0) )
+            {
+            errno = 0;
+            gpsdata = Server->read();
+@@ -1027,13 +1026,13 @@ void QGPSDDevice::onDataAvailable()
+     setLatitude(gpsdata->fix.latitude);
+     setLongitude(gpsdata->fix.longitude);
+     double Alt = gpsdata->fix.altitude;
+-    if (!__isnan(Alt))
++    if (!std::isnan(Alt))
+         setAltitude(Alt);
+     double Speed = gpsdata->fix.speed;
+-    if (!__isnan(Speed))
++    if (!std::isnan(Speed))
+         setSpeed(Speed);
+     double Heading = gpsdata->fix.track;
+-    if (!__isnan(Heading))
++    if (!std::isnan(Heading))
+         setHeading(Heading);
+     if (gpsdata->fix.time)
+         cur_datetime = QDateTime::fromTime_t(gpsdata->fix.time);