Update to pilot-link-0.12.1.

With some inputs from steven@ and espie@

ok steven@

comms/pilot-link/Makefile

@@ -1,23 +1,21 @@
-# $OpenBSD: Makefile,v 1.46 2006/08/01 22:19:46 espie Exp $
+# $OpenBSD: Makefile,v 1.47 2006/10/20 11:48:06 ajacoutot Exp $
 # $NetBSD: Makefile,v 1.37 2004/10/03 00:13:16 tv Exp $
 
 COMMENT=	"tools to connect your PalmOS® compatible handheld"
 
-DISTNAME=	pilot-link-0.11.8
-PKGNAME=	${DISTNAME}p0
-SHARED_LIBS=		pisock++	1.0 \
-			pisock		8.5 \
-			pisync 		0.1
+DISTNAME=	pilot-link-0.12.1
+SHARED_LIBS=	pisock		9.0 \
+		pisync 		1.0
 
 CATEGORIES=	comms
-MASTER_SITES=	http://gentoo.oregonstate.edu/distfiles/ \
+MASTER_SITES=	http://downloads.pilot-link.org/ \
 		http://www.slackware.at/data/slackware-10.2/source/l/pilot-link/ \
 		http://ftp.belnet.be/mirror/rsync.gentoo.org/gentoo/distfiles/ \
-		http://downloads.pilot-link.org/
+		http://gentoo.oregonstate.edu/distfiles/
 
 HOMEPAGE=	http://www.pilot-link.org/
 
-MAINTAINER=	Antoine Jacoutot <ajacoutot@lphp.org>
+MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
 
 EXTRACT_SUFX=	.tar.bz2
 
@@ -27,10 +25,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		c m ncurses readline stdc++ z
+WANTLIB=		c m readline termcap z
 
 MODULES=		converters/libiconv
-LIB_DEPENDS=		png.>=4::graphics/png
+LIB_DEPENDS=		png.>=4::graphics/png \
+			popt::devel/popt
 
 USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
@@ -43,9 +42,30 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--with-libiconv=${LOCALBASE} \
 			--with-libpng=${LOCALBASE} \
 			--with-perl=/usr/bin/perl \
+			--with-readline \
+			--enable-conduits \
 			--without-efence \
 			--without-java \
 			--without-python \
 			--without-tcl
 
+pre-configure:
+	@if pkg_info -e 'pilot-link-0.11.*'; then \
+		echo 1>&2 "+-------------------"; \
+		echo 1>&2 "| Error: you must remove the existing pilot-link installation"; \
+		echo 1>&2 "| before compiling this version. To fully remove run"; \
+		echo 1>&2 "| these commands as user root"; \
+		echo 1>&2 "|"; \
+		echo 1>&2 "|      pkg_delete pilot-link"; \
+		echo 1>&2 "|"; \
+		echo 1>&2 "+-------------------"; \
+		exit 1; \
+	fi
+	perl -pi -e "s,\@\@CFLAGS\@\@,${CFLAGS},g" ${WRKSRC}/bindings/Perl/Makefile.PL.in
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pilot-link
+	${INSTALL_DATA} ${WRKSRC}/doc/README.debugging ${PREFIX}/share/doc/pilot-link
+	${INSTALL_DATA} ${WRKSRC}/doc/README.usb ${PREFIX}/share/doc/pilot-link
+
 .include <bsd.port.mk>

comms/pilot-link/distinfo

@@ -1,4 +1,4 @@
-MD5 (pilot-link-0.11.8.tar.bz2) = 586f84add601e8b86da3093ab784e997
-RMD160 (pilot-link-0.11.8.tar.bz2) = c51c069810edff6c2e38e4c81f2daa959c902ad4
-SHA1 (pilot-link-0.11.8.tar.bz2) = 645d4bc49dd4dc4793d13b6e04dd61f24c2bf717
-SIZE (pilot-link-0.11.8.tar.bz2) = 649034
+MD5 (pilot-link-0.12.1.tar.bz2) = 80579c6f68eb583f54294d5651c4632b
+RMD160 (pilot-link-0.12.1.tar.bz2) = a43e1069b490d0b28b5a17fdcab17b8636d8f56a
+SHA1 (pilot-link-0.12.1.tar.bz2) = b776aa4467f254b1f0c9fe76bd54afc9860c3e88
+SIZE (pilot-link-0.12.1.tar.bz2) = 931338

comms/pilot-link/patches/patch-bindings_Makefile_in

@@ -1,12 +0,0 @@
-$OpenBSD: patch-bindings_Makefile_in,v 1.1 2004/12/11 04:59:46 pvalchev Exp $
---- bindings/Makefile.in.orig	Tue Jul  1 13:09:05 2003
-+++ bindings/Makefile.in	Fri Dec 10 21:51:33 2004
-@@ -355,7 +355,7 @@ python-clean: Python/setup.py
- #
- 
- Perl/Makefile: Perl/Makefile.PL
--	cd Perl && $(PERL) Makefile.PL INSTALLDIRS=vendor
-+	cd Perl && $(PERL) Makefile.PL INSTALLDIRS=site
- 
- perl-build: Perl/Makefile
- 	cd Perl && $(MAKE) PREFIX=$(DESTDIR)$(prefix)

comms/pilot-link/patches/patch-bindings_Perl_Makefile_PL_in

@@ -0,0 +1,14 @@
+$OpenBSD: patch-bindings_Perl_Makefile_PL_in,v 1.1 2006/10/20 11:48:06 ajacoutot Exp $
+--- bindings/Perl/Makefile.PL.in.orig	Tue Mar 14 15:48:06 2006
++++ bindings/Perl/Makefile.PL.in	Thu Oct 19 12:24:40 2006
+@@ -41,8 +41,9 @@ WriteMakefile(
+     'INC'        => "-I$plincdir",
+     'DEFINE'     => '-DPERL_POLLUTE',
+     'PREFIX'     => "$prefix",
+-    'INSTALLDIRS'=> 'vendor',
++    'INSTALLDIRS'=> 'site',
+     'dynamic_lib'=> {'OTHERLDFLAGS' => $lib},
+     'depend'     => {'Pilot.c' => 'const-c.inc const-xs.inc'},
+     'clean'      => {'FILES'   => 'const-c.inc const-xs.inc'},
++    'OPTIMIZE'   => "@@CFLAGS@@",
+ );

comms/pilot-link/patches/patch-configure

@@ -1,29 +1,29 @@
-$OpenBSD: patch-configure,v 1.4 2004/12/11 04:59:46 pvalchev Exp $
---- configure.orig	Tue Jul  1 13:08:40 2003
-+++ configure	Fri Dec 10 21:51:33 2004
-@@ -3010,7 +3010,7 @@ fi
+$OpenBSD: patch-configure,v 1.5 2006/10/20 11:48:06 ajacoutot Exp $
+--- configure.orig	Mon Sep 18 10:34:12 2006
++++ configure	Mon Sep 18 10:33:58 2006
+@@ -4578,7 +4578,7 @@ fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  if test -z "$LD"; then
 +  if true; then
-   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
    for ac_dir in $PATH; do
-     test -z "$ac_dir" && ac_dir=.
-@@ -9259,14 +9259,14 @@ _ACEOF
- 		usb_type=linux
- 		msg_usb="yes, Linux"
- 	;;
--	*freebsd*)
-+	*bsd*)
+     IFS="$lt_save_ifs"
+@@ -23224,14 +23224,14 @@ _ACEOF
+ 			usb_type=linux
+ 			msg_usb="yes, Linux"
+ 		;;
+-		*freebsd*)
++		*bsd*)
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_USB 1
  _ACEOF
  
- 		usb_type=freebsd
--		msg_usb="yes, FreeBSD"
-+		msg_usb="yes, FreeBSD (OpenBSD)"
- 	;;
- esac
+ 			usb_type=freebsd
+-			msg_usb="yes, FreeBSD"
++			msg_usb="yes, FreeBSD (OpenBSD)"
+ 		;;
+ 	    *darwin*)
  

comms/pilot-link/patches/patch-libpisock_freebsdusb_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-libpisock_freebsdusb_c,v 1.1 2004/12/11 04:59:46 pvalchev Exp $
---- libpisock/freebsdusb.c.orig	Tue Aug  6 02:51:38 2002
-+++ libpisock/freebsdusb.c	Fri Dec 10 21:51:33 2004
-@@ -50,7 +50,7 @@
+$OpenBSD: patch-libpisock_freebsdusb_c,v 1.2 2006/10/20 11:48:06 ajacoutot Exp $
+--- libpisock/freebsdusb.c.orig	Sun Aug 27 19:36:28 2006
++++ libpisock/freebsdusb.c	Thu Oct 19 11:43:58 2006
+@@ -44,7 +44,7 @@
  # define O_NONBLOCK 0
  #endif
  

comms/pilot-link/patches/patch-libpisock_unixserial_c

@@ -1,10 +1,10 @@
-$OpenBSD: patch-libpisock_unixserial_c,v 1.1 2004/12/11 04:59:46 pvalchev Exp $
---- libpisock/unixserial.c.orig	Tue Jul 30 09:52:24 2002
-+++ libpisock/unixserial.c	Fri Dec 10 21:51:33 2004
-@@ -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;
+$OpenBSD: patch-libpisock_unixserial_c,v 1.2 2006/10/20 11:48:06 ajacoutot Exp $
+--- libpisock/unixserial.c.orig	Sun Aug 27 18:08:10 2006
++++ libpisock/unixserial.c	Mon Sep 18 10:49:10 2006
+@@ -159,13 +159,23 @@ s_open(pi_socket_t *ps, struct pi_sockad
+ 
+ 	struct pi_serial_data *data =
+ 		(struct pi_serial_data *)ps->device->data;
 +#define maxretries 100
 +	int	retries;
  	
@@ -13,7 +13,7 @@ $OpenBSD: patch-libpisock_unixserial_c,v 1.1 2004/12/11 04:59:46 pvalchev Exp $
  #else
  	struct sgttyb tcn;
  #endif
--	if ((fd = open(tty, O_RDWR | O_NONBLOCK)) == -1) {
+-	if ((fd = open(tty, O_RDWR | O_NONBLOCK)) < 0) {
 +
 +	for (retries = 0 ; retries <= maxretries ; retries++ ) {
 +		if ((fd = open(tty, O_RDWR | O_NONBLOCK)) != -1) {
@@ -23,6 +23,6 @@ $OpenBSD: patch-libpisock_unixserial_c,v 1.1 2004/12/11 04:59:46 pvalchev Exp $
 +	}
 +
 +	if (fd == -1) {
- 		return -1;	/* errno already set */
+ 		ps->last_error = PI_ERR_GENERIC_SYSTEM;
+ 		return PI_ERR_GENERIC_SYSTEM;	/* errno already set */
  	}
- 

comms/pilot-link/patches/patch-src_Makefile_in

@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2004/12/11 04:59:46 pvalchev Exp $
---- src/Makefile.in.orig	Tue Jul  1 13:09:01 2003
-+++ src/Makefile.in	Fri Dec 10 21:51:33 2004
-@@ -100,7 +100,7 @@ PISYNC_AGE = @PISYNC_AGE@
+$OpenBSD: patch-src_Makefile_in,v 1.2 2006/10/20 11:48:06 ajacoutot Exp $
+--- src/Makefile.in.orig	Mon Sep 18 10:42:17 2006
++++ src/Makefile.in	Mon Sep 18 10:42:30 2006
+@@ -480,7 +480,7 @@ PISYNC_AGE = @PISYNC_AGE@
  PISYNC_CURRENT = @PISYNC_CURRENT@
  PISYNC_REVISION = @PISYNC_REVISION@
  PNG_CFLAGS = @PNG_CFLAGS@
 -PNG_LIBS = @PNG_LIBS@
 +PNG_LIBS = @PNG_LIBS@ -lz -lm
- PYTHON = @PYTHON@
- RANLIB = @RANLIB@
- RL_CFLAGS = @RL_CFLAGS@
+ POPT_INCLUDES = @POPT_INCLUDES@
+ POPT_LIBS = @POPT_LIBS@
+ PTHREAD_CC = @PTHREAD_CC@

comms/pilot-link/patches/patch-src_read-todos_c

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_read-todos_c,v 1.1 2004/12/11 04:59:46 pvalchev Exp $
---- src/read-todos.c.orig	Tue Jul  1 12:28:30 2003
-+++ src/read-todos.c	Fri Dec 10 21:51:33 2004
-@@ -184,7 +184,7 @@ int main(int argc, char *argv[])
- 		printf("Priority: %d\n", t.priority);
- 		printf("Completed: %s\n", t.complete ? "Yes" : "No");
- 		if (t.indefinite)
--			printf("Due: No Date");
-+			printf("Due: No Date\n");
- 		else
- 			printf("Due: %s", asctime(&t.due));
- 		if (t.description)

comms/pilot-link/pkg/PFRAG.shared

@@ -1,5 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.5 2005/12/23 14:16:01 bernd Exp $
-@lib lib/libpisock++.so.${LIBpisock++_VERSION}
+@comment $OpenBSD: PFRAG.shared,v 1.6 2006/10/20 11:48:06 ajacoutot Exp $
 @lib lib/libpisock.so.${LIBpisock_VERSION}
 @lib lib/libpisync.so.${LIBpisync_VERSION}
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/PDA/Pilot/Pilot.so

comms/pilot-link/pkg/PLIST

@@ -1,9 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.11 2004/12/11 04:59:46 pvalchev Exp $
-bin/addresses
-bin/ccexample
-bin/debugsh
-bin/dlpsh
-bin/hinotes
+@comment $OpenBSD: PLIST,v 1.12 2006/10/20 11:48:06 ajacoutot Exp $
 bin/ietf2datebook
 bin/install-datebook
 bin/install-expenses
@@ -13,44 +8,47 @@ bin/install-netsync
 bin/install-todo
 bin/install-todos
 bin/install-user
-bin/memos
-bin/money2qif
-bin/pi-csd
-bin/pi-getram
-bin/pi-getrom
-bin/pi-getromtoken
-bin/pi-nredir
 bin/pilot-addresses
-bin/pilot-archive
 bin/pilot-clip
-bin/pilot-datebook
+bin/pilot-csd
+bin/pilot-debugsh
 bin/pilot-dedupe
+bin/pilot-dlpsh
 bin/pilot-file
 bin/pilot-foto
-bin/pilot-prc
+bin/pilot-getram
+bin/pilot-getrom
+bin/pilot-getromtoken
+bin/pilot-hinotes
+bin/pilot-memos
+bin/pilot-nredir
+bin/pilot-reminders
 bin/pilot-schlep
+bin/pilot-treofoto
 bin/pilot-undelete
+bin/pilot-wav
 bin/pilot-xfer
 bin/read-expenses
 bin/read-ical
 bin/read-notepad
 bin/read-palmpix
+bin/read-screenshot
 bin/read-todos
-bin/reminders
+bin/read-veo
 bin/sync-plan
 include/pi-address.h
-include/pi-address.hxx
 include/pi-appinfo.h
-include/pi-appinfo.hxx
 include/pi-args.h
+include/pi-buffer.h
 include/pi-cmp.h
+include/pi-contact.h
 include/pi-datebook.h
-include/pi-datebook.hxx
 include/pi-debug.h
 include/pi-dlp.h
-include/pi-dlp.hxx
+include/pi-error.h
 include/pi-expense.h
 include/pi-file.h
+include/pi-foto.h
 include/pi-header.h
 include/pi-hinote.h
 include/pi-inet.h
@@ -58,7 +56,6 @@ 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
@@ -72,17 +69,22 @@ include/pi-source.h
 include/pi-sync.h
 include/pi-sys.h
 include/pi-syspkt.h
+include/pi-threadsafe.h
 include/pi-todo.h
-include/pi-todo.hxx
 include/pi-usb.h
 include/pi-util.h
+include/pi-veo.h
+include/pi-versamail.h
 include/pi-version.h
-lib/libpisock++.a
-lib/libpisock++.la
 lib/libpisock.a
 lib/libpisock.la
 lib/libpisync.a
 lib/libpisync.la
+lib/pkgconfig/
+lib/pkgconfig/pilot-link.pc
+@comment libdata/perl5/${MACHINE_ARCH}-openbsd/
+@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/
+@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/perllocal.pod
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/PDA/
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/PDA/Pilot.pm
@@ -92,9 +94,6 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/PDA/
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/PDA/Pilot/
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/PDA/Pilot/Pilot.bs
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/PDA/Pilot/autosplit.ix
-@man man/man1/addresses.1
-@man man/man1/dlpsh.1
-@man man/man1/hinotes.1
 @man man/man1/ietf2datebook.1
 @man man/man1/install-datebook.1
 @man man/man1/install-expenses.1
@@ -102,24 +101,41 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/PDA/Pilot/autosplit.ix
 @man man/man1/install-memo.1
 @man man/man1/install-netsync.1
 @man man/man1/install-todo.1
+@man man/man1/install-todos.1
 @man man/man1/install-user.1
-@man man/man1/memos.1
-@man man/man1/pi-getram.1
-@man man/man1/pi-getrom.1
 @man man/man1/pilot-addresses.1
+@man man/man1/pilot-clip.1
+@man man/man1/pilot-csd.1
+@man man/man1/pilot-debugsh.1
+@man man/man1/pilot-dedupe.1
+@man man/man1/pilot-dlpsh.1
+@man man/man1/pilot-file.1
 @man man/man1/pilot-foto.1
+@man man/man1/pilot-getram.1
+@man man/man1/pilot-getrom.1
+@man man/man1/pilot-getromtoken.1
+@man man/man1/pilot-hinotes.1
+@man man/man1/pilot-memos.1
+@man man/man1/pilot-nredir.1
+@man man/man1/pilot-reminders.1
+@man man/man1/pilot-schlep.1
+@man man/man1/pilot-treofoto.1
+@man man/man1/pilot-wav.1
 @man man/man1/pilot-xfer.1
 @man man/man1/read-expenses.1
 @man man/man1/read-ical.1
 @man man/man1/read-notepad.1
 @man man/man1/read-palmpix.1
+@man man/man1/read-screenshot.1
 @man man/man1/read-todos.1
+@man man/man1/read-veo.1
 @man man/man7/pilot-link.7
 share/aclocal/
 share/aclocal/pilot-link.m4
+share/doc/pilot-link/
+share/doc/pilot-link/README.debugging
+share/doc/pilot-link/README.usb
 share/pilot-link/
-share/pilot-link/getrom.prc
-share/pilot-link/getrom2.prc
 share/pilot-link/pix/
 share/pilot-link/pix/b1.gif
 share/pilot-link/pix/b2.gif
@@ -131,4 +147,9 @@ share/pilot-link/pix/b7.gif
 share/pilot-link/pix/case.gif
 share/pilot-link/pix/case.xbm
 share/pilot-link/pix/casemask.xbm
+share/pilot-link/prc/
+share/pilot-link/prc/getrom.prc
+share/pilot-link/prc/getrom2.prc
 %%SHARED%%
+@comment share/pilot-link/udev/
+@comment share/pilot-link/udev/60-libpisock.rules