Update to 2.36. Note that python programs are no longer installed.

- Integrated Garmin Simple Text Protocol driver from Peter Slansky.
  Minor fixes in error modeling and a better NaN guard stabilize the
  Trimble regression tests.  Remove the wired-in NTP time offset from the
  NMEA driver, this could only have worked by accident and should be
  set in ntpd.conf. Integrated Ashtech driver from Chris Kuethe.

- Navcom driver merged. Removed -d -f and -p options of gpsd; these
  have been undocumented for a while.  Make gpsd play well with pkgconfig.
  Incorrect computation of VDOP when GPSes didn't supply it has been fixed.
  The xgps code has been revamped and now has a much nicer interface.
  Add -b (no-configuration) option as a sadly clumsy workaround for some
  problems with Bluetooth receivers.  Added tests for Haicom-305N and Pharos
  360; separated out the tests for the unstable Trimble drivers.
  32-vs-64-bit problems in the regression tests have been solved.

- Fix for byte-swapping of Zodiac control messages on big-endian hardware.
  Disable iTalk by default and note that it needs to be tested.  Command line
  arguments can now be DGPSIP or NTRIP URLs; -d is deprecated. Added udev
  rules.  Address excessive processor and memory utilization on SBCs; it's
  now possible to configure compile-time limits on the number of devices
  and client sessions.  Eliminate use of fuser(1) in gpsfake.  Get gpsd
  working with EarthMates again, this had been broken since 2.15.  Massive
  string safety audit and OpenBSD port by Chris Kuethe.  J command added.
  The gpsctl and gpscat tools and the gpsd.phps script were added.  Switched
  to lesstif from openmotif.  Better autodetection of DLE-led packet
  protocols (notably TSIP and Garmin binary) and of SiRFStar I and III
  devices.  Fixed buggy parsing and generation of PGRME.

7 files changed, 38 insertions, 80 deletions

diff --git a/geography/gpsd/Makefile b/geography/gpsd/Makefile
index 4ca8f5cb17f..91258f72d56 100644
--- a/geography/gpsd/Makefile
+++ b/geography/gpsd/Makefile
@@ -1,20 +1,26 @@
-# $NetBSD: Makefile,v 1.8 2008/01/12 23:54:46 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/01/15 00:58:17 gdt Exp $
 
-DISTNAME=	gpsd-2.33
-PKGREVISION=	1
+DISTNAME=	gpsd-2.36
 CATEGORIES=	geography
 MASTER_SITES=	http://download.berlios.de/gpsd/
 
 MAINTAINER=	tsarna@NetBSD.org
+# also gdt@NetBSD.org
 HOMEPAGE=	http://gpsd.berlios.de/
 COMMENT=	GPS information daemon
 
 GNU_CONFIGURE=	YES
+CONFIGURE_ARGS+=	--disable-python
+
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
+USE_NCURSES=	yes
 
 INSTALLATION_DIRS=	sbin
 
+# XXX This package should have an option for python to install gpsfake
+# and gpsctl.
+
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/gpsd/PLIST b/geography/gpsd/PLIST
index f5fa8e3bf77..40701c67cf9 100644
--- a/geography/gpsd/PLIST
+++ b/geography/gpsd/PLIST
@@ -1,23 +1,23 @@
-@comment $NetBSD: PLIST,v 1.3 2006/08/31 14:12:53 gdt Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/01/15 00:58:17 gdt Exp $
 bin/cgps
 bin/cgpxlogger
-bin/gpsfake
+bin/gpsctl
 bin/gpsflash
 bin/gpspipe
-bin/gpsprof
 bin/rtcmdecode
 bin/sirfmon
 include/gps.h
 include/gpsd.h
 include/libgpsmm.h
 lib/libgps.la
+lib/pkgconfig/libgps.pc
+lib/pkgconfig/libgpsd.pc
 man/man1/cgps.1
 man/man1/cgpxlogger.1
 man/man1/gps.1
-man/man1/gpsfake.1
+man/man1/gpsctl.1
 man/man1/gpsflash.1
 man/man1/gpspipe.1
-man/man1/gpsprof.1
 man/man1/rtcmdecode.1
 man/man1/sirfmon.1
 man/man1/xgps.1
diff --git a/geography/gpsd/distinfo b/geography/gpsd/distinfo
index 70e7a86e65b..0084868f19a 100644
--- a/geography/gpsd/distinfo
+++ b/geography/gpsd/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.7 2008/01/12 23:54:46 joerg Exp $
+$NetBSD: distinfo,v 1.8 2008/01/15 00:58:17 gdt Exp $
 
-SHA1 (gpsd-2.33.tar.gz) = 0dbb3dad459fc4a0ca7e4ba5884e67c93d4b679f
-RMD160 (gpsd-2.33.tar.gz) = 175b90cb8dda1d85964078a4f14cec84b0cc4885
-Size (gpsd-2.33.tar.gz) = 639348 bytes
-SHA1 (patch-aa) = d67077a5f857903615b36e83a2e505a20db841fe
-SHA1 (patch-ab) = 0703e9da1e6f34bd575c6b61f891fc13a3598bb4
-SHA1 (patch-ac) = f8e15b9a409bc9cd8b32bebbf446cf71ba90475f
-SHA1 (patch-ad) = 25b2bd2064f8aa41c0f4eefb4b5cffdf87beadce
+SHA1 (gpsd-2.36.tar.gz) = 4faee0e3e1e5422702f354a85849fd4e8c3a98c2
+RMD160 (gpsd-2.36.tar.gz) = aa3c4741dba4c07f145f62fb027e2ba303d16284
+Size (gpsd-2.36.tar.gz) = 736220 bytes
+SHA1 (patch-aa) = 0f581183a114d63733c57ed9f0ceead43e2e5607
diff --git a/geography/gpsd/patches/patch-aa b/geography/gpsd/patches/patch-aa
index 8e083c0c92f..0b5d8ea102a 100644
--- a/geography/gpsd/patches/patch-aa
+++ b/geography/gpsd/patches/patch-aa
@@ -1,16 +1,20 @@
-$NetBSD: patch-aa,v 1.4 2006/10/13 06:22:54 rillig Exp $
+$NetBSD: patch-aa,v 1.5 2008/01/15 00:58:17 gdt Exp $
 
---- configure.orig	2006-06-07 17:08:36.000000000 +0200
-+++ configure	2006-10-13 08:21:17.000000000 +0200
-@@ -21174,13 +21174,13 @@ if test $ac_cv_lib_c_open = yes; then
+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
+@@ -25345,13 +25345,13 @@ if test $ac_cv_lib_c_open = yes; then
  fi
  
  
--echo "$as_me:$LINENO: checking for main in -lpthread" >&5
--echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for main in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for main in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_main+set}" = set; then
+-{ 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
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -19,21 +23,12 @@ $NetBSD: patch-aa,v 1.4 2006/10/13 06:22:54 rillig Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21233,7 +21233,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6
- if test $ac_cv_lib_pthread_main = yes; then
+@@ -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
 -  LIBPTHREAD="-lpthread"
 +  LIBPTHREAD="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- fi
- 
- 
-@@ -23456,7 +23456,7 @@ else
- fi;
- echo "$as_me:$LINENO: checking for DBUS support" >&5
- echo $ECHO_N "checking for DBUS support... $ECHO_C" >&6
--if test x"$ac_dbus" == "xyes"; then
-+if test x"$ac_dbus" = "xyes"; then
-     echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
  
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LIBPTHREAD
diff --git a/geography/gpsd/patches/patch-ab b/geography/gpsd/patches/patch-ab
deleted file mode 100644
index fb89002dda8..00000000000
--- a/geography/gpsd/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/03/02 20:05:57 drochner Exp $
-
---- sirfmon.c.orig	2006-02-19 15:30:10.000000000 +0100
-+++ sirfmon.c
-@@ -23,7 +23,7 @@
-  * so it deliberately doesn't use much of the library. 
-  */
- #include <stdio.h>
--#include <curses.h>
-+#include <ncurses.h>
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
diff --git a/geography/gpsd/patches/patch-ac b/geography/gpsd/patches/patch-ac
deleted file mode 100644
index e31dc8f6436..00000000000
--- a/geography/gpsd/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/04/20 15:28:00 joerg Exp $
-
---- gpspipe.c.orig	2006-04-20 15:17:54.000000000 +0000
-+++ gpspipe.c
-@@ -25,7 +25,8 @@
-  */
- 
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <errno.h>
- #include <stdio.h>
--#include <sys/socket.h>
- #include <unistd.h>
- #include <string.h>
diff --git a/geography/gpsd/patches/patch-ad b/geography/gpsd/patches/patch-ad
deleted file mode 100644
index 2e0eb90fbe9..00000000000
--- a/geography/gpsd/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/01/12 23:54:47 joerg Exp $
-
---- gpsd.c.orig	2006-06-09 14:34:09.000000000 +0200
-+++ gpsd.c
-@@ -129,7 +129,7 @@ static int daemonize(void)
- }
- 
- #if defined(PPS_ENABLE)
--static pthread_mutex_t report_mutex;
-+static pthread_mutex_t report_mutex = PTHREAD_MUTEX_INITIALIZER;
- #endif /* PPS_ENABLE */
- 
- void gpsd_report(int errlevel, const char *fmt, ... )