Update to 2.90.

* Fri Dec 4 2009 Eric S. Raymond <esr@snark.thyrsus.com> - 2.90
  GPSD-NG, the new JSON-based command protocol, is now deployed; as a
  consequence, AIS is now fully supported in both daemon and client.
  Detection of end of a fix-reporting cycle is now reliable;
  accordingly data is accumulated from cycle start and the "J"
  (nojitter) opoption on both server and client side is gone. We have
  abandoned the gpsflash subproject since it has become apparent that
  we can't do it without more vendor cooperation than we're likely to
  get. Increase major version of shared library due to significant API
  change. Added new driver for Motorola Oncore receivers, with help
  from Håkan Johansson. gpsfake can now accept multiple logfiles,
  interleaving test sentences from each.  gpsd now accepts error
  estimates from the NMEA $GPGBS sentence.

5 files changed, 33 insertions, 82 deletions

diff --git a/geography/gpsd/Makefile b/geography/gpsd/Makefile
index 9696e1995b2..31d3126f304 100644
--- a/geography/gpsd/Makefile
+++ b/geography/gpsd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2009/02/11 01:05:25 gdt Exp $
+# $NetBSD: Makefile,v 1.15 2009/12/07 20:08:59 gdt Exp $
 
-DISTNAME=	gpsd-2.38
+DISTNAME=	gpsd-2.90
 CATEGORIES=	geography
 MASTER_SITES=	http://download.berlios.de/gpsd/
 
diff --git a/geography/gpsd/PLIST b/geography/gpsd/PLIST
index 049c4a0147f..56ca010f851 100644
--- a/geography/gpsd/PLIST
+++ b/geography/gpsd/PLIST
@@ -1,12 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2009/02/11 01:05:25 gdt Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/12/07 20:08:59 gdt Exp $
 bin/cgps
-bin/cgpxlogger
 bin/gpsctl
-bin/gpsdlcdd
-bin/gpsflash
+bin/gpsdecode
+bin/gpsmon
 bin/gpspipe
-bin/rtcmdecode
-bin/sirfmon
+bin/gpxlogger
+bin/lcdgps
 include/gps.h
 include/gpsd.h
 include/libgpsmm.h
@@ -17,10 +16,10 @@ man/man1/cgps.1
 man/man1/cgpxlogger.1
 man/man1/gps.1
 man/man1/gpsctl.1
-man/man1/gpsflash.1
+man/man1/gpsdecode.1
+man/man1/gpsmon.1
 man/man1/gpspipe.1
-man/man1/rtcmdecode.1
-man/man1/sirfmon.1
+man/man1/lcdgps.1
 man/man1/xgps.1
 man/man1/xgpsspeed.1
 man/man3/libgps.3
diff --git a/geography/gpsd/distinfo b/geography/gpsd/distinfo
index d19652d68ec..9a83ee04124 100644
--- a/geography/gpsd/distinfo
+++ b/geography/gpsd/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.12 2009/02/11 01:05:25 gdt Exp $
+$NetBSD: distinfo,v 1.13 2009/12/07 20:08:59 gdt Exp $
 
-SHA1 (gpsd-2.38.tar.gz) = 310cad336e06faed34a7bd3503b169b502520925
-RMD160 (gpsd-2.38.tar.gz) = e5c8a05170286fd7aac87c9d182cfdf5a8f6c6b0
-Size (gpsd-2.38.tar.gz) = 776598 bytes
-SHA1 (patch-aa) = 0f581183a114d63733c57ed9f0ceead43e2e5607
-SHA1 (patch-ab) = 869942effbfc22ece1716dce0ffb5c907dd66906
+SHA1 (gpsd-2.90.tar.gz) = e8831bd8013015633c49e6af37537ee6228e5372
+RMD160 (gpsd-2.90.tar.gz) = 556f58520d9b931aa60be0fc76b82106220984de
+Size (gpsd-2.90.tar.gz) = 915578 bytes
+SHA1 (patch-aa) = 794856c5f43c655a9f5f5df69f072663c022e0ac
diff --git a/geography/gpsd/patches/patch-aa b/geography/gpsd/patches/patch-aa
index 0b5d8ea102a..2b53c026ffa 100644
--- a/geography/gpsd/patches/patch-aa
+++ b/geography/gpsd/patches/patch-aa
@@ -1,34 +1,34 @@
-$NetBSD: patch-aa,v 1.5 2008/01/15 00:58:17 gdt Exp $
+$NetBSD: patch-aa,v 1.6 2009/12/07 20:08:59 gdt Exp $
 
 Not 100% sure about this, but it is not apparently fixed upstream.
 I think we should have a configure.ac patch as well for regeneration.)
 
 
---- configure.orig	2008-01-01 13:44:00.000000000 -0500
+--- configure.orig	2009-12-04 15:45:59.000000000 -0500
 +++ configure
-@@ -25345,13 +25345,13 @@ if test $ac_cv_lib_c_open = yes; then
+@@ -16571,13 +16571,13 @@ if test "x$ac_cv_lib_c_open" = x""yes; t
  fi
  
  
--{ echo "$as_me:$LINENO: checking for pthread_setcancelstate in -lpthread" >&5
--echo $ECHO_N "checking for pthread_setcancelstate in -lpthread... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for pthread_setcancelstate in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_setcancelstate in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; }
- if test "${ac_cv_lib_pthread_pthread_setcancelstate+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_setcancelstate in -lpthread" >&5
+-$as_echo_n "checking for pthread_setcancelstate in -lpthread... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_setcancelstate in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++$as_echo_n "checking for pthread_setcancelstate in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; }
+ if test "${ac_cv_lib_pthread_pthread_setcancelstate+set}" = set; then :
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpthread  $LIBS"
 +LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -25407,7 +25407,7 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_setcancelstate" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_setcancelstate" >&6; }
- if test $ac_cv_lib_pthread_pthread_setcancelstate = yes; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -16608,7 +16608,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_setcancelstate" >&5
+ $as_echo "$ac_cv_lib_pthread_pthread_setcancelstate" >&6; }
+ if test "x$ac_cv_lib_pthread_pthread_setcancelstate" = x""yes; then :
 -  LIBPTHREAD="-lpthread"
 +  LIBPTHREAD="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBPTHREAD
+ $as_echo "#define HAVE_LIBPTHREAD /**/" >>confdefs.h
+ 
diff --git a/geography/gpsd/patches/patch-ab b/geography/gpsd/patches/patch-ab
deleted file mode 100644
index 72c912725d6..00000000000
--- a/geography/gpsd/patches/patch-ab
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2008/05/08 00:06:52 gdt Exp $
-
---- Makefile.in.orig	2008-02-17 17:41:06.000000000 +0000
-+++ Makefile.in
-@@ -560,24 +560,24 @@ mkgmtime_test_LDADD = $(LIBC) libgps.la 
- #
- # Create Manpages
- #
--@HAVE_XSLT_PROCESSOR_TRUE@man_MANS = \
--@HAVE_XSLT_PROCESSOR_TRUE@	gpsd.8 \
--@HAVE_XSLT_PROCESSOR_TRUE@	gps.1 \
--@HAVE_XSLT_PROCESSOR_TRUE@	xgps.1 \
--@HAVE_XSLT_PROCESSOR_TRUE@	xgpsspeed.1 \
--@HAVE_XSLT_PROCESSOR_TRUE@	cgps.1 \
--@HAVE_XSLT_PROCESSOR_TRUE@	cgpxlogger.1 \
--@HAVE_XSLT_PROCESSOR_TRUE@	libgps.3 \
--@HAVE_XSLT_PROCESSOR_TRUE@	libgpsmm.3 \
--@HAVE_XSLT_PROCESSOR_TRUE@	libgpsd.3 \
--@HAVE_XSLT_PROCESSOR_TRUE@	sirfmon.1 \
--@HAVE_XSLT_PROCESSOR_TRUE@	$(RTCM104PAGES) \
--@HAVE_XSLT_PROCESSOR_TRUE@	$(PYTHONPAGES) \
--@HAVE_XSLT_PROCESSOR_TRUE@	gpsctl.1 \
--@HAVE_XSLT_PROCESSOR_TRUE@	gpspipe.1 \
--@HAVE_XSLT_PROCESSOR_TRUE@	gpsflash.1 \
--@HAVE_XSLT_PROCESSOR_TRUE@	rtcm-104.5 \
--@HAVE_XSLT_PROCESSOR_TRUE@	srec.5
-+man_MANS = \
-+	gpsd.8 \
-+	gps.1 \
-+	xgps.1 \
-+	xgpsspeed.1 \
-+	cgps.1 \
-+	cgpxlogger.1 \
-+	libgps.3 \
-+	libgpsmm.3 \
-+	libgpsd.3 \
-+	sirfmon.1 \
-+	$(RTCM104PAGES) \
-+	$(PYTHONPAGES) \
-+	gpsctl.1 \
-+	gpspipe.1 \
-+	gpsflash.1 \
-+	rtcm-104.5 \
-+	srec.5
- 
- noinst_HEADERS = ubx.h
- nodist_include_HEADERS = gpsd.h