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.

15 files changed, 191 insertions, 306 deletions

diff --git a/comms/p5-pilot-link/Makefile b/comms/p5-pilot-link/Makefile
index 568e0fa2d74..4e443624433 100644
--- a/comms/p5-pilot-link/Makefile
+++ b/comms/p5-pilot-link/Makefile
@@ -1,31 +1,42 @@
-# $NetBSD: Makefile,v 1.16 2002/10/27 19:47:52 seb Exp $
+# $NetBSD: Makefile,v 1.17 2003/01/10 04:30:16 rh Exp $
+#
 
-DISTNAME=		pilot-link.0.9.5
-PKGNAME=		p5-pilot-link-0.1
-PKGREVISION=		1
-SVR4_PKGNAME=		p5pli
-CATEGORIES=		comms perl5
-MASTER_SITES=		http://www.gnu-designs.com/pilot-link/source/
-EXTRACT_SUFX=		.tar.bz2
+.include "../../comms/pilot-link/Makefile.common"
 
-MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://www.gnu-designs.com/pilot-link/
-COMMENT=		perl interface to pilot-link library
+PKGNAME=                p5-${DISTNAME}
 
+COMMENT=		perl bindings for pilot-link
+
+BUILDLINK_DEPENDS.pilot-link-libs=	pilot-link-libs>=${PILOT_LINK_VERS}
+
+USE_X11=		YES
+USE_GMAKE=		YES
 USE_BUILDLINK2=		YES
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/PDA/Pilot/.packlist
 
-EXTRACT_ELEMENTS=	${DISTNAME}/tools/Perl5
-WRKSRC=			${WRKDIR}/${EXTRACT_ELEMENTS}
+CONFIGURE_ARGS+=	--with-perl=${PERL5}
+PERL5_CONFIGURE=	NO
+PERL5_PACKLIST=         ${PERL5_SITEARCH}/auto/PDA/Pilot/.packlist
+
+INSTALL_DIRS=		${WRKSRC}/bindings
+BUILD_DIRS+=		${WRKSRC}/src
+BUILD_DIRS+=		${INSTALL_DIRS}
 
-pre-configure:
-	@cd ${WRKSRC};							\
-	${SED}	-e "s|@prefix@|${PREFIX}|g"				\
-		-e "s|@exec_prefix@|${PREFIX}|g"			\
-		-e "s|@libdir@|${BUILDLINK_PREFIX.pilot-link-libs}/lib|g" \
-		-e "s|\(-I.*\)\(',\)|\1 ${CPPFLAGS}\2|"			\
-		Makefile.PL.in > Makefile.PL
+post-patch:
+	cd ${WRKSRC} &&							\
+	for mf in src/Makefile.in src/*/Makefile.in ; do		\
+		${CP} $$mf $$mf.old &&					\
+		${SED} -e 's|..top_builddir./lib[^/]*/\(lib[^\.]*\.la\)|${PREFIX}/lib/\1|g'	\
+			< $$mf.old > $$mf ;				\
+	done
+
+post-install:
+.for bin in ietf2datebook pilot-undelete sync-plan
+	cd ${WRKSRC}/src &&						\
+	${INSTALL_SCRIPT} ${bin} ${PREFIX}/bin
+.endfor
 
 .include "../../comms/pilot-link-libs/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
 .include "../../lang/perl5/module.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/p5-pilot-link/PLIST b/comms/p5-pilot-link/PLIST
index 0675fa22f9f..8c4b282c34b 100644
--- a/comms/p5-pilot-link/PLIST
+++ b/comms/p5-pilot-link/PLIST
@@ -1 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:44:28 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/10 04:30:16 rh Exp $
+bin/ietf2datebook
+bin/pilot-undelete
+bin/sync-plan
diff --git a/comms/pilot-link-libs/Makefile b/comms/pilot-link-libs/Makefile
index 2057e7061ed..45ec681e65e 100644
--- a/comms/pilot-link-libs/Makefile
+++ b/comms/pilot-link-libs/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2002/09/20 08:39:29 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2003/01/10 04:30:21 rh Exp $
 #
 
 .include "../../comms/pilot-link/Makefile.common"
 
 PKGNAME=		pilot-link-libs-${PILOT_LINK_VERS}
-PKGREVISION=		3
 COMMENT=		Libraries for talking to the 3Com Pilot PDA
 
 CONFLICTS+=		pilot-link-0.8.* pilot-link-0.9.[0-3]
@@ -14,8 +13,11 @@ USE_BUILDLINK2=		# defined
 MAKE_ENV+=		PILIB="libsock/libpisock.la"
 MAKE_ENV+=		PICCLIB="libcc/libpicc.a"
 
-ALL_TARGET=		libs
-INSTALL_TARGET=		install-libs
+BUILD_DIRS=		${WRKSRC}/include
+BUILD_DIRS+=		${WRKSRC}/libpisock
+BUILD_DIRS+=		${WRKSRC}/libpisock++
+BUILD_DIRS+=		${WRKSRC}/libpisync
 
 .include "../../converters/libiconv/buildlink2.mk"
+.include "../../devel/readline/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/pilot-link-libs/PLIST b/comms/pilot-link-libs/PLIST
index 79d85c45394..47c81e4142e 100644
--- a/comms/pilot-link-libs/PLIST
+++ b/comms/pilot-link-libs/PLIST
@@ -1,45 +1,55 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:44:32 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/10 04:30:21 rh Exp $
 include/pi-address.h
 include/pi-address.hxx
 include/pi-appinfo.h
 include/pi-appinfo.hxx
 include/pi-args.h
 include/pi-cmp.h
-include/pi-config-win32.h
-include/pi-config.h
 include/pi-datebook.h
 include/pi-datebook.hxx
+include/pi-debug.h
 include/pi-dlp.h
 include/pi-dlp.hxx
 include/pi-expense.h
 include/pi-file.h
 include/pi-header.h
 include/pi-hinote.h
-include/pi-iambicExpense.h
-include/pi-iambicExpense.hxx
 include/pi-inet.h
-include/pi-inetserial.h
 include/pi-macros.h
 include/pi-mail.h
+include/pi-md5.h
 include/pi-memo.h
 include/pi-memo.hxx
 include/pi-money.h
+include/pi-net.h
+include/pi-notepad.h
 include/pi-padp.h
+include/pi-palmpix.h
 include/pi-serial.h
 include/pi-slp.h
-include/pi-sockaddr-win32.h
 include/pi-sockaddr.h
 include/pi-socket.h
 include/pi-source.h
 include/pi-sync.h
+include/pi-sys.h
 include/pi-syspkt.h
 include/pi-todo.h
 include/pi-todo.hxx
+include/pi-usb.h
 include/pi-util.h
 include/pi-version.h
-lib/libpicc.a
+lib/libpisock++.a
+lib/libpisock++.la
+lib/libpisock++.so
+lib/libpisock++.so.0
+lib/libpisock++.so.0.0
 lib/libpisock.a
 lib/libpisock.la
 lib/libpisock.so
-lib/libpisock.so.4
-lib/libpisock.so.4.0
+lib/libpisock.so.8
+lib/libpisock.so.8.4
+lib/libpisync.a
+lib/libpisync.la
+lib/libpisync.so
+lib/libpisync.so.0
+lib/libpisync.so.0.0
diff --git a/comms/pilot-link-libs/buildlink2.mk b/comms/pilot-link-libs/buildlink2.mk
index efb4c56f211..572682d5f73 100644
--- a/comms/pilot-link-libs/buildlink2.mk
+++ b/comms/pilot-link-libs/buildlink2.mk
@@ -1,19 +1,21 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:36 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/01/10 04:30:21 rh Exp $
 
 .if !defined(PILOT_LINK_LIBS_BUILDLINK2_MK)
 PILOT_LINK_LIBS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			pilot-link-libs
-BUILDLINK_DEPENDS.pilot-link-libs?=	pilot-link-libs>=0.9.5nb3
+BUILDLINK_DEPENDS.pilot-link-libs?=	pilot-link-libs>=0.11.7
 BUILDLINK_PKGSRCDIR.pilot-link-libs?=	../../comms/pilot-link-libs
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.pilot-link-libs=pilot-link-libs
 BUILDLINK_PREFIX.pilot-link-libs_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.pilot-link-libs=	include/pi-*.*
-BUILDLINK_FILES.pilot-link-libs+=	lib/libpicc.*
-BUILDLINK_FILES.pilot-link-libs+=	lib/libpisock.*
+BUILDLINK_FILES.pilot-link-libs+=       lib/libpisock++.*
+BUILDLINK_FILES.pilot-link-libs+=       lib/libpisock.*
+BUILDLINK_FILES.pilot-link-libs+=       lib/libpisync.*
 
 .include "../../converters/libiconv/buildlink2.mk"
+.include "../../devel/readline/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	pilot-link-libs-buildlink
 
diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile
index d8ec22b856c..4efe943d9f0 100644
--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@@ -1,29 +1,39 @@
-# $NetBSD: Makefile,v 1.29 2002/09/21 07:12:32 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2003/01/10 04:30:17 rh Exp $
 #
 
 .include "../../comms/pilot-link/Makefile.common"
 
-PKGNAME=		pilot-link-${PILOT_LINK_VERS}
-PKGREVISION=		1
 COMMENT=		Tools to talk to the 3Com Pilot PDA
 
 BUILDLINK_DEPENDS.pilot-link-libs=	pilot-link-libs>=${PILOT_LINK_VERS}
 
-USE_BUILDLINK2=		# defined
-USE_X11=		# defined
-USE_GNU_READLINE=	# defined
+USE_X11=		YES
+USE_GMAKE=		YES
+USE_BUILDLINK2=		YES
+USE_GNU_READLINE=	YES
 
 CONFIGURE_ARGS+=	--with-perl5=${PERL5}
 CONFIGURE_ARGS+=	--with-readline21
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}
 CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}
 
-LIBS+=			-lpisock -liconv
+BUILD_DIRS=		${WRKSRC}/src
+BUILD_DIRS+=		${WRKSRC}/bindings
+BUILD_DIRS+=		${WRKSRC}/doc
+BUILD_DIRS+=		${WRKSRC}/tests
+
+post-patch:
+	cd ${WRKSRC} &&							\
+	for mf in src/Makefile.in src/*/Makefile.in tests/Makefile.in ; do \
+		${CP} $$mf $$mf.old &&					\
+		${SED} -e 's|..top_builddir./lib[^/]*/\(lib[^\.]*\.la\)|${PREFIX}/lib/\1|g'	\
+			< $$mf.old > $$mf ;				\
+	done
 
-INSTALL_TARGET=		install-execs install-man
 
 .include "../../comms/pilot-link-libs/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../lang/tcl/buildlink2.mk"
 .include "../../x11/tk/buildlink2.mk"
diff --git a/comms/pilot-link/Makefile.common b/comms/pilot-link/Makefile.common
index ab1488168a2..a098e4dea85 100644
--- a/comms/pilot-link/Makefile.common
+++ b/comms/pilot-link/Makefile.common
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile.common,v 1.2 2002/10/30 10:16:44 markd Exp $
+# $NetBSD: Makefile.common,v 1.3 2003/01/10 04:30:17 rh Exp $
 
-DISTNAME=		pilot-link.${PILOT_LINK_VERS}
+DISTNAME=		pilot-link-${PILOT_LINK_VERS}
 CATEGORIES=		comms
-MASTER_SITES=		http://www.gnu-designs.com/pilot-link/source/
+MASTER_SITES=		http://www.pilot-link.org/source/
 EXTRACT_SUFX=		.tar.bz2
 
-PILOT_LINK_VERS=	0.9.5
+PILOT_LINK_VERS=	0.11.7
 
 MAINTAINER=		jlam@netbsd.org
-HOMEPAGE=		http://www.gnu-designs.com/pilot-link/
+HOMEPAGE?=		http://www.pilot-link.org/
 
 USE_LIBTOOL=		# defined
-LTCONFIG_OVERRIDE=	${WRKSRC}/scripts/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		# defined
 
@@ -28,8 +28,6 @@ CONFIGURE_ARGS+=	--without-java
 CONFIGURE_ARGS+=	--without-itcl
 CONFIGURE_ARGS+=	--without-perl5
 CONFIGURE_ARGS+=	--without-python
-CONFIGURE_ARGS+=	--without-readline21
-CONFIGURE_ARGS+=	--without-readline20
 CONFIGURE_ARGS+=	--without-tcl
 CONFIGURE_ARGS+=	--without-tk
 
diff --git a/comms/pilot-link/PLIST b/comms/pilot-link/PLIST
index 897b577522a..72d6a4b5db5 100644
--- a/comms/pilot-link/PLIST
+++ b/comms/pilot-link/PLIST
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:44:30 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/10 04:30:18 rh Exp $
 bin/addresses
 bin/ccexample
 bin/debugsh
 bin/dlpsh
-bin/getrom
 bin/hinotes
-bin/iambicexample
-bin/ietf2datebook
 bin/install-datebook
+bin/install-expenses
 bin/install-hinote
 bin/install-memo
+bin/install-netsync
+bin/install-todo
 bin/install-todos
 bin/install-user
 bin/memos
@@ -17,41 +17,53 @@ bin/money2qif
 bin/pi-csd
 bin/pi-getram
 bin/pi-getrom
+bin/pi-getromtoken
 bin/pi-nredir
-bin/pi-port
 bin/pilot-addresses
+bin/pilot-archive
 bin/pilot-clip
+bin/pilot-datebook
 bin/pilot-debug
 bin/pilot-dedupe
 bin/pilot-file
-bin/pilot-mail
 bin/pilot-prc
 bin/pilot-schlep
-bin/pilot-undelete
 bin/pilot-xfer
 bin/read-expenses
 bin/read-ical
+bin/read-notepad
+bin/read-palmpix
 bin/read-todos
 bin/reminders
-bin/sync-plan
-lib/pix/b1.gif
-lib/pix/b2.gif
-lib/pix/b3.gif
-lib/pix/b4.gif
-lib/pix/b5.gif
-lib/pix/b6.gif
-lib/pix/b7.gif
-lib/pix/case.gif
-lib/pix/case.xbm
-lib/pix/casemask.xbm
+man/man1/addresses.1
 man/man1/dlpsh.1
+man/man1/hinotes.1
 man/man1/ietf2datebook.1
 man/man1/install-datebook.1
+man/man1/install-expenses.1
 man/man1/install-hinote.1
 man/man1/install-memo.1
+man/man1/install-netsync.1
 man/man1/install-user.1
+man/man1/pi-getram.1
+man/man1/pi-getrom.1
 man/man1/pilot-addresses.1
 man/man1/pilot-xfer.1
 man/man1/read-ical.1
+man/man1/read-notepad.1
+man/man1/read-palmpix.1
 man/man7/pilot-link.7
-@dirrm lib/pix
+share/pilot-link/getrom.prc
+share/pilot-link/getrom2.prc
+share/pilot-link/pix/b1.gif
+share/pilot-link/pix/b2.gif
+share/pilot-link/pix/b3.gif
+share/pilot-link/pix/b4.gif
+share/pilot-link/pix/b5.gif
+share/pilot-link/pix/b6.gif
+share/pilot-link/pix/b7.gif
+share/pilot-link/pix/case.gif
+share/pilot-link/pix/case.xbm
+share/pilot-link/pix/casemask.xbm
+@dirrm share/pilot-link/pix
+@dirrm share/pilot-link
diff --git a/comms/pilot-link/distinfo b/comms/pilot-link/distinfo
index 264e5d3d772..53e41b5b94e 100644
--- a/comms/pilot-link/distinfo
+++ b/comms/pilot-link/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.11 2002/10/27 17:56:24 bouyer Exp $
+$NetBSD: distinfo,v 1.12 2003/01/10 04:30:18 rh Exp $
 
-SHA1 (pilot-link.0.9.5.tar.bz2) = cb026637bebad22a273b38edfd8633853d13e065
-Size (pilot-link.0.9.5.tar.bz2) = 424794 bytes
-SHA1 (patch-aa) = b57d1167c2311b900f17ceb4a9531a6d77e2aec9
-SHA1 (patch-ab) = 098d934009c87949a4d6f3dbaed78c9803df1029
-SHA1 (patch-ac) = 5d37048f9524e8d96b387c4ee22b4f91d4d4b6d7
-SHA1 (patch-ad) = 4b2673db8f1ed28ab8e29a5d43dcecd44f0ec7d6
-SHA1 (patch-ae) = 1503e0f9120123faabef3cc87b69d2949d8668ee
-SHA1 (patch-af) = 51746be6b2ae9e278bc384e0f9be7b1315418655
+SHA1 (pilot-link-0.11.7.tar.bz2) = f1ae56d3aad5d793f58fac4d3a51ca0c0f517262
+Size (pilot-link-0.11.7.tar.bz2) = 669470 bytes
+SHA1 (patch-aa) = 87ea9401603bd55d62ac2fa17ad45ff16baeda4d
+SHA1 (patch-ab) = add1156600a681cc0ae30c5d9095b4f1bb6739c3
+SHA1 (patch-ac) = 1a5c5946a23850910849d3f58011b2e9086d7641
+SHA1 (patch-ad) = 91e0a72a0f2d313173024c9edacfa0b92fb33b3d
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;
-