Date: Fri, 13 May 2011 04:52:29 GMT From: Craig Whipp <crwhipp@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/156995: [maintainer] update astro/foxtrotgps to 1.0.1 Message-ID: <201105130452.p4D4qTVH052243@red.freebsd.org> Resent-Message-ID: <201105130500.p4D50Joh015826@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 156995
>Category: ports
>Synopsis: [maintainer] update astro/foxtrotgps to 1.0.1
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri May 13 05:00:19 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Craig Whipp
>Release: 8.2-RELEASE
>Organization:
>Environment:
>Description:
Attached is the patch to update astro/foxtrogps to the lastest release, 1.0.1.
This update also fixes the shebang paths on some contributed scripts and fixes my email address in the Makefile.
>How-To-Repeat:
>Fix:
Note that this patch should remove files/patch-src-gps_functions.c, but the closest to doing this that I can figure this out is to empty the file. After applying the patch, please remove this file. If there's a better way to do this, please let me know - or if there's anything else I could be doing differently.
Thanks!
# cd /usr/ports/astro/foxtrotgps
# patch -p1 < ${path to patch}
# rm files/patch-src-gps_functions.c
Patch attached with submission follows:
diff -rupN foxtrotgps/Makefile foxtrotgps_devel/Makefile
--- foxtrotgps/Makefile 2011-03-29 10:48:56.000000000 -0700
+++ foxtrotgps_devel/Makefile 2011-05-12 21:21:14.000000000 -0700
@@ -1,13 +1,12 @@
# New ports collection makefile for: foxtrotgps
# Date created: 15 January 2011
-# Whom: crwhipp
+# Whom: crwhipp@gmail.com
#
# $FreeBSD: ports/astro/foxtrotgps/Makefile,v 1.3 2011/03/25 20:30:54 amdmi3 Exp $
#
PORTNAME= foxtrotgps
-PORTVERSION= 1.0.0
-PORTREVISION= 2
+PORTVERSION= 1.0.1
CATEGORIES= astro geography
MASTER_SITES= http://www.foxtrotgps.org/releases/
diff -rupN foxtrotgps/distinfo foxtrotgps_devel/distinfo
--- foxtrotgps/distinfo 2011-03-29 10:48:56.000000000 -0700
+++ foxtrotgps_devel/distinfo 2011-05-12 21:21:14.000000000 -0700
@@ -1,2 +1,2 @@
-SHA256 (foxtrotgps-1.0.0.tar.gz) = 24f789294ae4f4251adccdb5f0c677b3fd6dea9bce2b6a17497f87a0dc3d056a
-SIZE (foxtrotgps-1.0.0.tar.gz) = 521774
+SHA256 (foxtrotgps-1.0.1.tar.gz) = 059158fd8e61137e2e6d6e01685add7fb85cce8483faa99efb01187f2ba50841
+SIZE (foxtrotgps-1.0.1.tar.gz) = 489427
diff -rupN foxtrotgps/files/patch-contrib-convert2gpx foxtrotgps_devel/files/patch-contrib-convert2gpx
--- foxtrotgps/files/patch-contrib-convert2gpx 1969-12-31 17:00:00.000000000 -0700
+++ foxtrotgps_devel/files/patch-contrib-convert2gpx 2011-05-12 21:21:14.000000000 -0700
@@ -0,0 +1,10 @@
+=== modified file 'contrib/convert2gpx'
+--- contrib/convert2gpx 2010-08-08 22:50:21 +0000
++++ contrib/convert2gpx 2011-03-11 02:56:21 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/local/bin/perl
+ #
+ # (c)2008 Marcus Bauer - License GPLv2
+ #
+
diff -rupN foxtrotgps/files/patch-contrib-convert2osm foxtrotgps_devel/files/patch-contrib-convert2osm
--- foxtrotgps/files/patch-contrib-convert2osm 1969-12-31 17:00:00.000000000 -0700
+++ foxtrotgps_devel/files/patch-contrib-convert2osm 2011-05-12 21:21:14.000000000 -0700
@@ -0,0 +1,10 @@
+=== modified file 'contrib/convert2osm'
+--- contrib/convert2osm 2010-08-08 22:28:45 +0000
++++ contrib/convert2osm 2011-03-11 02:56:28 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/local/bin/perl
+ #
+ # (c) 2008 Marcus Bauer
+ # License: GPLv2
+
diff -rupN foxtrotgps/files/patch-contrib-georss2foxtrotgps-poi foxtrotgps_devel/files/patch-contrib-georss2foxtrotgps-poi
--- foxtrotgps/files/patch-contrib-georss2foxtrotgps-poi 1969-12-31 17:00:00.000000000 -0700
+++ foxtrotgps_devel/files/patch-contrib-georss2foxtrotgps-poi 2011-05-12 21:21:14.000000000 -0700
@@ -0,0 +1,10 @@
+=== modified file 'contrib/georss2foxtrotgps-poi'
+--- contrib/georss2foxtrotgps-poi 2010-08-08 22:51:57 +0000
++++ contrib/georss2foxtrotgps-poi 2011-03-11 02:56:36 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/local/bin/python
+ #
+ # Basic program to import GeoRSS points into FoxtrotGPS as points of interest
+ #
+
diff -rupN foxtrotgps/files/patch-src-gps_functions.c foxtrotgps_devel/files/patch-src-gps_functions.c
--- foxtrotgps/files/patch-src-gps_functions.c 2011-03-29 10:48:56.000000000 -0700
+++ foxtrotgps_devel/files/patch-src-gps_functions.c 1969-12-31 17:00:00.000000000 -0700
@@ -1,94 +0,0 @@
---- src/gps_functions.c.orig 2011-03-22 21:11:33.000000000 +0300
-+++ src/gps_functions.c 2011-03-22 21:58:20.000000000 +0300
-@@ -31,7 +31,8 @@
-
-
- static GIOChannel *gpsd_io_channel =NULL;
--static struct gps_data_t *libgps_gpsdata = NULL;
-+static struct gps_data_t libgps_gpsdata;
-+static int libgps_initialized = 0;
-
- static guint sid1, sid3;
- guint watchdog;
-@@ -699,9 +700,7 @@
- gpsdata = NULL;
- g_source_remove(sid1);
- g_source_remove(sid3);
-- gps_close(libgps_gpsdata);
-- libgps_gpsdata = NULL;
--
-+ gps_close(&libgps_gpsdata);
-
- return FALSE;
- }
-@@ -713,28 +712,28 @@
- {
- int ret;
-
-- if (libgps_gpsdata == NULL)
-+ if (libgps_initialized == 0)
- return FALSE;
-
-- ret = gps_poll(libgps_gpsdata);
-- if (ret == 0)
-+ ret = gps_read(&libgps_gpsdata);
-+ if (ret > 0)
- {
-- gpsdata->satellites_used = libgps_gpsdata->satellites_used;
-- gpsdata->hdop = libgps_gpsdata->dop.hdop;
-- gpsdata->fix.time = libgps_gpsdata->fix.time;
-+ gpsdata->satellites_used = libgps_gpsdata.satellites_used;
-+ gpsdata->hdop = libgps_gpsdata.dop.hdop;
-+ gpsdata->fix.time = libgps_gpsdata.fix.time;
- if (isnan(gpsdata->fix.time))
- {
- gpsdata->fix.time = (time_t) 0;
- }
-- gpsdata->valid = (libgps_gpsdata->status != STATUS_NO_FIX);
-+ gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX);
- if (gpsdata->valid)
- {
- gpsdata->seen_vaild = TRUE;
-- gpsdata->fix.latitude = libgps_gpsdata->fix.latitude;
-- gpsdata->fix.longitude = libgps_gpsdata->fix.longitude;
-- gpsdata->fix.speed = libgps_gpsdata->fix.speed;
-- gpsdata->fix.heading = libgps_gpsdata->fix.track;
-- gpsdata->fix.altitude = libgps_gpsdata->fix.altitude;
-+ gpsdata->fix.latitude = libgps_gpsdata.fix.latitude;
-+ gpsdata->fix.longitude = libgps_gpsdata.fix.longitude;
-+ gpsdata->fix.speed = libgps_gpsdata.fix.speed;
-+ gpsdata->fix.heading = libgps_gpsdata.fix.track;
-+ gpsdata->fix.altitude = libgps_gpsdata.fix.altitude;
- }
-
- g_source_remove(watchdog);
-@@ -758,11 +757,11 @@
- void *
- get_gps_thread(void *ptr)
- {
-- libgps_gpsdata = gps_open(global_server, global_port);
-- if (libgps_gpsdata)
-+ if (gps_open(global_server, global_port, &libgps_gpsdata) == 0)
- {
- fprintf(stderr, "connection to gpsd SUCCEEDED \n");
--
-+
-+ libgps_initialized = 1;
- global_reconnect_gpsd = FALSE;
-
- if(!gpsdata)
-@@ -771,12 +770,12 @@
- }
-
-
-- gps_stream(libgps_gpsdata, WATCH_ENABLE | POLL_NONBLOCK, NULL);
-+ gps_stream(&libgps_gpsdata, WATCH_ENABLE, NULL);
-
- watchdog = g_timeout_add_seconds_full(G_PRIORITY_DEFAULT_IDLE,60,reset_gpsd_io,NULL,NULL);
-
-
-- gpsd_io_channel = g_io_channel_unix_new(libgps_gpsdata->gps_fd);
-+ gpsd_io_channel = g_io_channel_unix_new(libgps_gpsdata.gps_fd);
- g_io_channel_set_flags(gpsd_io_channel, G_IO_FLAG_NONBLOCK, NULL);
-
-
diff -rupN foxtrotgps/pkg-plist foxtrotgps_devel/pkg-plist
--- foxtrotgps/pkg-plist 2011-03-29 10:48:56.000000000 -0700
+++ foxtrotgps_devel/pkg-plist 2011-05-12 21:21:14.000000000 -0700
@@ -16,6 +16,7 @@ share/applications/foxtrotgps.desktop
%%DOCSDIR%%/AUTHORS
%%DOCSDIR%%/COPYING
%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/HACKING
%%DOCSDIR%%/INSTALL
%%DOCSDIR%%/NEWS
%%DOCSDIR%%/README
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105130452.p4D4qTVH052243>