From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 10 11:50:13 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA434106564A for ; Wed, 10 Aug 2011 11:50:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 8E1DA8FC1B for ; Wed, 10 Aug 2011 11:50:13 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p7ABoDRU064365 for ; Wed, 10 Aug 2011 11:50:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p7ABoD8O064364; Wed, 10 Aug 2011 11:50:13 GMT (envelope-from gnats) Resent-Date: Wed, 10 Aug 2011 11:50:13 GMT Resent-Message-Id: <201108101150.p7ABoD8O064364@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Christoph Moench-Tegeder Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14A1E1065672 for ; Wed, 10 Aug 2011 11:46:12 +0000 (UTC) (envelope-from cmt@reindeer.exwg.net) Received: from smtp.burggraben.net (ns.exwg.net [88.198.69.35]) by mx1.freebsd.org (Postfix) with ESMTP id A6C768FC0A for ; Wed, 10 Aug 2011 11:46:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp.burggraben.net (Postfix) with ESMTP id D323F6003D4 for ; Wed, 10 Aug 2011 13:27:17 +0200 (CEST) Received: from smtp.burggraben.net ([127.0.0.1]) by localhost (ns.burggraben.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f-X9ZFw2BaRZ for ; Wed, 10 Aug 2011 13:27:17 +0200 (CEST) Received: from reindeer.exwg.net (port-92-198-130-130.static.qsc.de [92.198.130.130]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "reindeer.exwg.net", Issuer "Christoph Moench-Tegeder" (verified OK)) by smtp.burggraben.net (Postfix) with ESMTPS for ; Wed, 10 Aug 2011 13:27:17 +0200 (CEST) Received: by reindeer.exwg.net (Postfix, from userid 1000) id 1F2F7A101C; Wed, 10 Aug 2011 13:27:15 +0200 (CEST) Message-Id: <20110810112716.1F2F7A101C@reindeer.exwg.net> Date: Wed, 10 Aug 2011 13:27:15 +0200 (CEST) From: Christoph Moench-Tegeder To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/159640: [PATCH] astro/qlandkartegt : upgrade to 1.2.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Christoph Moench-Tegeder List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2011 11:50:13 -0000 >Number: 159640 >Category: ports >Synopsis: [PATCH] astro/qlandkartegt : upgrade to 1.2.2 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Aug 10 11:50:12 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Christoph Moench-Tegeder >Release: FreeBSD 8.2-RELEASE-p2 amd64 >Organization: >Environment: System: FreeBSD reindeer.exwg.net 8.2-RELEASE-p2 FreeBSD 8.2-RELEASE-p2 #9: Sun May 29 18:53:49 CEST 2011 cmt@reindeer.exwg.net:/usr/obj/usr/src/sys/CMT amd64 astro/qlandkartegt 1.1.1_1 >Description: Version 1.2.2 is out, this patch updates the port >How-To-Repeat: >Fix: diff -Nru astro/qlandkartegt.orig/Makefile astro/qlandkartegt/Makefile --- astro/qlandkartegt.orig/Makefile 2011-07-15 07:42:43.000000000 +0200 +++ astro/qlandkartegt/Makefile 2011-08-10 12:50:50.000000000 +0200 @@ -6,8 +6,7 @@ # PORTNAME= qlandkartegt -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.2.2 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/QLandkarteGT%20${PORTVERSION} diff -Nru astro/qlandkartegt.orig/distinfo astro/qlandkartegt/distinfo --- astro/qlandkartegt.orig/distinfo 2011-03-27 21:03:17.000000000 +0200 +++ astro/qlandkartegt/distinfo 2011-08-10 12:51:07.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (qlandkartegt-1.1.1.tar.gz) = 0288c94edcb0af4e39bc045c8607ed9404b4692c44e5409eff64329a21b33af9 -SIZE (qlandkartegt-1.1.1.tar.gz) = 3963101 +SHA256 (qlandkartegt-1.2.2.tar.gz) = 37c241d84e2525c9daa73d05c7101912031944a8ef7f399acdf5f731da8f443d +SIZE (qlandkartegt-1.2.2.tar.gz) = 4300356 diff -Nru astro/qlandkartegt.orig/files/patch-src-CDeviceGPSD.cpp astro/qlandkartegt/files/patch-src-CDeviceGPSD.cpp --- astro/qlandkartegt.orig/files/patch-src-CDeviceGPSD.cpp 2011-05-14 17:09:40.000000000 +0200 +++ astro/qlandkartegt/files/patch-src-CDeviceGPSD.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -Index: src/CDeviceGPSD.cpp -=================================================================== ---- src/CDeviceGPSD.cpp (revision 2719) -+++ src/CDeviceGPSD.cpp (working copy) -@@ -138,6 +138,7 @@ - log_mutex( new QMutex() ), - pipe_fd( _pipe_fd ) - { -+ gpsdata = NULL; - } - - -@@ -149,7 +150,14 @@ - - void CGPSDThread::run() - { -+#if GPSD_API_MAJOR_VERSION >= 5 -+ int socket; -+ -+ if( gpsdata = new gps_data_t ) -+ socket = gps_open( "localhost", DEFAULT_GPSD_PORT, gpsdata ); -+#else - gpsdata = gps_open( "localhost", DEFAULT_GPSD_PORT ); -+#endif - if( !gpsdata ) - { - // TODO: message box (from other thread) -@@ -187,13 +195,20 @@ - } // if - else if( FD_ISSET( gpsdata->gps_fd, &fds ) ) - { -+#if GPSD_API_MAJOR_VERSION >= 5 -+ gps_read( gpsdata ); -+#else - gps_poll( gpsdata ); -+#endif - if( !decodeData() ) break; - } // else if - } // else if - } // while - - gps_close( gpsdata ); -+#if GPSD_API_MAJOR_VERSION >= 5 -+ delete gpsdata; -+#endif - qDebug() << "thread done"; - } diff -Nru astro/qlandkartegt.orig/pkg-plist astro/qlandkartegt/pkg-plist --- astro/qlandkartegt.orig/pkg-plist 2010-05-19 06:45:54.000000000 +0200 +++ astro/qlandkartegt/pkg-plist 2011-08-10 13:05:48.000000000 +0200 @@ -1,10 +1,11 @@ +bin/map2gcm bin/qlandkartegt bin/qlandkartegt.bin share/applications/qlandkartegt.desktop share/pixmaps/qlandkartegt.png -%%DATADIR%%/translations/qlandkartegt_de_DE.qm +%%DATADIR%%/translations/qlandkartegt_de.qm %%DATADIR%%/translations/qlandkartegt_es_ES.qm -%%DATADIR%%/translations/qlandkartegt_fr_FR.qm +%%DATADIR%%/translations/qlandkartegt_fr.qm %%DATADIR%%/translations/qlandkartegt_it_IT.qm %%DATADIR%%/translations/qlandkartegt_nl_NL.qm %%DATADIR%%/translations/qlandkartegt_ru_RU.qm >Release-Note: >Audit-Trail: >Unformatted: