Update to upstream version qlandkartegt-1.3.2.

4 files changed, 10 insertions, 46 deletions

diff --git a/geography/qlandkartegt/Makefile b/geography/qlandkartegt/Makefile
index 35668a1a410..44ce0129a2b 100644
--- a/geography/qlandkartegt/Makefile
+++ b/geography/qlandkartegt/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2012/01/13 10:55:10 obache Exp $
+# $NetBSD: Makefile,v 1.15 2012/01/28 13:51:56 jkunz Exp $
 #
 
-DISTNAME=	qlandkartegt-1.0.0
-PKGREVISION=	5
+DISTNAME=	qlandkartegt-1.3.2
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qlandkartegt/}
 
diff --git a/geography/qlandkartegt/PLIST b/geography/qlandkartegt/PLIST
index d57a9329088..efc9b183900 100644
--- a/geography/qlandkartegt/PLIST
+++ b/geography/qlandkartegt/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2011/01/13 22:55:20 jkunz Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/01/28 13:51:57 jkunz Exp $
 bin/qlandkartegt
-share/qlandkartegt/translations/qlandkartegt_de_DE.qm
+share/qlandkartegt/translations/qlandkartegt_de.qm
 share/qlandkartegt/translations/qlandkartegt_es_ES.qm
-share/qlandkartegt/translations/qlandkartegt_fr_FR.qm
+share/qlandkartegt/translations/qlandkartegt_fr.qm
 share/qlandkartegt/translations/qlandkartegt_it_IT.qm
 share/qlandkartegt/translations/qlandkartegt_nl_NL.qm
-share/qlandkartegt/translations/qlandkartegt_ru_RU.qm
+share/qlandkartegt/translations/qlandkartegt_ru.qm
 share/applications/qlandkartegt.desktop
 man/man1/qlandkartegt.1
 share/pixmaps/qlandkartegt.png
diff --git a/geography/qlandkartegt/distinfo b/geography/qlandkartegt/distinfo
index 6d840a5d1be..463c1523ca1 100644
--- a/geography/qlandkartegt/distinfo
+++ b/geography/qlandkartegt/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.5 2011/03/31 20:21:34 drochner Exp $
+$NetBSD: distinfo,v 1.6 2012/01/28 13:51:57 jkunz Exp $
 
-SHA1 (qlandkartegt-1.0.0.tar.gz) = 1152383dcec41b3f698897bc4cd1f8cf0b5cbfe9
-RMD160 (qlandkartegt-1.0.0.tar.gz) = 373924997ca707007daa024e394c8e033df42f9e
-Size (qlandkartegt-1.0.0.tar.gz) = 3799397 bytes
+SHA1 (qlandkartegt-1.3.2.tar.gz) = 38f2204a94b8f0c47e1ae5d693c2384586aea1fb
+RMD160 (qlandkartegt-1.3.2.tar.gz) = 062c4fa1bddf95319493e2deb225018cf5e21c0d
+Size (qlandkartegt-1.3.2.tar.gz) = 4549942 bytes
 SHA1 (patch-aa) = e81de01cd6227b6b486eeee244c31ee486363d6a
 SHA1 (patch-ab) = 86ca39903638df9aa5dd904cf1d071dd851ca2b7
-SHA1 (patch-ac) = 4f410abe01923d0a66a08b2f4c584b895867a6fd
diff --git a/geography/qlandkartegt/patches/patch-ac b/geography/qlandkartegt/patches/patch-ac
deleted file mode 100644
index ca5571ec843..00000000000
--- a/geography/qlandkartegt/patches/patch-ac
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2011/03/31 20:21:34 drochner Exp $
-
-for gpsd-2.96
-
---- src/CDeviceGPSD.cpp.orig	2011-03-15 20:13:04.000000000 +0000
-+++ src/CDeviceGPSD.cpp
-@@ -138,6 +138,7 @@ CGPSDThread::CGPSDThread( int _pipe_fd )
- log_mutex( new QMutex() ),
- pipe_fd( _pipe_fd )
- {
-+    gpsdata = &gpsdata_store;
- }
- 
- 
-@@ -149,8 +150,8 @@ CGPSDThread::~CGPSDThread()
- 
- void CGPSDThread::run()
- {
--    gpsdata = gps_open( "localhost", DEFAULT_GPSD_PORT );
--    if( !gpsdata )
-+    int res = gps_open( "localhost", DEFAULT_GPSD_PORT, gpsdata );
-+    if( res )
-     {
-         // TODO: message box (from other thread)
-         qDebug() << "gps_open failed.";
-@@ -187,7 +188,7 @@ void CGPSDThread::run()
-             }                    // if
-             else if( FD_ISSET( gpsdata->gps_fd, &fds ) )
-             {
--                gps_poll( gpsdata );
-+                gps_read( gpsdata );
-                 if( !decodeData() ) break;
-             }                    // else if
-         }                        // else if