diff --exclude CVS -urN ../gpsd/Makefile ./Makefile
--- ../gpsd/Makefile	Sat Jan 14 13:05:49 2006
+++ ./Makefile	Sun Mar 12 20:48:14 2006
@@ -3,10 +3,10 @@
 COMMENT=		"service daemon that monitors one or more GPSes"
 COMMENT-motif=		"motif-based test apps using gpsd"
 
-VERSION=		2.29
+VERSION=		2.32
 DISTNAME=		gpsd-${VERSION}
-PKGNAME=		gpsd-${VERSION}p2
-PKGNAME-motif=		gpsd-motif-${VERSION}p0
+PKGNAME=		gpsd-${VERSION}
+PKGNAME-motif=		gpsd-motif-${VERSION}
 SHARED_LIBS=		gps	16.0
 CATEGORIES=		misc
 
diff --exclude CVS -urN ../gpsd/distinfo ./distinfo
--- ../gpsd/distinfo	Sun Sep  4 18:34:59 2005
+++ ./distinfo	Mon Mar 13 08:52:46 2006
@@ -1,4 +1,4 @@
-MD5 (gpsd-2.29.tar.gz) = 3ff80db0e7d906457e5a7a1b04fcb4ec
-RMD160 (gpsd-2.29.tar.gz) = bde27102cfcf1d434ca684b075c7fb31af0d73bc
-SHA1 (gpsd-2.29.tar.gz) = bfbfab28922ad566e67409ea1d57108057d75eea
-SIZE (gpsd-2.29.tar.gz) = 602411
+MD5 (gpsd-2.32.tar.gz) = 4bb9b0c1642d36265c807a04da3d6f60
+RMD160 (gpsd-2.32.tar.gz) = 87cd19a4e8126ee98f8a6908829569a2a1dc5ccd
+SHA1 (gpsd-2.32.tar.gz) = 9fd6010834f1c56e755ea6515dba80431544a277
+SIZE (gpsd-2.32.tar.gz) = 617947
diff --exclude CVS -urN ../gpsd/patches/patch-Makefile_in ./patches/patch-Makefile_in
--- ../gpsd/patches/patch-Makefile_in	Wed Dec 31 17:00:00 1969
+++ ./patches/patch-Makefile_in	Mon Mar 13 08:56:48 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.in.orig	Mon Mar 13 08:56:06 2006
++++ Makefile.in	Mon Mar 13 08:56:20 2006
+@@ -335,7 +335,7 @@ target_alias = @target_alias@
+ # Build stuff depending on Motif
+ #
+ @HAVE_MOTIF_TRUE@MOTIF_PROGS = xgps xgpsspeed
+-XMLTO = xmlto
++XMLTO = true
+ @HAVE_DBUS_TRUE@INCLUDES = $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) -DDBUS_API_SUBJECT_TO_CHANGE=1
+ @HAVE_DBUS_TRUE@DBUSPROGS = gpxlogger
+ @HAVE_DBUS_TRUE@gpxlogger_LDADD = $(DBUS_GLIB_LIBS) -lm
diff --exclude CVS -urN ../gpsd/patches/patch-gpsd_c ./patches/patch-gpsd_c
--- ../gpsd/patches/patch-gpsd_c	Sun Sep  4 18:34:59 2005
+++ ./patches/patch-gpsd_c	Mon Mar 13 13:54:38 2006
@@ -1,6 +1,6 @@
 $OpenBSD: patch-gpsd_c,v 1.1.1.1 2005/09/05 00:34:59 marcm Exp $
---- gpsd.c.orig	Fri Aug  5 04:59:38 2005
-+++ gpsd.c	Sun Aug 21 18:16:13 2005
+--- gpsd.c.orig	Sun Mar 12 19:20:18 2006
++++ gpsd.c	Mon Mar 13 13:52:56 2006
 @@ -68,7 +68,7 @@
   * The name of a tty device from which to pick up whatever the local
   * owning group for tty devices is.  Used when we drop privileges.
@@ -10,7 +10,16 @@
  
  static fd_set all_fds;
  static int debuglevel;
-@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[])
+@@ -868,7 +868,7 @@
+ 	    break;
+ 	case 'V':
+ 	    if (assign_channel(whoami) && have_fix(whoami->device) && isnan(whoami->device->gpsdata.fix.track)==0)
+-		(void)snprintf(phrase, sizeof(phrase), ",V=%.3f", whoami->device->gpsdata.fix.speed / KNOTS_TO_KPH);
++		(void)snprintf(phrase, sizeof(phrase), ",V=%.3f", whoami->device->gpsdata.fix.speed * MPS_TO_KNOTS);
+ 	    else
+ 		(void)strcpy(phrase, ",V=?");
+ 	    break;
+@@ -1223,7 +1223,7 @@
  	    if (setgid(stb.st_gid) != 0)
  		gpsd_report(0, "setgid() failed, errno %s\n", strerror(errno));
  	}
diff --exclude CVS -urN ../gpsd/patches/patch-serial_c ./patches/patch-serial_c
--- ../gpsd/patches/patch-serial_c	Sun Sep  4 18:34:59 2005
+++ ./patches/patch-serial_c	Wed Dec 31 17:00:00 1969
@@ -1,12 +0,0 @@
-$OpenBSD: patch-serial_c,v 1.1.1.1 2005/09/05 00:34:59 marcm Exp $
---- serial.c.orig	Tue Aug 16 17:07:13 2005
-+++ serial.c	Sun Aug 21 14:12:28 2005
-@@ -97,7 +97,7 @@ void gpsd_set_speed(struct gps_device_t 
- int gpsd_open(struct gps_device_t *session)
- {
-     gpsd_report(1, "opening GPS data source at '%s'\n", session->gpsdata.gps_device);
--    if ((session->gpsdata.gps_fd = open(session->gpsdata.gps_device, O_RDWR|O_NOCTTY)) < 0) {
-+    if ((session->gpsdata.gps_fd = open(session->gpsdata.gps_device, O_RDWR|O_NONBLOCK|O_NOCTTY)) < 0) {
- 	gpsd_report(1, "device open failed: %s\n", strerror(errno));
- 	return -1;
-     }
diff --exclude CVS -urN ../gpsd/pkg/PLIST ./pkg/PLIST
--- ../gpsd/pkg/PLIST	Fri Sep 16 03:51:27 2005
+++ ./pkg/PLIST	Mon Mar 13 08:58:45 2006
@@ -3,6 +3,7 @@
 @newuser _gpsd:551:dialer::GPS server:/nonexistent:/sbin/nologin
 %%SHARED%%
 bin/cgps
+bin/cgpxlogger
 bin/gpsfake
 bin/gpsflash
 bin/gpspipe
@@ -14,13 +15,13 @@
 include/libgpsmm.h
 lib/libgps.a
 lib/libgps.la
+@man man/man1/gps.1
 @man man/man1/gpsfake.1
 @man man/man1/gpsflash.1
 @man man/man1/gpspipe.1
 @man man/man1/gpsprof.1
 @man man/man1/rtcmdecode.1
 @man man/man1/sirfmon.1
-@man man/man1/xgps.1
 @man man/man3/libgps.3
 @man man/man3/libgpsd.3
 @man man/man3/libgpsmm.3