mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

Update to 1.26.r4

Browse Source 
PR:		ports/41469
Submitted by:	maintainer
This commit is contained in:
Patrick Li 2002-08-09 17:50:39 +00:00
parent c6117e2abc
commit ff557b9f33
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=64293
8 changed files with 13 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
astro/gpsdrive/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= gpsdrive
PORTVERSION= 1.23.r9
PORTVERSION= 1.26.r4
CATEGORIES= astro
MASTER_SITES= http://gpsdrive.kraftvoll.at/ \
http://gpsdrive.teachlinux.com/ \

2
astro/gpsdrive/distinfo
View File

@ -1 +1 @@
MD5 (gpsdrive-1.23pre9.tar.gz) = 86dd789483edd37125f863c2c7bf6741
MD5 (gpsdrive-1.26pre4.tar.gz) = a519203d7cd0a93b33c72354baf1a68e

16
astro/gpsdrive/files/patch-src-Makefile.in
View File

@ -1,15 +1,15 @@
--- 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
--- src/Makefile.in.orig Thu Aug 8 23:52:40 2002
+++ src/Makefile.in Thu Aug 8 23:54:21 2002
@@ -117,7 +117,7 @@
# gpsdrive_LDADD= $(GLIB_LIBS) $(GTK_LIBS) $(PIXLIBS)
-gpsdrive_LDADD = @LIBS@
+gpsdrive_LDADD = @LIBS@ -lgnugetopt
#gpsdrive_LDADD=@LIBS@
-gpsdrive_LDADD = @XLIBS@
+gpsdrive_LDADD = @XLIBS@ -lgnugetopt
# gpsdrive_CFLAGS=@CFLAGS@
# libgpsd_a_CFLAGS=@CFLAGS@
# CFLAGS=
@@ -177,7 +177,7 @@
@@ -173,7 +173,7 @@
am_friendsd_OBJECTS = friendsd.$(OBJEXT)
friendsd_OBJECTS = $(am_friendsd_OBJECTS)
@ -18,7 +18,7 @@
friendsd_DEPENDENCIES =
friendsd_LDFLAGS =
@DISABLEGARMIN_TRUE@am_garble_OBJECTS =
@@ -187,7 +187,7 @@
@@ -183,7 +183,7 @@
@DISABLEGARMIN_FALSE@ garmin_link.$(OBJEXT) \
@DISABLEGARMIN_FALSE@ garmin_util.$(OBJEXT)
garble_OBJECTS = $(am_garble_OBJECTS)

20
astro/gpsdrive/files/patch-src-em.c
View File

@ -1,20 +0,0 @@
--- 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++)

128
astro/gpsdrive/files/patch-src-gpsd.c
View File

@ -1,128 +0,0 @@
--- 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)

12
astro/gpsdrive/files/patch-src-tm.c
View File

@ -1,12 +0,0 @@
--- 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)) {

2
astro/gpsdrive/pkg-message
View File

@ -1,5 +1,5 @@
NOTES:
FreeBSD NOTES:
Support for Garmin format input is disabled because buggy.
Set your GPS device to NMEA mode and start gpsd before gpsdrive.

5
astro/gpsdrive/pkg-plist
View File

@ -3,6 +3,7 @@ bin/gpsd
bin/gpsdrive
bin/gpsfetchmap
bin/gpsfetchmap.pl
bin/gpspoint2gpsdrive.pl
bin/mb2gpsdrive.pl
bin/wpcvt
bin/wpget
@ -19,6 +20,7 @@ share/gpsdrive/gpsdrive/LEEME
share/gpsdrive/gpsdrive/LISEZMOI
share/gpsdrive/gpsdrive/README
share/gpsdrive/gpsdrive/README.FreeBSD
share/gpsdrive/gpsdrive/README.gpspoint2gspdrive
share/gpsdrive/gpsdrive/README.mb2gpsdrive
share/gpsdrive/gpsdrive/TODO
share/gpsdrive/gpsdrivesplash.png
@ -30,11 +32,8 @@ share/locale/fr/LC_MESSAGES/gpsdrive.mo
share/locale/hu/LC_MESSAGES/gpsdrive.mo
share/locale/it/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/sk/LC_MESSAGES/gpsdrive.mo
share/locale/sv/LC_MESSAGES/gpsdrive.mo
share/locale/tr/LC_MESSAGES/gpsdrive.mo
share/locale/xx/LC_MESSAGES/gpsdrive.mo
@dirrm share/gpsdrive/gpsdrive
@dirrm share/gpsdrive