Update pilot-link packages to 0.11.7. Changes are too numerous to list

here.  They include
	* tons of bug fixes,
	* USB support,
	* C++ support,
	* restructured libraries; and
	* tons of other new features.

6 files changed, 61 insertions, 222 deletions

diff --git a/comms/pilot-link/patches/patch-aa b/comms/pilot-link/patches/patch-aa
index 2b88bc7a71b..5a0cd425c8d 100644
--- a/comms/pilot-link/patches/patch-aa
+++ b/comms/pilot-link/patches/patch-aa
@@ -1,13 +1,22 @@
-$NetBSD: patch-aa,v 1.7 2002/10/27 17:56:24 bouyer Exp $
+$NetBSD: patch-aa,v 1.8 2003/01/10 04:30:18 rh Exp $
 
---- configure.orig	Sun Oct 20 15:25:57 2002
-+++ configure	Sun Oct 20 15:26:38 2002
-@@ -950,7 +950,7 @@
- if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
+--- configure.orig	Mon Jan  6 09:45:21 2003
++++ configure
+@@ -1868,7 +1868,7 @@ fi
+ if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--  LD=${LD-$ac_prog}
-+  LD=${ac_prog}
- case "$LD" in
-   /*)
-   ac_cv_path_LD="$LD" # Let the user override the test with a path.
+-  if test -z "$LD"; then
++  if true; then
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+   for ac_dir in $PATH; do
+     test -z "$ac_dir" && ac_dir=.
+@@ -6685,7 +6685,7 @@ EOF
+ 		usb_type=linux
+ 		msg_usb="yes, Linux"
+ 	;;
+-	*freebsd*)
++	*bsd*)
+ 		cat >> confdefs.h <<\EOF
+ #define HAVE_USB 1
+ EOF
diff --git a/comms/pilot-link/patches/patch-ab b/comms/pilot-link/patches/patch-ab
index 8fb0552df51..e4113b271eb 100644
--- a/comms/pilot-link/patches/patch-ab
+++ b/comms/pilot-link/patches/patch-ab
@@ -1,113 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2001/06/27 18:04:39 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2003/01/10 04:30:18 rh Exp $
 
---- Makefile.in.orig	Tue Jun 19 12:25:29 2001
-+++ Makefile.in
-@@ -34,8 +34,8 @@
- CXX = @CXX@
- CDEFS = -DLIBDIR=\"$(libdir)\"
- # -DDEBUG
--CFLAGS = -I./include -I$(srcdir)/include @CFLAGS@ @CWFLAG@ $(RLDEFS) $(CDEFS) $(TCLTK_FLAGS)
--CXXFLAGS = -I./include -I$(srcdir)/include @CXXFLAGS@ @CWFLAG@ $(RLDEFS) $(CDEFS) $(TCLTK_FLAGS)
-+CFLAGS = @CFLAGS@ -I./include -I$(srcdir)/include @CWFLAG@ $(RLDEFS) $(CDEFS) $(TCLTK_FLAGS)
-+CXXFLAGS = @CXXFLAGS@ -I./include -I$(srcdir)/include @CWFLAG@ $(RLDEFS) $(CDEFS) $(TCLTK_FLAGS)
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- # -lefence
-@@ -47,7 +47,7 @@
- LANGS = Perl5 Java Tcl Python
- SUBDIRS = tools
- 
--INSTALL = $(LIBTOOL) @INSTALL@
-+INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- YACC = @YACC@
-@@ -103,44 +103,52 @@
- 
- EXECS = $(CEXECS) $(@WITHTCL@) $(@WITHCXX@) $(@WITHPERL5@)
- 
--PILIB = libsock/libpisock.la
--PICCLIB = @libcclib@
-+#PILIB = libsock/libpisock.la
-+#PICCLIB = @libcclib@
- 
- all: $(EXECS)
- 
--$(PILIB): FORCE
-+libs: libsock/libpisock.la libcc/libpicc.a
-+
-+libsock/libpisock.la: FORCE
- 	$(SUBMAKE_COMM) libpisock.la
- 
- libcc/libpicc.a: FORCE
- 	$(SUBMAKE_COMM_CC) libpicc.a
- 
--installdirs:
--	$(SHELL) ${srcdir}/scripts/mkinstalldirs $(bindir) $(includedir) $(libdir) $(pixdir) $(mandir1) $(mandir7)
-+install: install-libs install-execs install-man
- 
--install: $(EXECS) installdirs $(PILIB) $(PICCLIB)
--	$(INSTALL_DATA) $(PILIB) $(libdir)/libpisock.la
-+install-libs: $(PILIB) $(PICCLIB)
-+	$(SHELL) ${srcdir}/scripts/mkinstalldirs $(includedir) $(libdir)
-+	for h in include/*.h $(srcdir)/include/*.h include/*.hxx $(srcdir)/include/*.hxx; do \
-+		$(INSTALL_DATA) $$h $(includedir)/`basename $$h`; \
-+	done
-+	$(LIBTOOL) $(INSTALL_DATA) $(PILIB) $(libdir)/libpisock.la
- 	if test -n "$(PICCLIB)"; then \
--		$(INSTALL_DATA) $(PICCLIB) $(libdir)/libpicc.la; \
-+		$(INSTALL_DATA) $(PICCLIB) $(libdir)/libpicc.a; \
- 	fi
--	for p in $(CEXECS); do \
--		$(STRIP) ".libs/$$p"; \
--	done        
--	for p in $(EXECS); do \
--		$(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
-+	$(LIBTOOL) -n --finish $(libdir)
-+
-+install-execs: $(EXECS)
-+	$(SHELL) ${srcdir}/scripts/mkinstalldirs $(bindir) $(pixdir)
-+	for p in $(CEXECS) $(@WITHTCL@) $(@WITHCXX@); do \
-+		$(LIBTOOL) $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
- 	done
--	for h in include/*.h $(srcdir)/include/*.h include/*.hxx $(srcdir)/include/*.hxx; do \
--		$(INSTALL_DATA) $$h $(includedir)/`basename $$h`; \
-+	for p in $(@WITHPERL5@); do \
-+		${BSD_INSTALL_SCRIPT} $$p $(bindir)/$$p; \
- 	done
-+	for p in $(srcdir)/tools/pix/*.gif $(srcdir)/tools/pix/*.xbm; do \
-+		$(INSTALL_DATA) $$p $(pixdir)/`basename $$p`; \
-+	done
-+
-+install-man:
-+	$(SHELL) ${srcdir}/scripts/mkinstalldirs $(mandir1) $(mandir7)
- 	for m in ${srcdir}/man/*.1; do \
- 		$(INSTALL_DATA) $$m $(mandir1)/`basename $$m`; \
- 	done
- 	for m in ${srcdir}/man/*.7; do \
- 		$(INSTALL_DATA) $$m $(mandir7)/`basename $$m`; \
- 	done
--	for p in $(srcdir)/tools/pix/*.gif $(srcdir)/tools/pix/*.xbm; do \
--		$(INSTALL_DATA) $$p $(pixdir)/`basename $$p`; \
--	done
--	$(LIBTOOL) -n --finish $(libdir)
- 
- uninstall:
- 	-for p in $(EXECS) $(PERLEXECS) $(CXXEXECS) $(TCLEXECS); do \
-@@ -243,13 +251,13 @@
- 	$(CCLINK) pi-nredir.o $(PILIB) $(GETOPT) -o $@ $(LIBS)
- 
- ccexample$(EXT): $(PILIB) $(GETOPT) $(PICCLIB) ccexample.o
--	$(CXXLINK) ccexample.o $(PILIB) $(GETOPT) $(PICCLIB) -o $@ $(CXXLIBS) $(LIBS)
-+	$(CXXLINK) ccexample.o $(PILIB) $(GETOPT) -lpicc -o $@ $(CXXLIBS) $(LIBS)
- 
- validate$(EXT): $(PILIB) $(GETOPT) $(PICCLIB) validate.o
--	$(CXXLINK) validate.o $(PILIB) $(GETOPT) $(PICCLIB) -o $@ $(CXXLIBS) $(LIBS)
-+	$(CXXLINK) validate.o $(PILIB) $(GETOPT) -lpicc -o $@ $(CXXLIBS) $(LIBS)
- 
- iambicexample$(EXT): $(PILIB) $(GETOPT) $(PICCLIB) iambicexample.o
--	$(CXXLINK) iambicexample.o $(PILIB) $(GETOPT) $(PICCLIB) -o $@ $(CXXLIBS) $(LIBS)
-+	$(CXXLINK) iambicexample.o $(PILIB) $(GETOPT) -lpicc -o $@ $(CXXLIBS) $(LIBS)
- 
- getrom$(EXT): $(PILIB) $(GETOPT) getrom.o
- 	$(CCLINK) getrom.o $(PILIB) $(GETOPT) -o $@ $(LIBS)
+--- libpisock/freebsdusb.c.orig	Tue Dec  3 00:32:47 2002
++++ libpisock/freebsdusb.c
+@@ -50,7 +50,7 @@
+ # define O_NONBLOCK 0
+ #endif
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ /* freebsd usb header */
+ #include <dev/usb/usb.h>
+ #define MAX_BUF 256
diff --git a/comms/pilot-link/patches/patch-ac b/comms/pilot-link/patches/patch-ac
index bacb48e59fa..6d1c45122d4 100644
--- a/comms/pilot-link/patches/patch-ac
+++ b/comms/pilot-link/patches/patch-ac
@@ -1,32 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2001/06/27 18:04:39 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2003/01/10 04:30:19 rh Exp $
 
---- libsock/Makefile.in.orig	Tue Jun 19 12:25:26 2001
-+++ libsock/Makefile.in
-@@ -25,7 +25,7 @@
- top_builddir = ..
+--- bindings/Makefile.in.orig	Mon Jan  6 09:45:18 2003
++++ bindings/Makefile.in
+@@ -420,7 +420,7 @@ python-clean: Python/setup.py
+ #
  
- CC = @CC@
--CFLAGS = -I../include -I$(srcdir)/../include @CFLAGS@ @CWFLAG@
-+CFLAGS = -I../include -I$(srcdir)/../include @CFLAGS@ @CWFLAG@ $(ICONV_CFLAGS)
- # -DPADP_TRACE
- # -DDEBUG
- # -DNO_DLP_TRACE
-@@ -36,6 +36,9 @@
- RM = rm -f
- LIBTOOL = @LIBTOOL@
+ Perl/Makefile: Perl/Makefile.PL
+-	cd Perl && $(PERL) Makefile.PL INSTALLDIRS=vendor
++	cd Perl && $(PERL) Makefile.PL INSTALLDIRS=site
  
-+ICONV_CFLAGS = @ICONV_CFLAGS@
-+ICONV_LIBS = @ICONV_LIBS@
-+
- .SUFFIXES: .c .lo .o
- 
- .c.o:
-@@ -54,7 +57,7 @@
- libpisock.la: $(OBJS)
- 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) \
- 		-export-dynamic -rpath $(libdir) -version-info 4:0:0 \
--		-o libpisock.la $(OBJS)
-+		-o libpisock.la $(OBJS) $(LDFLAGS) $(ICONV_LIBS)
- 
- # OS/2 dll build rules,  This is somewhat of a hack.
- # This target creates the OS/2 linker .def file dynanmically.
+ perl-build: Perl/Makefile
+ 	cd Perl && $(MAKE)
diff --git a/comms/pilot-link/patches/patch-ad b/comms/pilot-link/patches/patch-ad
index 6516ba43e8e..497e8d49a22 100644
--- a/comms/pilot-link/patches/patch-ad
+++ b/comms/pilot-link/patches/patch-ad
@@ -1,34 +1,29 @@
-$NetBSD: patch-ad,v 1.1 2001/08/09 08:49:47 dillo Exp $
+$NetBSD: patch-ad,v 1.2 2003/01/10 04:30:19 rh Exp $
 
---- libsock/unixserial.c.orig	Mon Aug  6 11:39:00 2001
-+++ libsock/unixserial.c	Mon Aug  6 11:42:01 2001
-@@ -156,6 +156,13 @@
- 
- 	int i;
- 
-+	/* Here we need a workaround for NetBSD USB device used with newer
-+	   Handspring devices (namely Platinum, Prism and Edge) */
-+
+--- libpisock/unixserial.c.orig	Tue Dec  3 00:32:47 2002
++++ libpisock/unixserial.c
+@@ -178,13 +178,23 @@ s_open(struct pi_socket *ps, struct pi_s
+ 		i;
+ 	char 	*tty 	= addr->pi_device;
+ 	struct pi_serial_data *data = (struct pi_serial_data *)ps->device->data;
 +#define maxretries 100
-+	int retries;
-+	int rc;
-+
++	int	retries;
+ 	
  #ifndef SGTTY
  	struct termios tcn;
  #else
-@@ -166,6 +173,15 @@
- 		tty = getenv("PILOTPORT");
- 	if (!tty)
- 		tty = "<Null>";
+ 	struct sgttyb tcn;
+ #endif
+-	if ((fd = open(tty, O_RDWR | O_NONBLOCK)) == -1) {
 +
 +	for (retries = 0 ; retries <= maxretries ; retries++ ) {
-+	  if ((rc = open(tty, O_RDWR | O_NONBLOCK)) == -1) {
-+	    usleep(50000);
-+	  } else {
-+	    ps->mac->fd = rc;
-+	    break;
-+	  }
++		if ((fd = open(tty, O_RDWR | O_NONBLOCK)) != -1) {
++			break;
++		}
++		usleep(50000);
 +	}
- 
- 	if ((ps->mac->fd = open(tty, O_RDWR | O_NONBLOCK)) == -1) {
++
++	if (fd == -1) {
  		return -1;	/* errno already set */
+ 	}
+ 
diff --git a/comms/pilot-link/patches/patch-ae b/comms/pilot-link/patches/patch-ae
deleted file mode 100644
index b6f4d6d2acb..00000000000
--- a/comms/pilot-link/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/01/30 10:19:39 dillo Exp $
-
---- libsock/padp.c.orig	Tue Jun 19 07:50:11 2001
-+++ libsock/padp.c
-@@ -173,13 +173,13 @@
- 					   && (padp.type ==
- 					       (unsigned char) padData)
- 					   && (slp->id == ps->xid)
--					   && (len == 0)) {
-+					   && (len == tlen)) {
- 					fprintf(stderr, "Missing ack\n");
- 					/* Incoming padData from response to
- 					   this transmission.  Maybe the Ack
- 					   was lost */
- 					/* Don't consume packet, and return success. */
--					count = 0;
-+					count += tlen;
- 					goto done;
- 					return 0;
- 				} else if (padp.type == (unsigned char) 4) {
diff --git a/comms/pilot-link/patches/patch-af b/comms/pilot-link/patches/patch-af
deleted file mode 100644
index ef8e84e3a8c..00000000000
--- a/comms/pilot-link/patches/patch-af
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-af,v 1.2 2002/03/15 02:43:57 markd Exp $
-
-diff -r -u pilot-link.0.9.5/libsock/slp.c work/pilot-link.0.9.5/libsock/slp.c
---- libsock/slp.c.orig	Wed Jun  6 10:16:56 2001
-+++ libsock/slp.c	Wed Jan 30 09:44:42 2002
-@@ -136,6 +141,8 @@
- 			ps->mac->state++;
- 			ps->mac->expect = 1;
- 			ps->mac->buf++;
-+		} else if (v == 0xbe) {
-+			ps->mac->expect = 1;
- 		}
- 		break;
- 
-@@ -146,6 +158,11 @@
- 			ps->mac->state++;
- 			ps->mac->expect = 7;
- 			ps->mac->buf++;
-+		} else if (v == 0xbe) {
-+			--ps->mac->buf;
-+			ps->mac->buf[-1] = v;
-+			ps->mac->expect = 1;
-+			ps->mac->state = 2;
- 		}
- 		break;
-