diff options
author | wiz <wiz> | 2004-07-26 23:40:07 +0000 |
---|---|---|
committer | wiz <wiz> | 2004-07-26 23:40:07 +0000 |
commit | 5cff819bcd11ad852246b809e8bdce53664ca890 (patch) | |
tree | ccc7eb848719b6eae7f3701956e35b83f494bf02 | |
parent | cf885fd364fe4aa82d9da3fd3e9d997e52e388d4 (diff) | |
download | pkgsrc-5cff819bcd11ad852246b809e8bdce53664ca890.tar.gz |
Finish move of misc/gpsd and misc/gpsdrive to geography/.
Closes PR 26422 by Iain Hibbert.
-rw-r--r-- | geography/Makefile | 4 | ||||
-rw-r--r-- | misc/Makefile | 4 | ||||
-rw-r--r-- | misc/gpsd/DESCR | 10 | ||||
-rw-r--r-- | misc/gpsd/Makefile | 16 | ||||
-rw-r--r-- | misc/gpsd/PLIST | 2 | ||||
-rw-r--r-- | misc/gpsd/distinfo | 5 | ||||
-rw-r--r-- | misc/gpsd/patches/patch-aa | 13 | ||||
-rw-r--r-- | misc/gpsdrive/DESCR | 9 | ||||
-rw-r--r-- | misc/gpsdrive/Makefile | 28 | ||||
-rw-r--r-- | misc/gpsdrive/PLIST | 55 | ||||
-rw-r--r-- | misc/gpsdrive/distinfo | 10 | ||||
-rw-r--r-- | misc/gpsdrive/patches/patch-aa | 29 | ||||
-rw-r--r-- | misc/gpsdrive/patches/patch-ab | 56 | ||||
-rw-r--r-- | misc/gpsdrive/patches/patch-ac | 313 | ||||
-rw-r--r-- | misc/gpsdrive/patches/patch-ad | 12 | ||||
-rw-r--r-- | misc/gpsdrive/patches/patch-ae | 12 | ||||
-rw-r--r-- | misc/gpsdrive/patches/patch-af | 12 |
17 files changed, 4 insertions, 586 deletions
diff --git a/geography/Makefile b/geography/Makefile index 2908d3da6dc..ad0b84e2eca 100644 --- a/geography/Makefile +++ b/geography/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2003/10/05 17:42:22 jschauma Exp $ +# $NetBSD: Makefile,v 1.6 2004/07/26 23:40:07 wiz Exp $ # COMMENT= Software for geographical-related uses +SUBDIR+= gpsd +SUBDIR+= gpsdrive SUBDIR+= gpspoint SUBDIR+= gpsutils SUBDIR+= mapserver diff --git a/misc/Makefile b/misc/Makefile index 32ee55423f2..8207cf28df2 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.205 2004/07/08 11:06:14 xtraeme Exp $ +# $NetBSD: Makefile,v 1.206 2004/07/26 23:40:07 wiz Exp $ # COMMENT= Miscellaneous utilities @@ -67,8 +67,6 @@ SUBDIR+= gnuls SUBDIR+= gok SUBDIR+= gone SUBDIR+= gperiodic -SUBDIR+= gpsd -SUBDIR+= gpsdrive SUBDIR+= granulate SUBDIR+= gxmame SUBDIR+= heyu diff --git a/misc/gpsd/DESCR b/misc/gpsd/DESCR deleted file mode 100644 index 5df8eb10487..00000000000 --- a/misc/gpsd/DESCR +++ /dev/null @@ -1,10 +0,0 @@ -Gpsd is a user land daemon acting as a liason between a gps or -Loran-C receiver and clients. The receiver is expected to generate -position information as NMEA-0183 sentences, or Rockwell binary format, -although that can be changed. - -Gpsd listens on port 2947 for clients requesting position, time, -velocity or altitude information. - -Gpsd can take information from the gps and translate it into -something easier to understand for clients. diff --git a/misc/gpsd/Makefile b/misc/gpsd/Makefile deleted file mode 100644 index d5a85463824..00000000000 --- a/misc/gpsd/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: Makefile,v 1.3 2003/07/17 21:49:06 grant Exp $ - -DISTNAME= gpsd-1.07 -CATEGORIES= misc -MASTER_SITES= http://www.pygps.org/gpsd/ - -MAINTAINER= tsarna@NetBSD.org -HOMEPAGE= http://www.pygps.org/gpsd/ -COMMENT= GPS information daemon - -GNU_CONFIGURE= YES - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/gpsd ${PREFIX}/sbin - -.include "../../mk/bsd.pkg.mk" diff --git a/misc/gpsd/PLIST b/misc/gpsd/PLIST deleted file mode 100644 index b286262e779..00000000000 --- a/misc/gpsd/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/05 16:52:45 tsarna Exp $ -sbin/gpsd diff --git a/misc/gpsd/distinfo b/misc/gpsd/distinfo deleted file mode 100644 index 30466484b52..00000000000 --- a/misc/gpsd/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.2 2004/06/03 22:56:41 recht Exp $ - -SHA1 (gpsd-1.07.tar.gz) = 00650bec2f516bee671cd21f8f2fdc6c2aea0902 -Size (gpsd-1.07.tar.gz) = 70930 bytes -SHA1 (patch-aa) = dfe7bbdddb9298f7ea2ac196c121b56233a951d2 diff --git a/misc/gpsd/patches/patch-aa b/misc/gpsd/patches/patch-aa deleted file mode 100644 index 259fcc52a10..00000000000 --- a/misc/gpsd/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2004/06/03 22:56:41 recht Exp $ - ---- netlib.c.orig 2004-06-04 00:49:02.000000000 +0200 -+++ netlib.c -@@ -9,7 +9,7 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> --#include <varargs.h> -+#include <stdarg.h> - #include <netdb.h> - #include <stdio.h> - #include <arpa/inet.h> diff --git a/misc/gpsdrive/DESCR b/misc/gpsdrive/DESCR deleted file mode 100644 index f0e8079efc9..00000000000 --- a/misc/gpsdrive/DESCR +++ /dev/null @@ -1,9 +0,0 @@ -GpsDrive is a car (bike, ship, plane) navigation system. GpsDrive -displays your position provided from your NMEA capable GPS receiver on a -zoomable map, the map file is autoselected depending of the position and -prefered scale. Speech output is supported if the "festival" software -is running. The maps are autoselected for best resolution depending of -your position and can be downloaded from Internet. All Garmin GPS -reveiver with a serial output should be usable, also other GPS receiver -which supports NMEA protocol. GpsDrive is written in C with use of the -GTK+ graphic toolkit. diff --git a/misc/gpsdrive/Makefile b/misc/gpsdrive/Makefile deleted file mode 100644 index c4be17288dd..00000000000 --- a/misc/gpsdrive/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# $NetBSD: Makefile,v 1.10 2004/07/22 11:36:00 agc Exp $ - -DISTNAME= gpsdrive-1.31 -PKGREVISION= 5 -CATEGORIES= misc -MASTER_SITES= http://gpsdrive.kraftvoll.at/ - -MAINTAINER= tsarna@NetBSD.org -HOMEPAGE= http://gpsdrive.kraftvoll.at/ -COMMENT= GPS Navigation system - -DEPENDS+= gpsd>=1.07:../../misc/gpsd - -GNU_CONFIGURE= YES -USE_BUILDLINK3= YES -USE_PKGLOCALEDIR= YES - -USE_LANGUAGE= c c++ - -# XXX make this an option -CONFIGURE_ARGS+= --disable-mysql - -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/glib/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" -.include "../../graphics/gdk-pixbuf/buildlink3.mk" -.include "../../converters/libiconv/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/misc/gpsdrive/PLIST b/misc/gpsdrive/PLIST deleted file mode 100644 index c7afb31e636..00000000000 --- a/misc/gpsdrive/PLIST +++ /dev/null @@ -1,55 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2003/01/10 15:53:02 tsarna Exp $ -bin/garble -bin/gpsdrive -bin/gpsfetchmap -bin/gpsfetchmap.pl -bin/gpspoint2gpsdrive.pl -bin/wpcvt -bin/wpget -lib/libfly.a -lib/libfly.la -lib/libfly.so -lib/libfly.so.2 -lib/libfly.so.2.0 -lib/libnautic.a -lib/libnautic.la -lib/libnautic.so -lib/libnautic.so.2 -lib/libnautic.so.2.0 -man/de/man1/gpsdrive.1 -man/es/man1/gpsdrive.1 -man/man1/gpsdrive.1 -share/gpsdrive/friendsicon.png -share/gpsdrive/gpsdrive/AUTHORS -share/gpsdrive/gpsdrive/FAQ.gpsdrive -share/gpsdrive/gpsdrive/FAQ.gpsdrive.fr -share/gpsdrive/gpsdrive/GPS-receivers -share/gpsdrive/gpsdrive/LEEME -share/gpsdrive/gpsdrive/LISEZMOI -share/gpsdrive/gpsdrive/NMEA.txt -share/gpsdrive/gpsdrive/README -share/gpsdrive/gpsdrive/README.FreeBSD -share/gpsdrive/gpsdrive/README.SQL -share/gpsdrive/gpsdrive/README.gpspoint2gspdrive -share/gpsdrive/gpsdrive/README.kismet -share/gpsdrive/gpsdrive/TODO -share/gpsdrive/gpsdrive/create.sql -share/gpsdrive/gpsdrive/wp2sql -share/gpsdrive/gpsdrivesplash.png -${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gpsdrive.mo -${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gpsdrive.mo -${PKGLOCALEDIR}/locale/de_AT/LC_MESSAGES/gpsdrive.mo -${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gpsdrive.mo -${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gpsdrive.mo -${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gpsdrive.mo -${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gpsdrive.mo -${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gpsdrive.mo -${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gpsdrive.mo -${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gpsdrive.mo -${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gpsdrive.mo -${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gpsdrive.mo -${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gpsdrive.mo -@dirrm share/gpsdrive/gpsdrive -@dirrm share/gpsdrive -@dirrm gpsdrive/locale -@dirrm gpsdrive diff --git a/misc/gpsdrive/distinfo b/misc/gpsdrive/distinfo deleted file mode 100644 index 71e6eb7c823..00000000000 --- a/misc/gpsdrive/distinfo +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: distinfo,v 1.4 2004/07/22 11:36:00 agc Exp $ - -SHA1 (gpsdrive-1.31.tar.gz) = 296a06d264c5fbb077c91f3529b4e6f122423f05 -Size (gpsdrive-1.31.tar.gz) = 784379 bytes -SHA1 (patch-aa) = cc5dd44020ffc5f22dc958c938b9f98ff6e01810 -SHA1 (patch-ab) = 240901fe52e41db1a41299f66ac61c06898f1881 -SHA1 (patch-ac) = 86f67ad04378f14a95e5b9fc806b2054ef4be127 -SHA1 (patch-ad) = 05d6be6ba7bd37b4b0599092ace2d5db7825c01d -SHA1 (patch-ae) = 5ab12f3f1f94a84acac0bc47fb4ad5a3bb75b7b6 -SHA1 (patch-af) = ba047381fcf07b3797c73199f85536b2a7efb61e diff --git a/misc/gpsdrive/patches/patch-aa b/misc/gpsdrive/patches/patch-aa deleted file mode 100644 index 3dd57085e42..00000000000 --- a/misc/gpsdrive/patches/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2003/01/05 17:26:01 tsarna Exp $ - -- We depend on the gpsd package instead of using the bundled one -- friendsd is broken and I don't care enough to fix it - ---- src/Makefile.in.orig Sun Dec 8 13:30:56 2002 -+++ src/Makefile.in Sun Jan 5 12:15:01 2003 -@@ -122,7 +122,7 @@ - - @DISABLEGARMIN_TRUE@PRG1 = - @DISABLEGARMIN_FALSE@PRG1 = garble --bin_PROGRAMS = $(PRG1) gpsdrive gpsd friendsd -+bin_PROGRAMS = $(PRG1) gpsdrive - LIBS = - - # gpsdrive_LDADD= $(GLIB_LIBS) $(GTK_LIBS) $(PIXLIBS) -@@ -175,10 +175,8 @@ - libnautic_la_LIBADD = - am_libnautic_la_OBJECTS = nautic.lo - libnautic_la_OBJECTS = $(am_libnautic_la_OBJECTS) --@DISABLEGARMIN_TRUE@bin_PROGRAMS = gpsdrive$(EXEEXT) gpsd$(EXEEXT) \ --@DISABLEGARMIN_TRUE@ friendsd$(EXEEXT) --@DISABLEGARMIN_FALSE@bin_PROGRAMS = garble$(EXEEXT) gpsdrive$(EXEEXT) \ --@DISABLEGARMIN_FALSE@ gpsd$(EXEEXT) friendsd$(EXEEXT) -+@DISABLEGARMIN_TRUE@bin_PROGRAMS = gpsdrive$(EXEEXT) -+@DISABLEGARMIN_FALSE@bin_PROGRAMS = garble$(EXEEXT) gpsdrive$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - - am_friendsd_OBJECTS = friendsd.$(OBJEXT) diff --git a/misc/gpsdrive/patches/patch-ab b/misc/gpsdrive/patches/patch-ab deleted file mode 100644 index b8d23091515..00000000000 --- a/misc/gpsdrive/patches/patch-ab +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2003/01/08 17:29:06 tsarna Exp $ - -Drew Einhorn's gpsfetchmap.pl enhancements from: - -http://s2.selwerd.nl/~dirk-jan/gpsdrive/archive/msg01772.html - -also require this patch to support tree'd rather than flap map -driectories. - ---- src/gpsdrive.c.orig Sun Dec 8 09:43:33 2002 -+++ src/gpsdrive.c Wed Jan 8 12:20:48 2003 -@@ -2926,12 +2926,22 @@ - } - for (i = 0; i < nrmaps; i++) - { -+ /* strip off the path, we just want to check the filename */ -+ char *fullname; -+ char *rslash; -+ char *filename; -+ - skip = TRUE; -+ -+ fullname = (maps + i)->filename; -+ rslash = strrchr(fullname, '/'); -+ filename = rslash == NULL ? fullname : rslash + 1; -+ - if (displaymap_map) -- if (!(strncmp ((maps + i)->filename, "map_", 4))) -+ if (!(strncmp (filename, "map_", 4))) - skip = FALSE; - if (displaymap_top) -- if (!(strncmp ((maps + i)->filename, "top_", 4))) -+ if (!(strncmp (filename, "top_", 4))) - skip = FALSE; - - if (skip) -@@ -3101,8 +3111,17 @@ - - for (i = 0; i < nrmaps; i++) - { -- if ((strncmp ((maps + i)->filename, "map_", 4))) -- if ((strncmp ((maps + i)->filename, "top_", 4))) -+ /* strip off the path, we just want to check the filename */ -+ char *fullname; -+ char *rslash; -+ char *filename; -+ -+ fullname = (maps + i)->filename; -+ rslash = strrchr(fullname, '/'); -+ filename = rslash == NULL ? fullname : rslash + 1; -+ -+ if ((strncmp (filename, "map_", 4))) -+ if ((strncmp (filename, "top_", 4))) - { - GString *error; - error = g_string_new (NULL); diff --git a/misc/gpsdrive/patches/patch-ac b/misc/gpsdrive/patches/patch-ac deleted file mode 100644 index 9230d4c0b3c..00000000000 --- a/misc/gpsdrive/patches/patch-ac +++ /dev/null @@ -1,313 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2003/01/08 17:29:06 tsarna Exp $ - -Drew Einhorn's gpsfetchmap.pl enhancements from: - -http://s2.selwerd.nl/~dirk-jan/gpsdrive/archive/msg01772.html - ---- src/gpsfetchmap.pl.orig Sun Nov 24 11:04:38 2002 -+++ src/gpsfetchmap.pl Wed Jan 8 12:13:17 2003 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!/usr/bin/env perl - - # gpsfetchmap - # -@@ -9,38 +9,71 @@ - gpsfetchmap (c) 2002 Kevin Stephens <gps\@suburbialost.com> - modified (Sept 06, 2002) by Sven Fichtner <sven.fichtner\@flugfunk.de> - modified (Sept 18, 2002) by Sven Fichtner <sven.fichtner\@flugfunk.de> --modified (Nov 21, 2002) by Magnus Månsson <ganja\@0x63.nu> --Version 1.04 -+modified (Nov 21, 2002) by Magnus MÃ¥nsson <ganja\@0x63.nu> -+modified (Dec 24, 2002) by Drew Einhorn <drew.einhorn\@starband.net> -+Version 1.05 - EOP - - use strict; - use Getopt::Long; - use Pod::Usage; -- --# Setup possible scales --my @SCALES = (1000,1500,2000,3000,5000,7500,10000,15000,20000,30000,50000,75000, -- 100000,150000,200000,300000,500000,750000,1000000,1500000,2000000,3000000, -- 5000000,7500000,10000000,15000000,20000000,30000000,50000000,75000000); -+use POSIX qw(floor ceil); -+use File::Temp qw/ tempfile tempdir /; - - # Set defaults and get options from command line - Getopt::Long::Configure('no_ignore_case'); --my ($lat,$lon,$slat,$endlat,$slon,$endlon,$waypoint,$area,$unit,$mapdir,$debug,$force,$version,$man,$help); --my $failcount = 0; -+my (@SCALES,$lat,$lon,$slat,$endlat,$slon,$endlon,$waypoint,$area,$unit,$debug,$force,$version,$man,$help); -+ -+my $failcount; -+my $writecount; -+my $cachecount; - my $polite = 'no'; - my $scale = '50000'; - my $CONFIG_DIR = "$ENV{'HOME'}/.gpsdrive"; # Should we allow config of this? - my $CONFIG_FILE = "$CONFIG_DIR/gpsdriverc"; - my $WAYPT_FILE = "$CONFIG_DIR/way.txt"; --my $KOORD_FILE = 'map_koord.txt'; # Should we allow config of this? - my $FILEPREFIX = 'map_'; - my $mapserver = 'mapblast'; -+my $replace = '0'; -+my $mapdir = ""; - - GetOptions ('lat=f' => \$lat, 'lon=f' => \$lon, 'start-lat=f' => \$slat, 'end-lat=f' => \$endlat, 'start-lon=f' => \$slon, 'end-lon=f' => \$endlon, 'scale=s' => \$scale, 'mapserver=s' => \$mapserver, - 'waypoint=s' =>, \$waypoint, 'area=s' => \$area, 'unit=s' => \$unit,'mapdir=s' => \$mapdir, 'polite:i' => \$polite, - 'WAYPOINT=s' => \$WAYPT_FILE, 'CONFIG=s' => \$CONFIG_FILE, 'PREFIX=s' => \$FILEPREFIX, -- 'FORCE' => \$force, 'debug' => \$debug, 'MAN' => \$man, 'help|x' => \$help, 'version' => \$version) -+ 'FORCE' => \$force, 'debug' => \$debug, 'MAN' => \$man, 'help|x' => \$help, 'version' => \$version, 'replace' => \$replace) - or pod2usage(1); - -+if ($mapdir eq "") { -+ $mapdir = $CONFIG_DIR; -+} else { -+ $mapdir = $CONFIG_DIR/$mapdir; -+} -+my $LOCK_SH = 1; -+my $LOCK_EX = 2; -+my $LOCK_NB = 4; -+my $LOCK_UN = 8; -+ -+my $KOORD_FILE = "$mapdir/map_koord.txt"; # Should we allow config of this? -+open(KOORD,">>$KOORD_FILE") || die "Can't open: $KOORD_FILE"; -+ -+# Setup possible scales -+my %ts1; -+if ($mapserver eq "terraserver") { -+ my ($s, $ts); -+ -+ @SCALES = (); -+ $s = 2757; -+ for ($ts = 10; $ts <= 16; $ts++) { -+ @SCALES = (@SCALES, $s); -+ $ts1{$s} = $ts; -+ $s *= 2; -+ } -+} else { -+ @SCALES = (1000,1500,2000,3000,5000,7500,10000,15000,20000,30000,50000,75000, -+ 100000,150000,200000,300000,500000,750000,1000000,1500000,2000000,3000000, -+ 5000000,7500000,10000000,15000000,20000000,30000000,50000000,75000000); -+} -+ - pod2usage(1) if $help; - pod2usage(-verbose=>2) if $man; - -@@ -55,7 +88,6 @@ - - - # Setup up some constants --my $EXPEDIAFACT = 1378.6; - my $DIFF = 0.0000028; - my $RADIUS_KM = 6371.01; - my $LAT_DIST_KM = 110.87; -@@ -64,7 +96,7 @@ - - # Get the list of scales we need - my $SCALES_TO_GET_ref = get_scales(\$scale); --print "Scale to download: ", join(",",sort {$a <=> $b} @{$SCALES_TO_GET_ref}), "\n" if ($debug); -+print "Scales to download: ", join(",",sort {$a <=> $b} @{$SCALES_TO_GET_ref}), "\n" if ($debug); - - # Get the center waypoint if they want one - if ($waypoint) { -@@ -82,7 +114,7 @@ - unless ($slat && $slon && $endlat && $endlon) { - ($slat,$slon,$endlat,$endlon) = get_coords(\$lat,\$lon,\$area,\$unit); - } --print "Upper left: $slat $slon, Lower Right: $endlat, $endlon\n" if ($debug); -+print "Lower left: $slat $slon, Upper Right: $endlat, $endlon\n" if ($debug); - - unless ($force) { - my $count = file_count(\($slat,$slon,$endlat,$endlon)); -@@ -93,67 +125,136 @@ - - print "\nDownloading files:\n"; - --# Change into the gpsdrive maps directory --chdir($CONFIG_DIR); --chdir($mapdir); -- - # Ok start getting the maps - foreach my $scale (@{$SCALES_TO_GET_ref}) { -- # Setup k -- my $k = $DIFF * $scale; -- my $lati = $slat; -- while ($lati < $endlat) { -- my $long = $slon; -- while ($long < $endlon) { -- my $filename = "$FILEPREFIX$scale-$lati-$long.gif"; -- if (! -s $filename) { -- LOOP: { -- if ($mapserver eq 'expedia') { -- next LOOP if ($scale <=1000); -- my $expediascale= sprintf("%d",$scale / $EXPEDIAFACT); -- my $where; -- if ($lon < -30) { -- $where = 'USA0409'; -- } else { -- $where = 'EUR0809'; -- } -- print "http://msrvmaps.mappoint.net/isapi/MSMap.dll?ID=3XNsF.\&C=$lati,$long\&L=$where\&CV=1\&A=$expediascale\&S=1280,1024\&O=0.000000,0.000000\&MS=0\&P=\n" -- if ($debug); -- `wget -nd -q -O tmpmap.gif "http://msrvmaps.mappoint.net/isapi/MSMap.dll?ID=3XNsF.\&C=$lati,$long\&L=$where\&CV=1\&A=$expediascale\&S=1280,1024\&O=0.000000,0.000000\&MS=0\&P="`; -- $scale = $expediascale * $EXPEDIAFACT; -- } elsif ($mapserver eq 'mapblast') { -- print "http://www.mapblast.com/myblastd/MakeMap.d?\&CT=$lati:$long:$scale\&IC=\&W=1280\&H=1024\&LB=\n" -- if ($debug); -- `wget -nd -q -O tmpmap.gif "http://www.mapblast.com/myblastd/MakeMap.d?\&CT=$lati:$long:$scale\&IC=\&W=1280\&H=1024\&LB="`; -- } -- if (-s 'tmpmap.gif') { -- open(KOORD,">>$KOORD_FILE") || die "Can't open: $KOORD_FILE"; -- print KOORD "$filename $lati $long $scale\n"; -- rename('tmpmap.gif',$filename); -- print "."; -- print "\nWrote $filename\n" if ($debug); -- } else { -- $failcount++; -- print ","; -- } -- } -- # sleep if polite is turned on to be nice to the webserver of the mapserver -- sleep($polite) if ($polite =~ /\d+/); -- sleep(1) if (!$polite); -- } -- $long += $k; -- } -- $lati += $k; -- } --} --print "Failcount: $failcount\n"; --print "\n"; -+ # Setup k -+ my $k = sprintf("%.4f", $DIFF * $scale); -+ getmaps($scale, $slat, $endlat, $slon, $endlon, $k); -+} - - ################################################################################ - # - # Subroutines - # - ################################################################################ -+ -+sub getmaps { -+ my ($scale, $slat, $endlat, $slon, $endlon, $k) = @_; -+ -+ print "Getting maps for scale: $scale\n"; -+ -+ my $l = floor($slat / $k); -+ my $lati = $k * $l; -+ -+ $l = ceil($endlat / $k); -+ my $elat = $k * $l; -+ -+ while ($lati <= $elat) { -+ $l = floor($slon / $k); -+ my $long = $k * $l; -+ -+ $l = ceil($endlon / $k); -+ my $elon = $k * $l; -+ -+ while ($long <= $elon) { -+ getmap($scale, $lati, $long); -+ $long += $k; -+ } -+ $lati += $k; -+ } -+ print "\n"; -+ print "Failcount: $failcount\n"; -+ print "Cachecount: $cachecount\n"; -+ print "Writecount: $writecount\n"; -+} -+ -+sub lock { -+ flock KOORD, $LOCK_EX; -+ # Move past addtions by other processes -+ seek KOORD, 0, 2; -+} -+ -+sub unlock { -+ flock KOORD, $LOCK_UN; -+} -+ -+sub getmap { -+ my ($scale, $lati, $long) = @_; -+ my $filename; -+ my $url; -+ my $la; -+ my $lo; -+ -+ $la = sprintf("%.4f", $lati); -+ $lo = sprintf("%.4f", $long); -+ -+ my $EXPEDIAFACT = 1378.6; -+ $filename = mapfilename("$FILEPREFIX", $scale, $la, $lo); -+ $url = ""; -+ if (! $replace && -e "$mapdir/$filename") { -+ $cachecount++; -+ print "="; -+ print "\nCached $filename\n" if ($debug); -+ } else { -+ if ($mapserver eq 'expedia' && $scale > 1000) { -+ my $expediascale= sprintf("%d",$scale / $EXPEDIAFACT); -+ my $where; -+ if ($lon < -30) { -+ $where = 'USA0409'; -+ } else { -+ $where = 'EUR0809'; -+ } -+ $url = "http://msrvmaps.mappoint.net/isapi/MSMap.dll?ID=3XNsF.\\&C=$la,$lo\\&L=$where\\&CV=1\\&A=$expediascale\\&S=1280,1024\\&O=0.000000,0.000000\\&MS=0\\&P="; -+ } elsif ($mapserver eq 'mapblast') { -+ $url = "http://www.mapblast.com/myblastd/MakeMap.d?\\&CT=$la:$lo:$scale\\&IC=\\&W=1280\\&H=1024\\&LB="; -+ } elsif ($mapserver eq 'terraserver') { -+ my $sc = $ts1{$scale}; -+ $url = "http://terraservice.net/GetImageArea.ashx?t=1\\&lat=$la\\&lon=$lo\\&s=$sc\\&w=1280\\&h=1024"; -+ } elsif ($mapserver eq 'tiger') { -+ my $s = $scale / 300000.0; -+ $url = "http://tiger.census.gov/cgi-bin/mapper/map.gif?lat=$la\\&lon=$lo\\&wid=0.001\\&ht=$s\\&iwd=1280\\&iht=1024\\&on=majroads\\&on=places\\&on=shorelin\\&on=streets\\&on=interstate\\&on=statehwy\\&on=ushwy\\&on=water\\&tlevel=-\\&tvar=-\\&tmeth=i"; -+ } -+ if ($url ne "") { -+ my $p = "--wait=$polite --random-wait" if (!$polite); -+ my ($fh, $tempfile) = tempfile( "temp_XXXXXX", DIR => "$mapdir" ); -+ -+ `wget $p -nd -q -O $tempfile $url`; -+ print $url if ($debug); -+ -+ if (-s $tempfile) { -+ lock(); -+ print KOORD "$filename $la $lo $scale\n"; -+ unlock(); -+ rename($tempfile, "$mapdir/$filename"); -+ print "."; -+ print "\nWrote $filename\n" if ($debug); -+ $writecount++; -+ } else { -+ $failcount++; -+ print "\nFailed $filename\n"; -+ } -+ # NEED convert to greyscale -+ # and draw grid lines? -+ # using ImageMaqick? -+ } -+ } -+} -+ -+sub mapfilename { -+ my ($prefix, $scale, $lati, $long) = @_; -+ my $pathname; -+ my $filename; -+ -+ if ($mapserver eq 'terraserver') { -+ $scale = $ts1{$scale}; -+ } -+ $pathname=sprintf("%s/%s/%03d/%08.4f/%d/", $mapserver, $scale, $lati, $lati, $long); -+ `mkdir -p "$mapdir/$pathname"`; -+ # I know there's a builtin mkdir, but last time I fussed with it -+ # there was no -p, and using it was tedious -+ $filename = sprintf("%s%d-%08.4f-%09.4f.gif", $prefix, $scale, $lati, $long); -+ return "$pathname$filename"; -+} - - sub error_check { - my $status; diff --git a/misc/gpsdrive/patches/patch-ad b/misc/gpsdrive/patches/patch-ad deleted file mode 100644 index aa36e7c7ccf..00000000000 --- a/misc/gpsdrive/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2004/07/22 11:36:01 agc Exp $ - ---- src/netlib.c 2004/07/22 11:16:34 1.1 -+++ src/netlib.c 2004/07/22 11:17:03 -@@ -23,7 +23,6 @@ - #include <sys/socket.h> - #include <sys/time.h> - #include <netinet/in.h> --#include <varargs.h> - #include <netdb.h> - #include <stdio.h> - #include <arpa/inet.h> diff --git a/misc/gpsdrive/patches/patch-ae b/misc/gpsdrive/patches/patch-ae deleted file mode 100644 index ac57b6f32d3..00000000000 --- a/misc/gpsdrive/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2004/07/22 11:36:01 agc Exp $ - ---- src/garble.cpp 2004/07/22 11:19:47 1.1 -+++ src/garble.cpp 2004/07/22 11:20:55 -@@ -29,6 +29,7 @@ - #include <iostream> - #include <string> - #include <cstdlib> -+#include <cassert> - // #include <ctime> - - using namespace std; diff --git a/misc/gpsdrive/patches/patch-af b/misc/gpsdrive/patches/patch-af deleted file mode 100644 index 037ac4c73df..00000000000 --- a/misc/gpsdrive/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-af,v 1.1 2004/07/22 11:36:01 agc Exp $ - ---- src/gpsdrivegarble.cpp 2004/07/22 11:30:57 1.1 -+++ src/gpsdrivegarble.cpp 2004/07/22 11:31:15 -@@ -64,6 +64,7 @@ - #include <iostream> - #include <string> - #include <cstdlib> -+#include <cassert> - // #include <ctime> - - using namespace std; |