Date: Fri, 28 Jun 2002 14:05:11 +0200 From: Marco Molteni <molter@tin.it> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/39950: [MAINTAINER UPDATE] astro/gpsdrive Message-ID: <20020628120511.84435.qmail@cobweb.example.org>
next in thread | raw e-mail | index | archive | help
>Number: 39950
>Category: ports
>Synopsis: [MAINTAINER UPDATE] astro/gpsdrive
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 28 05:10:21 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Marco Molteni
>Release: FreeBSD 4.6-PRERELEASE i386
>Organization:
Citello Networks
>Environment:
System: FreeBSD cobweb.example.org 4.6-PRERELEASE FreeBSD 4.6-PRERELEASE #0: Tue May 28 21:10:01 CEST 2002 root@cobweb.example.org:/usr/src/sys/compile/COBWEB i386
>Description:
Update to latest version of Gpsdrive.
Patches also fix instabilities of gpsd on FreeBSD.
>How-To-Repeat:
N/A
>Fix:
apply following patch
diff -u -rN gpsdrive/Makefile gpsdrive-1.23r9/Makefile
--- gpsdrive/Makefile Mon May 20 03:01:16 2002
+++ gpsdrive-1.23r9/Makefile Fri Jun 28 13:26:20 2002
@@ -2,31 +2,37 @@
# Date Created: 16 April 2002
# Whom: Marco Molteni <molter@gufi.org>
#
-# $FreeBSD: ports/astro/gpsdrive/Makefile,v 1.1 2002/05/20 01:01:16 petef Exp $
+# $FreeBSD$
#
PORTNAME= gpsdrive
-PORTVERSION= 1.20.r1
+PORTVERSION= 1.23.r9
CATEGORIES= astro
-MASTER_SITES= http://www.kraftvoll.at/software/ \
- http://ganter.quant-x.at/software/
+MASTER_SITES= http://gpsdrive.kraftvoll.at/ \
+ http://gpsdrive.teachlinux.com/ \
+ http://gpsdrive.flugfunk.de/ \
+ http://gpsdrive.alumnosfdi.org/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/pre/}
MAINTAINER= molter@gufi.org
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+BUILD_DEPENDS= ${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf
-USE_GLIB= yes
USE_GMAKE= yes
USE_GTK= yes
+USE_GLIB= yes
USE_LIBTOOL= yes
-
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ARGS+= --with-debug \
+ --disable-garmin
INSTALLS_SHLIB= yes
MAN1= gpsdrive.1
MANLANG= "" de es
+
+post-install:
+ @${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|g'
.include <bsd.port.mk>
diff -u -rN gpsdrive/distinfo gpsdrive-1.23r9/distinfo
--- gpsdrive/distinfo Mon May 20 03:01:16 2002
+++ gpsdrive-1.23r9/distinfo Wed Jun 26 06:07:33 2002
@@ -1 +1 @@
-MD5 (gpsdrive-1.20pre1.tar.gz) = a66ff1b6b12dd534ad91bb7ccb2b1316
+MD5 (gpsdrive-1.23pre9.tar.gz) = 86dd789483edd37125f863c2c7bf6741
diff -u -rN gpsdrive/files/patch-src-Makefile.in gpsdrive-1.23r9/files/patch-src-Makefile.in
--- gpsdrive/files/patch-src-Makefile.in Thu Jan 1 01:00:00 1970
+++ gpsdrive-1.23r9/files/patch-src-Makefile.in Thu May 23 12:22:08 2002
@@ -0,0 +1,29 @@
+--- src/Makefile.in~ Thu May 23 12:19:57 2002
++++ src/Makefile.in Thu May 23 12:21:24 2002
+@@ -120,7 +120,7 @@
+ bin_PROGRAMS = $(PRG1) gpsdrive gpsd friendsd
+
+ # gpsdrive_LDADD= $(GLIB_LIBS) $(GTK_LIBS) $(PIXLIBS)
+-gpsdrive_LDADD = @LIBS@
++gpsdrive_LDADD = @LIBS@ -lgnugetopt
+ # gpsdrive_CFLAGS=@CFLAGS@
+ # libgpsd_a_CFLAGS=@CFLAGS@
+ # CFLAGS=
+@@ -177,7 +177,7 @@
+
+ am_friendsd_OBJECTS = friendsd.$(OBJEXT)
+ friendsd_OBJECTS = $(am_friendsd_OBJECTS)
+-friendsd_LDADD = $(LDADD)
++friendsd_LDADD = $(LDADD) -lintl
+ friendsd_DEPENDENCIES =
+ friendsd_LDFLAGS =
+ @DISABLEGARMIN_TRUE@am_garble_OBJECTS =
+@@ -187,7 +187,7 @@
+ @DISABLEGARMIN_FALSE@ garmin_link.$(OBJEXT) \
+ @DISABLEGARMIN_FALSE@ garmin_util.$(OBJEXT)
+ garble_OBJECTS = $(am_garble_OBJECTS)
+-garble_LDADD = $(LDADD)
++garble_LDADD = $(LDADD) -lgnugetopt
+ garble_DEPENDENCIES =
+ garble_LDFLAGS =
+ am_gpsd_OBJECTS = gpsd.$(OBJEXT)
diff -u -rN gpsdrive/files/patch-src-em.c gpsdrive-1.23r9/files/patch-src-em.c
--- gpsdrive/files/patch-src-em.c Thu Jan 1 01:00:00 1970
+++ gpsdrive-1.23r9/files/patch-src-em.c Fri Jun 28 13:00:54 2002
@@ -0,0 +1,20 @@
+--- src/em.c~ Tue Apr 16 15:06:51 2002
++++ src/em.c Thu Jun 27 17:54:05 2002
+@@ -362,7 +362,8 @@
+ char *bufp;
+ char *bufp2;
+ int i = 0, j = 0, nmea = 0;
+- int fd, nfds;
++ int fd;
++ extern int nfds;
+
+ if (p[h->ndata] == em_checksum (p, h->ndata))
+ {
+@@ -475,7 +476,6 @@
+ }
+ if (nmea > 0)
+ {
+- nfds = getdtablesize ();
+ if (debug > 4)
+ fprintf (stderr, "%s", buf);
+ for (fd = 0; fd < nfds; fd++)
diff -u -rN gpsdrive/files/patch-src-gpsd.c gpsdrive-1.23r9/files/patch-src-gpsd.c
--- gpsdrive/files/patch-src-gpsd.c Thu Jan 1 01:00:00 1970
+++ gpsdrive-1.23r9/files/patch-src-gpsd.c Fri Jun 28 13:02:04 2002
@@ -0,0 +1,128 @@
+--- src/gpsd.c~ Fri Apr 19 20:26:14 2002
++++ src/gpsd.c Thu Jun 27 18:02:12 2002
+@@ -78,27 +78,31 @@
+ int debug = 0;
+ int device_speed = B4800;
+ int device_type;
++int nfds; /* number of file descriptors to select() for */
+ char *device_name = 0;
+ char *latitude = 0;
+ char *longitude = 0;
+ char latd = 'N';
+ char lond = 'W';
+- /* command line option defaults */
+-char *default_device_name = "/dev/gps";
+-char *default_latitude = "3600.000";
+-char *default_longitude = "-12300.000";
+-
+-int nfds, dsock;
+-int verbose = 1;
+-int bincount;
+
+-int reopen = 0;
++/* command line option defaults */
++static char *default_device_name = "/dev/gps";
++static char *default_latitude = "3600.000";
++static char *default_longitude = "-12300.000";
++
++static int dsock; /* socket to dpgs server */
++
++/* If set, close (and reopen?) the serial interface. Triggered by SIGUSR1. */
++static int reopen = 0;
++
+
+ static int handle_input (int input, fd_set * afds, fd_set * nmea_fds);
+-extern int handle_EMinput (int input, fd_set * afds, fd_set * nmea_fds);
+ static int handle_request (int fd, fd_set * fds);
+-int connectsock (char *host, char *service, char *protocol);
+-void em_send_rtcm (unsigned short *rtcmbuf, int rtcmbytes);
++
++extern int handle_EMinput (int input, fd_set * afds, fd_set * nmea_fds);
++extern int connectsock (char *host, char *service, char *protocol);
++extern void em_send_rtcm (unsigned short *rtcmbuf, int rtcmbytes);
++
+
+ static void
+ onsig (int sig)
+@@ -164,16 +168,17 @@
+ char *default_service = "gpsd";
+ char *default_dgpsserver = "dgps.wsrcc.com";
+ char *default_dgpsport = "rtcm-sc104";
+- char *service = 0;
++ char *service = 0; /* port number to listen to */
+ char *dgpsport = 0;
+ char *dgpsserver = 0;
+ struct sockaddr_in fsin;
+- int msock;
++ int msock; /* listening socket fd */
+ fd_set rfds;
+ fd_set afds;
+ fd_set nmea_fds;
+ int alen;
+- int fd, input;
++ int fd;
++ int input; /* GPS device fd */
+ int need_gps, need_dgps = 0, need_init = 1;
+ extern char *optarg;
+ int option;
+@@ -273,17 +278,18 @@
+ default:
+ fputs ("usage: gpsd [options] \n\
+ options include: \n\
+- -D integer [ set debug level ] \n\
++ -D level [ set debug level. If >= 2, remain in foreground ] \n\
+ -L longitude [ set longitude ] \n\
+- -S integer [ set port for daemon ] \n\
+- -T e [ earthmate flag ] \n\
+- -h [ help message ] \n\
+ -l latitude [ set latitude ] \n\
+- -p string [ set gps device name ] \n\
++ -S port [ set gpsd listening port ] \n\
++ -T type [ set DeLorme models. e = Earthmate, t = Tripmate ] \n\
++ -h [ help message ] \n\
++ -p path [ set gps device pathname ] \n\
+ -s baud_rate [ set baud rate on gps device ] \n\
+ -c [ use dgps service for corrections ] \n\
+- -d host [ set dgps server ] \n\
+- -r port [ set dgps rtcm-sc104 port ] \n\
++ -d host [ set dgps server hostname] \n\
++ -r port [ set dgps server port ] \n\
++ -n [ disable setting default values for longitute and latitute ] \n\
+ ", stderr);
+ exit (0);
+ }
+@@ -354,8 +360,11 @@
+ need_dgps = 0;
+ }
+ }
+-
+- nfds = getdtablesize ();
++#ifndef min
++#define min(a, b) (((a) < (b)) ? (a) : (b))
++#endif
++ /* still wrong, but at least do not coredump */
++ nfds = min (getdtablesize (), FD_SETSIZE);
+
+ FD_ZERO (&afds);
+ FD_ZERO (&nmea_fds);
+@@ -375,10 +384,9 @@
+
+ while (1)
+ {
+- memcpy ((char *) &rfds, (char *) &afds, sizeof (rfds));
++ memcpy (&rfds, &afds, sizeof (rfds));
+
+- if (select (nfds, &rfds, (fd_set *) 0, (fd_set *) 0,
+- (struct timeval *) 0) < 0)
++ if (select (nfds, &rfds, NULL, NULL, NULL) < 0)
+ {
+ if (errno == EINTR)
+ continue;
+@@ -599,6 +607,7 @@
+ {
+ static unsigned char buf[BUFSIZE]; /* that is more then a sentence */
+ static int offset = 0;
++ static int bincount;
+ int fd;
+
+ while (offset < BUFSIZE)
diff -u -rN gpsdrive/files/patch-src-tm.c gpsdrive-1.23r9/files/patch-src-tm.c
--- gpsdrive/files/patch-src-tm.c Thu Jan 1 01:00:00 1970
+++ gpsdrive-1.23r9/files/patch-src-tm.c Fri Jun 28 13:02:33 2002
@@ -0,0 +1,12 @@
+--- src/tm.c~ Fri Apr 5 19:59:45 2002
++++ src/tm.c Wed Jun 26 13:35:52 2002
+@@ -19,6 +19,9 @@
+ extern char latd;
+ extern char lond;
+
++void do_eminit ();
++
++
+ void process_message(char *sentence)
+ {
+ if (checksum(sentence)) {
diff -u -rN gpsdrive/files/patch-src::Makefile.in gpsdrive-1.23r9/files/patch-src::Makefile.in
--- gpsdrive/files/patch-src::Makefile.in Mon May 20 03:01:17 2002
+++ gpsdrive-1.23r9/files/patch-src::Makefile.in Thu Jan 1 01:00:00 1970
@@ -1,31 +0,0 @@
-$FreeBSD: ports/astro/gpsdrive/files/patch-src::Makefile.in,v 1.1 2002/05/20 01:01:17 petef Exp $
-
---- src/Makefile.in.orig Mon Apr 29 15:47:49 2002
-+++ src/Makefile.in Tue Apr 30 17:23:55 2002
-@@ -120,7 +120,7 @@
- bin_PROGRAMS = $(PRG1) gpsdrive gpsd friendsd
-
- # gpsdrive_LDADD= $(GLIB_LIBS) $(GTK_LIBS) $(PIXLIBS)
--gpsdrive_LDADD = @LIBS@
-+gpsdrive_LDADD = @LIBS@ -lgnugetopt
- # gpsdrive_CFLAGS=@CFLAGS@
- # libgpsd_a_CFLAGS=@CFLAGS@
- # CFLAGS=
-@@ -172,7 +172,7 @@
-
- am_friendsd_OBJECTS = friendsd.$(OBJEXT)
- friendsd_OBJECTS = $(am_friendsd_OBJECTS)
--friendsd_LDADD = $(LDADD)
-+friendsd_LDADD = $(LDADD) -lintl
- friendsd_DEPENDENCIES =
- friendsd_LDFLAGS =
- @DISABLEGARMIN_TRUE@am_garble_OBJECTS =
-@@ -182,7 +182,7 @@
- @DISABLEGARMIN_FALSE@ garmin_link.$(OBJEXT) \
- @DISABLEGARMIN_FALSE@ garmin_util.$(OBJEXT)
- garble_OBJECTS = $(am_garble_OBJECTS)
--garble_LDADD = $(LDADD)
-+garble_LDADD = $(LDADD) -lgnugetopt
- garble_DEPENDENCIES =
- garble_LDFLAGS =
- am_gpsd_OBJECTS = gpsd.$(OBJEXT)
diff -u -rN gpsdrive/pkg-descr gpsdrive-1.23r9/pkg-descr
--- gpsdrive/pkg-descr Mon May 20 03:01:16 2002
+++ gpsdrive-1.23r9/pkg-descr Tue May 7 17:11:16 2002
@@ -6,7 +6,7 @@
software is running. GpsDrive is written in C with use of the GTK+ graphic
toolkit.
-WWW: http://ganter.quant-x.at/software/
+WWW: http://gpsdrive.kraftvoll.at/
- Marco
molter@gufi.org
diff -u -rN gpsdrive/pkg-message gpsdrive-1.23r9/pkg-message
--- gpsdrive/pkg-message Thu Jan 1 01:00:00 1970
+++ gpsdrive-1.23r9/pkg-message Fri Jun 28 13:30:23 2002
@@ -0,0 +1,6 @@
+
+NOTES:
+
+Support for Garmin format input is disabled because buggy.
+Set your GPS device to NMEA mode and start gpsd before gpsdrive.
+
diff -u -rN gpsdrive/pkg-plist gpsdrive-1.23r9/pkg-plist
--- gpsdrive/pkg-plist Mon May 20 03:01:16 2002
+++ gpsdrive-1.23r9/pkg-plist Fri Jun 28 13:46:10 2002
@@ -1,31 +1,40 @@
-bin/friendsd
-bin/garble
-bin/gpsd
bin/gpsdrive
-bin/gpsfetchmap
+bin/gpsd
+bin/friendsd
bin/wpcvt
bin/wpget
-lib/libfly.a
+bin/gpsfetchmap
+bin/gpsfetchmap.pl
+bin/mb2gpsdrive.pl
+lib/libfly.so.2
lib/libfly.so
-lib/libfly.so.1
+lib/libfly.a
+lib/libnautic.so.2
+lib/libnautic.so
+lib/libnautic.a
+share/gpsdrive/gpsdrivesplash.png
share/gpsdrive/friendsicon.png
-share/gpsdrive/gpsdrive/AUTHORS
+share/gpsdrive/gpsdrive/TODO
share/gpsdrive/gpsdrive/GPS-receivers
share/gpsdrive/gpsdrive/LEEME
+share/gpsdrive/gpsdrive/AUTHORS
share/gpsdrive/gpsdrive/README
-share/gpsdrive/gpsdrive/TODO
-share/gpsdrive/gpsdrivesplash.png
-share/locale/da/LC_MESSAGES/gpsdrive.mo
+share/gpsdrive/gpsdrive/LISEZMOI
+share/gpsdrive/gpsdrive/README.FreeBSD
+share/gpsdrive/gpsdrive/README.mb2gpsdrive
share/locale/de/LC_MESSAGES/gpsdrive.mo
-share/locale/de_AT/LC_MESSAGES/gpsdrive.mo
share/locale/es/LC_MESSAGES/gpsdrive.mo
share/locale/fr/LC_MESSAGES/gpsdrive.mo
-share/locale/hu/LC_MESSAGES/gpsdrive.mo
share/locale/it/LC_MESSAGES/gpsdrive.mo
+share/locale/da/LC_MESSAGES/gpsdrive.mo
share/locale/nl/LC_MESSAGES/gpsdrive.mo
share/locale/pt/LC_MESSAGES/gpsdrive.mo
share/locale/ru/LC_MESSAGES/gpsdrive.mo
share/locale/tr/LC_MESSAGES/gpsdrive.mo
+share/locale/de_AT/LC_MESSAGES/gpsdrive.mo
+share/locale/hu/LC_MESSAGES/gpsdrive.mo
+share/locale/sk/LC_MESSAGES/gpsdrive.mo
+share/locale/sv/LC_MESSAGES/gpsdrive.mo
share/locale/xx/LC_MESSAGES/gpsdrive.mo
@dirrm share/gpsdrive/gpsdrive
@dirrm share/gpsdrive
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020628120511.84435.qmail>