Just a cosmetic change/question given the version crank.
Shouldn't this line
PKGNAME-gpsmap= kismet-gpsmap-${V:S,-,,g}p0
drop the p0 like this
PKGNAME-gpsmap= kismet-gpsmap-${V:S,-,,g}
Jim
* Matthias Kilian <[EMAIL PROTECTED]> [080621 17:59]:
> Update to kismet 2008-05-R1. I've tested kismet on ny zaurus, and
> gpsnap on an i386.
>
> Tests on other platforms are welcome.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/kismet/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- Makefile 12 Jun 2008 21:58:12 -0000 1.20
> +++ Makefile 21 Jun 2008 17:12:55 -0000
> @@ -8,7 +8,7 @@ COMMENT-gpsmap= reads GPS and Network XM
> # No wireless capabilities
> NOT_FOR_ARCHS=m68k m88k vax
>
> -V= 2007-10-R1
> +V= 2008-05-R1
> DISTNAME= kismet-${V}
> PKGNAME-main= kismet-${V:S,-,,g}
> PKGNAME-gpsmap= kismet-gpsmap-${V:S,-,,g}p0
> @@ -32,7 +32,8 @@ CONFDIR= ${SYSCONFDIR}/kismet
> SUBST_VARS+= CONFDIR
>
> CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \
> - --mandir=${PREFIX}/man
> + --mandir=${PREFIX}/man \
> + --disable-dbus
>
> CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include
> -I${LOCALBASE}/include" \
> LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/net/kismet/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo 10 Nov 2007 21:10:42 -0000 1.6
> +++ distinfo 21 Jun 2008 17:12:55 -0000
> @@ -1,5 +1,5 @@
> -MD5 (kismet-2007-10-R1.tar.gz) = IQDGZ+adsM3jX6LQbIUW4g==
> -RMD160 (kismet-2007-10-R1.tar.gz) = fLYqP9lkye5+Tsa+8FBVjIBqtJU=
> -SHA1 (kismet-2007-10-R1.tar.gz) = ocaCeXrWhCtT+eDwOCVKqDJuD7Q=
> -SHA256 (kismet-2007-10-R1.tar.gz) =
> Aj5/RwOcGthhUFLkZPdqPNSWpCNEm5MQNtEnxW1Ysrk=
> -SIZE (kismet-2007-10-R1.tar.gz) = 646452
> +MD5 (kismet-2008-05-R1.tar.gz) = buNl02NUtN7klF5n+BSSlA==
> +RMD160 (kismet-2008-05-R1.tar.gz) = VhMge0X4X6ctFGAJQ035hPchzNw=
> +SHA1 (kismet-2008-05-R1.tar.gz) = g1WusDdKOVSd/cDHMWASXq3XxuI=
> +SHA256 (kismet-2008-05-R1.tar.gz) =
> opjUT4puyXcCHNSSpyCYfe2BtcS69faLNvEoKiPJ99M=
> +SIZE (kismet-2008-05-R1.tar.gz) = 655362
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: /cvs/ports/net/kismet/patches/patch-Makefile_in,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-Makefile_in
> --- patches/patch-Makefile_in 10 Nov 2007 21:10:42 -0000 1.5
> +++ patches/patch-Makefile_in 21 Jun 2008 17:12:55 -0000
> @@ -3,20 +3,18 @@ $OpenBSD: patch-Makefile_in,v 1.5 2007/1
> # Don't hard code -O2 -Wall.
> # Use BSD_INSTALL_* macros for installation.
>
> ---- Makefile.in.orig Sun Sep 9 23:01:20 2007
> -+++ Makefile.in Wed Sep 12 22:02:32 2007
> -@@ -21,8 +21,8 @@ LD = @CXX@
> - LDFLAGS = @LDFLAGS@
> +--- Makefile.in.orig Thu May 29 21:18:26 2008
> ++++ Makefile.in Sun Jun 1 13:16:18 2008
> +@@ -22,7 +22,7 @@ LDFLAGS = @LDFLAGS@
> LIBS = @LIBS@
> CLIBS = @CLIBS@
> --CFLAGS = @CPPFLAGS@
> + CFLAGS = @CFLAGS@
> -CXXFLAGS = -O2 -Wall -DVERSION_MAJOR=\"$(VERSION_MAJOR)\"
> -DVERSION_MINOR=\"$(VERSION_MINOR)\" -DVERSION_TINY=\"$(VERSION_TINY)\"
> -DTIMESTAMP=\"`cat TIMESTAMP`\" @CXXFLAGS@
> -+CFLAGS = @CFLAGS@
> +CXXFLAGS = -DVERSION_MAJOR=\"$(VERSION_MAJOR)\"
> -DVERSION_MINOR=\"$(VERSION_MINOR)\" -DVERSION_TINY=\"$(VERSION_TINY)\"
> -DTIMESTAMP=\"`cat TIMESTAMP`\" @CXXFLAGS@
> CPPFLAGS = @CPPFLAGS@
> SUID = @suid@
>
> -@@ -137,53 +137,55 @@ checkuiconfig:
> +@@ -138,53 +138,55 @@ checkuiconfig:
> echo "latest version is `grep version= conf/kismet_ui.conf |
> cut -f 2 -d=`"; \
> fi
>
> @@ -107,7 +105,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2007/1
>
> @if test -f $(BIN)/kismet_curses; then \
> echo "Removing old kismet_curses binary. The panels frontend
> is now kismet_client."; \
> -@@ -196,22 +198,22 @@ suidinstall: $(PS) $(DRONE) $(NC) $(GPSLBUILD) $(ZAURU
> +@@ -197,22 +199,22 @@ suidinstall: $(PS) $(DRONE) $(WRAP) $(NC) $(GPSLBUILD)
> @if test -f $(ETC)/kismet.conf; then \
> $(MAKE) -e checkconfig; \
> else \
> @@ -136,7 +134,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2007/1
> echo "Installed UI config into $(ETC)/kismet_ui.conf."; \
> fi
> @echo "Installed kismet into $(BIN)/."
> -@@ -229,22 +231,22 @@ install: $(PS) $(DRONE) $(NC) $(GPSLBUILD) $(ZAURUSBUI
> +@@ -230,22 +232,22 @@ install: $(PS) $(DRONE) $(NC) $(WRAP) $(GPSLBUILD) $(Z
> @if test -f $(ETC)/kismet.conf; then \
> $(MAKE) -e checkconfig; \
> else \
> @@ -165,7 +163,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2007/1
> echo "Installed UI config into $(ETC)/kismet_ui.conf."; \
> fi
> @echo "Installed kismet into $(BIN)/."
> -@@ -260,11 +262,11 @@ install: $(PS) $(DRONE) $(NC) $(GPSLBUILD) $(ZAURUSBUI
> +@@ -261,11 +263,11 @@ install: $(PS) $(DRONE) $(NC) $(WRAP) $(GPSLBUILD) $(Z
> forceinstall: $(PS)
> $(MAKE) -e commoninstall
> $(MAKE) -e binuserinstall
> @@ -180,7 +178,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2007/1
> echo "Installed UI config into $(ETC)/kismet_ui.conf.";
> @echo "Installed kismet into $(BIN)/."
> @echo "If you have not done so already, read the README file and the
> FAQ file. Additional"
> -@@ -279,11 +281,11 @@ forceinstall: $(PS)
> +@@ -280,11 +282,11 @@ forceinstall: $(PS)
> suidforceinstall: $(PS)
> $(MAKE) -e commoninstall
> $(MAKE) -e binsuidinstall
> @@ -195,7 +193,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2007/1
> echo "Installed UI config into $(ETC)/kismet_ui.conf.";
> @echo "Installed kismet into $(BIN)/."
> @echo "If you have not done so already, read the README file and the
> FAQ file. Additional"
> -@@ -367,13 +369,11 @@ depend:
> +@@ -371,13 +373,11 @@ depend:
> @$(MAKE) $(DEPEND)
>
> $(DEPEND):
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/net/kismet/patches/patch-configure,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-configure
> --- patches/patch-configure 10 Nov 2007 21:10:42 -0000 1.1
> +++ patches/patch-configure 21 Jun 2008 17:12:55 -0000
> @@ -1,34 +1,7 @@
> $OpenBSD: patch-configure,v 1.1 2007/11/10 21:10:42 kili Exp $
> ---- configure.orig Sat Oct 6 23:32:15 2007
> -+++ configure Fri Nov 9 14:13:43 2007
> -@@ -8584,6 +8584,7 @@ echo "${ECHO_T}no" >&6; }
> -
> - fi
> -
> -+if false; then
> - pkg_failed=no
> - { echo "$as_me:$LINENO: checking for DBUS" >&5
> - echo $ECHO_N "checking for DBUS... $ECHO_C" >&6; }
> -@@ -8621,9 +8622,8 @@ else
> - pkg_failed=yes
> - fi
> - fi
> --else
> -- pkg_failed=untried
> - fi
> -+pkg_failed=untried
> -
> -
> -
> -@@ -8663,6 +8663,7 @@ cat >>confdefs.h <<\_ACEOF
> - _ACEOF
> -
> - fi
> -+fi
> -
> - local=no
> - # Check whether --enable-local-dumper was given.
> -@@ -9836,7 +9837,7 @@ sharedatadir=`(
> +--- configure.orig Mon May 12 22:14:14 2008
> ++++ configure Sun Jun 1 13:24:55 2008
> +@@ -9877,7 +9877,7 @@ sharedatadir=`(
> test "$exec_prefix" = NONE && exec_prefix=${prefix}
> eval echo "$sharedatadir"
> )`
> Index: patches/patch-gpsmap_cc
> ===================================================================
> RCS file: /cvs/ports/net/kismet/patches/patch-gpsmap_cc,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-gpsmap_cc
> --- patches/patch-gpsmap_cc 28 Jun 2007 12:43:32 -0000 1.4
> +++ patches/patch-gpsmap_cc 21 Jun 2008 17:12:55 -0000
> @@ -1,14 +1,39 @@
> $OpenBSD: patch-gpsmap_cc,v 1.4 2007/06/28 12:43:32 kili Exp $
>
> +# Disable map sources known to be broken.
> # Use our ftp(1) instead of wget.
> -# Unbreak on 64bit archs (and just simplify).
> +# Fix OSM map source (OSM already provides PNGs, not GIFs).
> +# If the first attempt to load the image fails, reset the exception,
> +# because ImageMagick would bail out on the second attempt (after the
> +# download).
>
> ---- gpsmap.cc.orig Sat May 20 21:41:16 2006
> -+++ gpsmap.cc Mon Jun 25 13:36:14 2007
> -@@ -99,8 +99,8 @@ const char url_template_em[] = "gpsmap-helper-earthama
> +--- gpsmap.cc.orig Thu May 8 23:48:35 2008
> ++++ gpsmap.cc Sat Jun 21 18:36:19 2008
> +@@ -90,24 +90,24 @@ const char *config_base = "kismet.conf";
> + // Broken map sources... Damn vendors changing.
> + // Mappoint
> + // const char url_template_mp[] =
> "http://msrvmaps.mappoint.net/isapi/MSMap.dll?ID=3XNsF.&C=%f,%f&L=USA&CV=1&A=%ld&S=%d,%d&O=0.000000,0.000000&MS=0&P=|5748|";
> ++// Terraserver photo-maps and topo maps
> ++// const char url_template_ts[] =
> "http://terraservice.net/GetImageArea.ashx?t=1&lat=%f&lon=%f&s=%ld&w=%d&h=%d";;
> ++// const char url_template_tt[] =
> "http://terraservice.net/GetImageArea.ashx?t=2&lat=%f&lon=%f&s=%ld&w=%d&h=%d";;
> +
> ++// Earthamaps need a perl helper script to get data because of cookies
> ++// const char url_template_em[] = "gpsmap-helper-earthamaps %s %f %f %d %d
> %ld";
> + // Mapblast
> + const char url_template_mb[] =
> "http://go.vicinity.com/homedepotvd/MakeMap.d?&CT=%f:%f:%ld&IC=&W=%d&H=%d&FAM=mblast&LB=%s";;
> +
> +-// Terraserver photo-maps and topo maps
> +-const char url_template_ts[] =
> "http://terraservice.net/GetImageArea.ashx?t=1&lat=%f&lon=%f&s=%ld&w=%d&h=%d";;
> +-const char url_template_tt[] =
> "http://terraservice.net/GetImageArea.ashx?t=2&lat=%f&lon=%f&s=%ld&w=%d&h=%d";;
> + // Tiger census vector maps
> + const char url_template_ti[] =
> "http://tiger.census.gov/cgi-bin/mapper/map.gif?lat=%f&lon=%f&wid=0.001&ht=%f&iwd=%d&iht=%d&on=majroads&on=places&on=shorelin&on=streets&on=interstate&on=statehwy&on=ushwy&on=water&tlevel=-&tvar=-&tmeth=i";;
> +-// Earthamaps need a perl helper script to get data because of cookies
> +-const char url_template_em[] = "gpsmap-helper-earthamaps %s %f %f %d %d
> %ld";
>
> const char url_template_euex[] =
> "http://www.expedia.de/pub/agent.dll?qscr=mrdt&ID=3XNsF.&CenP=%f,%f&Lang=%s&Alti=%ld&Size=%d,%d&Offs=0.000000,0.000000&BCheck=1";;
>
> + const char url_template_osm[] =
> "http://tah.openstreetmap.org/MapOf/?lat=%f&long=%f&z=%d&w=%d&h=%d&format=png";;
> +
> -// Download template for sources that we fetch using wget
> -const char download_template[] = "wget \"%s\" -O %s";
> +// Download template for sources that we fetch using ftp
> @@ -16,25 +41,175 @@ $OpenBSD: patch-gpsmap_cc,v 1.4 2007/06/
>
> // Image scales we try to autofetch
> long int scales[] = { 1000, 2000, 5000, 10000, 20000, 30000, 50000, 60000,
> -@@ -2242,11 +2242,8 @@ void DrawNetPower(vector<gps_network *> in_nets, Image
> - pthread_attr_destroy(&attr);
> +@@ -1512,29 +1512,6 @@ int BestMapScale(long int *in_mapscale, long int *in_f
> + double mapx, mapy;
> + double map2x, map2y;
>
> - // Now wait for the threads to complete and come back
> -- int thread_status;
> - for (int t = 0; t < numthreads; t++) {
> -- void *tmp;
> -- pthread_join(mapthread[t], &tmp);
> -- thread_status = reinterpret_cast<int>(tmp);
> -+ pthread_join(mapthread[t], NULL);
> +- if ((mapsource == MAPSOURCE_TERRA) || (mapsource ==
> MAPSOURCE_TERRATOPO)) {
> +- for (int x = 0; terrascales[x] != -1; x++) {
> +- calcxy(&mapx, &mapy, tlat, tlon,
> +- (double) terrascales[x]/PIXELFACT,
> +- map_avg_lat, map_avg_lon);
> +- calcxy(&map2x, &map2y, blat, blon,
> +- (double) terrascales[x]/PIXELFACT,
> +- map_avg_lat, map_avg_lon);
> +-
> +- if ((mapx < 0 || mapx > map_width || mapy < 0 ||
> +- mapy > map_height) ||
> +- (map2x < 0 || map2x > map_width ||
> +- map2y < 0 || map2y > map_height)) {
> +- continue;
> +- } else {
> +- (*in_mapscale) = terrascales[x];
> +- (*in_fetchscale) = x + 10;
> +- return 1;
> +- }
> +- }
> +- return -1;
> +- }
> +-
> + if (mapsource == MAPSOURCE_EUEX) {
> + for (int x = 0; euexscales[x] != -1; x++) {
> + calcxy(&mapx, &mapy, tlat, tlon,
> +@@ -1581,35 +1558,6 @@ int BestMapScale(long int *in_mapscale, long int *in_f
> + return -1;
> }
> - #else
> - // Run one instance of our "thread". thread number 0, it should just
> crunch it all
> -@@ -4219,7 +4216,7 @@ int main(int argc, char *argv[]) {
> - }
> - } else {
> - char geturl[1024];
> +
> +- if (mapsource == MAPSOURCE_EARTHAMAPS) {
> +- // Find how many scales we have
> +- int nscales;
> +- for (nscales = 0; earthamapscales[nscales] != -1; nscales++)
> +- ; // Nothing
> +-
> +- for (int x = (nscales - 1); x > 1; x--) {
> +- calcxy(&mapx, &mapy, tlat, tlon,
> +- (double) earthamapscales[x]/PIXELFACT,
> +- map_avg_lat, map_avg_lon);
> +- calcxy(&map2x, &map2y, blat, blon,
> +- (double) earthamapscales[x]/PIXELFACT,
> +- map_avg_lat, map_avg_lon);
> +-
> +- if ((mapx < 0 || mapx > map_width || mapy < 0 ||
> +- mapy > map_height) ||
> +- (map2x < 0 || map2x > map_width ||
> +- map2y < 0 || map2y > map_height)) {
> +- continue;
> +- } else {
> +- (*in_mapscale) = earthamapscales[x];
> +- (*in_fetchscale) = x;
> +- return 1;
> +- }
> +- }
> +-
> +- return -1;
> +- }
> +-
> + // Mapblast style scale finding
> + for (int x = 0; scales[x] != -1; x++) {
> + calcxy(&mapx, &mapy, tlat, tlon, (double) scales[x]/PIXELFACT,
> +@@ -4016,30 +3964,6 @@ int main(int argc, char *argv[]) {
> + // Some day this needs to get rewritten to not be using a source that
> doesn't
> + // work anymore as the internal reference point.
> +
> +- if (((mapsource == MAPSOURCE_TERRA) ||
> +- (mapsource == MAPSOURCE_TERRATOPO)) && user_scale != 0) {
> +- // It's way too much of a kludge to muck with munging the scale
> around
> +- if ((user_scale < 10) || (user_scale > 16)) {
> +- fprintf(stderr, "FATAL: You must provide a scale with the -s "
> +- "option that is from 10 to 16\n");
> +- exit(0);
> +- }
> +- fetch_scale = user_scale;
> +- map_scale = user_scale = terrascales[(user_scale - 10)];
> +- }
> +-
> +- // Require the user to specify a scale between 2 and 15, then set
> +- // {map,user}_scale to the cooresponding element in earthamapscales[].
> +- if (mapsource == MAPSOURCE_EARTHAMAPS && user_scale != 0) {
> +- if ((user_scale < 2) || (user_scale > 15)) {
> +- fprintf(stderr, "FATAL: You must provide a scale with the -s "
> +- "option that is from 2 to 15\n");
> +- exit(0);
> +- }
> +- fetch_scale = user_scale;
> +- map_scale = user_scale = earthamapscales[user_scale];
> +- }
> +-
> + if (ap_manuf_name != NULL) {
> + char pathname[1024];
> +
> +@@ -4181,8 +4105,9 @@ int main(int argc, char *argv[]) {
> + }
> +
> + if (!usermap) {
> +- snprintf(mapname, 1024, "map_%f_%f_%ld_%d_%d.gif", map_avg_lat,
> +- map_avg_lon, map_scale, map_width, map_height);
> ++ snprintf(mapname, 1024, "map_%f_%f_%ld_%d_%d.%s", map_avg_lat,
> ++ map_avg_lon, map_scale, map_width, map_height,
> ++ mapsource == MAPSOURCE_OSM ? "png" : "gif");
> + }
> +
> + if (useroutmap == false)
> +@@ -4227,7 +4152,10 @@ int main(int argc, char *argv[]) {
> + exit(1);
> + }
> +
> +- if (mapsource == MAPSOURCE_MAPPOINT) {
> ++ if (mapsource == MAPSOURCE_MAPPOINT
> ++ || mapsource == MAPSOURCE_TERRA
> ++ || mapsource == MAPSOURCE_EARTHAMAPS
> ++ || mapsource == MAPSOURCE_TERRATOPO) {
> + fprintf(stderr, "The source you selected is known to be broken.
> "
> + "Support remains for this source only if previously "
> + "downloaded maps are available, because the map vendor
> has "
> +@@ -4242,18 +4170,9 @@ int main(int argc, char *argv[]) {
> + snprintf(url, 1024, url_template_mb, map_avg_lat, map_avg_lon,
> + map_scale, map_width, map_height,
> + metric ? "&DU=KM" : "");
> +- } else if (mapsource == MAPSOURCE_TERRA) {
> +- snprintf(url, 1024, url_template_ts, map_avg_lat, map_avg_lon,
> +- fetch_scale, map_width, map_height);
> +- } else if (mapsource == MAPSOURCE_TERRATOPO) {
> +- snprintf(url, 1024, url_template_tt, map_avg_lat, map_avg_lon,
> +- fetch_scale, map_width, map_height);
> + } else if (mapsource == MAPSOURCE_TIGER) {
> + snprintf(url, 1024, url_template_ti, map_avg_lat, map_avg_lon,
> + (map_scale / 300000.0), map_width, map_height);
> +- } else if (mapsource == MAPSOURCE_EARTHAMAPS) {
> +- snprintf(url, 1024, url_template_em, mapname, map_avg_lat,
> +- map_avg_lon, map_width, map_height, fetch_scale);
> + } else if (mapsource == MAPSOURCE_EUEX) {
> + fetch_scale = (long) (map_scale / 3950);
> + char loc[8] = "USA0409";
> +@@ -4294,24 +4213,16 @@ int main(int argc, char *argv[]) {
> + printf("Map url: %s\n", url);
> + printf("Fetching map...\n");
> +
> +- if (mapsource == MAPSOURCE_EARTHAMAPS) {
> +- int retval = system(url);
> ++ char geturl[1024];
> ++ snprintf(geturl, 1024, download_template, mapname, url);
> ++ if (system(geturl)!=0) {
> ++ fprintf(stderr, "WARNING: failed to execute '%s'\n", geturl);
> ++ exit(1);
> ++ }
> +
> +- if (retval != 0) {
> +- fprintf(stderr, "Could not run %s: %s\n", url,
> strerror(retval));
> +- exit(1);
> +- }
> +- } else {
> +- char geturl[1024];
> - snprintf(geturl, 1024, download_template, url, mapname);
> -+ snprintf(geturl, 1024, download_template, mapname, url);
> - if (system(geturl)!=0) {
> - fprintf(stderr, "WARNING: failed to execute '%s'\n", geturl);
> - exit(1);
> +- if (system(geturl)!=0) {
> +- fprintf(stderr, "WARNING: failed to execute '%s'\n", geturl);
> +- exit(1);
> +- }
> +- }
> +-
> + printf("Loading map into Imagemagick structures.\n");
> + strcpy(img_info->filename, mapname);
> ++ ClearMagickException(&im_exception);
> + img = ReadImage(img_info, &im_exception);
> +
> + if (img == (Image *) NULL) {
> Index: patches/patch-man_gpsmap_1
> ===================================================================
> RCS file: /cvs/ports/net/kismet/patches/patch-man_gpsmap_1,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-man_gpsmap_1
> --- patches/patch-man_gpsmap_1 1 Nov 2006 21:13:20 -0000 1.2
> +++ patches/patch-man_gpsmap_1 21 Jun 2008 17:12:55 -0000
> @@ -1,15 +1,16 @@
> $OpenBSD: patch-man_gpsmap_1,v 1.2 2006/11/01 21:13:20 kili Exp $
>
> -# Add the new mapsource.
> -
> --- man/gpsmap.1.orig Thu Apr 1 00:15:23 2004
> -+++ man/gpsmap.1 Fri Oct 20 13:42:27 2006
> -@@ -67,7 +67,7 @@ sample points.
> ++++ man/gpsmap.1 Sat Jun 21 18:26:10 2008
> +@@ -67,7 +67,10 @@ sample points.
> .TP
> .B
> \fB-S\fP, \fB--map-source\fP SOURCE
> -Source to download maps from (-1 = Null; 0 = Mapblast; 1 =
> MapPoint(broken); 2 = Terraserver; 3 = Tiger Census; 4 = Earthamap; 5 =
> Terraserver Topographic). Default: 4
> -+Source to download maps from (-1 = Null; 0 = Mapblast(broken); 1 =
> MapPoint(broken); 2 = Terraserver; 3 = Tiger Census; 4 = Earthamap(doesn't
> work); 5 = Terraserver Topographic; 6 = Expedia). Default: -1
> ++Source to download maps from (-1 = Null; 0 = Mapblast; 1 = MapPoint(broken);
> ++2 = Terraserver(broken); 3 = Tiger Census; 4 = Earthamap(broken);
> ++5 = Terraserver Topographic(broken); 6 = Expedia; 7 = OpenStreetMap).
> ++Default: -1.
> .TP
> .B
> \fB-D\fP, \fB--keep-gif\fP
> Index: pkg/MESSAGE-gpsmap
> ===================================================================
> RCS file: pkg/MESSAGE-gpsmap
> diff -N pkg/MESSAGE-gpsmap
> --- pkg/MESSAGE-gpsmap 1 Nov 2006 21:13:20 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1 +0,0 @@
> -Note: for now, only map source types 2, 3, 5, and 6 are working.
> Index: pkg/PLIST-gpsmap
> ===================================================================
> RCS file: /cvs/ports/net/kismet/pkg/PLIST-gpsmap,v
> retrieving revision 1.1
> diff -u -p -r1.1 PLIST-gpsmap
> --- pkg/PLIST-gpsmap 7 Oct 2005 14:13:57 -0000 1.1
> +++ pkg/PLIST-gpsmap 21 Jun 2008 17:12:55 -0000
> @@ -1,4 +1,4 @@
> @comment $OpenBSD: PLIST-gpsmap,v 1.1 2005/10/07 14:13:57 bernd Exp $
> -bin/gpsmap
> [EMAIL PROTECTED] bin/gpsmap
> @comment bin/gpsmap-helper-earthamaps
> @man man/man1/gpsmap.1
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/net/kismet/pkg/PLIST-main,v
> retrieving revision 1.1
> diff -u -p -r1.1 PLIST-main
> --- pkg/PLIST-main 20 Nov 2006 20:54:08 -0000 1.1
> +++ pkg/PLIST-main 21 Jun 2008 17:12:55 -0000
> @@ -2,10 +2,10 @@
> @pkgpath net/kismet
> @newgroup _kismet:547
> @newuser _kismet:547:_kismet:daemon:Kismet WLAN
> detector:/nonexistent:/sbin/nologin
> -bin/kismet
> -bin/kismet_client
> -bin/kismet_drone
> -bin/kismet_server
> [EMAIL PROTECTED] bin/kismet
> [EMAIL PROTECTED] bin/kismet_client
> [EMAIL PROTECTED] bin/kismet_drone
> [EMAIL PROTECTED] bin/kismet_server
> @man man/man1/kismet.1
> @man man/man1/kismet_drone.1
> @man man/man5/kismet.conf.5
>
![http://tiger.census.gov/cgi-bin/mapper/map.gif?lat=%f&lon=%f&wid=0.001&ht=%f&iwd=%d&iht=%d&on=majroads&on=places&on=shorelin&on=streets&on=interstate&on=statehwy&on=ushwy&on=water&tlevel=-&tvar=-&tmeth=i"](http://tiger.census.gov/cgi-bin/mapper/map.gif?lat=%f&lon=%f&wid=0.001&ht=%f&iwd=%d&iht=%d&on=majroads&on=places&on=shorelin&on=streets&on=interstate&on=statehwy&on=ushwy&on=water&tlevel=-&tvar=-&tmeth=i"){kind=link}