Update to latest stable release.
Updates for dependent ports are coming (namely malsync and jpilot).
Kdepim3 compiles and installs fine using this new version, no changes are
needed.
I've been using this for weeks (months?) without any issue so far.
Let me know!
--
Antoine
diff -ruN --exclude CVS /usr/ports/comms/pilot-link/Makefile pilot-link/Makefile
--- /usr/ports/comms/pilot-link/Makefile Wed Aug 2 00:19:46 2006
+++ pilot-link/Makefile Thu Oct 19 12:41:54 2006
@@ -3,21 +3,19 @@
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.1 \
+ pisync 0.2
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 <[EMAIL PROTECTED]>
+MAINTAINER= Antoine Jacoutot <[EMAIL PROTECTED]>
EXTRACT_SUFX= .tar.bz2
@@ -27,10 +25,11 @@
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 @@
--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 `pkg_info -e 'pilot-link-*'`"; \
+ echo 1>&2 "|"; \
+ echo 1>&2 "+-------------------"; \
+ exit 1; \
+ fi
+ perl -pi -e "s,[EMAIL PROTECTED]@[EMAIL PROTECTED]@,${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>
diff -ruN --exclude CVS /usr/ports/comms/pilot-link/distinfo pilot-link/distinfo
--- /usr/ports/comms/pilot-link/distinfo Wed Jan 5 16:58:29 2005
+++ pilot-link/distinfo Sat Sep 30 19:11:42 2006
@@ -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
diff -ruN --exclude CVS
/usr/ports/comms/pilot-link/patches/patch-bindings_Makefile_in
pilot-link/patches/patch-bindings_Makefile_in
--- /usr/ports/comms/pilot-link/patches/patch-bindings_Makefile_in Sat Dec
11 05:59:46 2004
+++ pilot-link/patches/patch-bindings_Makefile_in Thu Jan 1 01:00:00 1970
@@ -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)
diff -ruN --exclude CVS
/usr/ports/comms/pilot-link/patches/patch-bindings_Perl_Makefile_PL_in
pilot-link/patches/patch-bindings_Perl_Makefile_PL_in
--- /usr/ports/comms/pilot-link/patches/patch-bindings_Perl_Makefile_PL_in
Thu Jan 1 01:00:00 1970
+++ pilot-link/patches/patch-bindings_Perl_Makefile_PL_in Thu Oct 19
12:24:43 2006
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- 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@@",
+ );
diff -ruN --exclude CVS /usr/ports/comms/pilot-link/patches/patch-configure
pilot-link/patches/patch-configure
--- /usr/ports/comms/pilot-link/patches/patch-configure Sat Dec 11 05:59:46 2004
+++ pilot-link/patches/patch-configure Sat Sep 30 19:11:42 2006
@@ -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$
+--- 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*)
diff -ruN --exclude CVS
/usr/ports/comms/pilot-link/patches/patch-libpisock_freebsdusb_c
pilot-link/patches/patch-libpisock_freebsdusb_c
--- /usr/ports/comms/pilot-link/patches/patch-libpisock_freebsdusb_c Sat Dec
11 05:59:46 2004
+++ pilot-link/patches/patch-libpisock_freebsdusb_c Thu Oct 19 11:44:48 2006
@@ -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 @@
+--- 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
diff -ruN --exclude CVS
/usr/ports/comms/pilot-link/patches/patch-libpisock_unixserial_c
pilot-link/patches/patch-libpisock_unixserial_c
--- /usr/ports/comms/pilot-link/patches/patch-libpisock_unixserial_c Sat Dec
11 05:59:46 2004
+++ pilot-link/patches/patch-libpisock_unixserial_c Sat Sep 30 19:11:42 2006
@@ -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$
+--- 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 @@
#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 @@
+ }
+
+ if (fd == -1) {
- return -1; /* errno already set */
+ ps->last_error = PI_ERR_GENERIC_SYSTEM;
+ return PI_ERR_GENERIC_SYSTEM; /* errno already set */
}
-
diff -ruN --exclude CVS
/usr/ports/comms/pilot-link/patches/patch-src_Makefile_in
pilot-link/patches/patch-src_Makefile_in
--- /usr/ports/comms/pilot-link/patches/patch-src_Makefile_in Sat Dec 11
05:59:46 2004
+++ pilot-link/patches/patch-src_Makefile_in Sat Sep 30 19:11:42 2006
@@ -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$
+--- 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@
diff -ruN --exclude CVS
/usr/ports/comms/pilot-link/patches/patch-src_read-todos_c
pilot-link/patches/patch-src_read-todos_c
--- /usr/ports/comms/pilot-link/patches/patch-src_read-todos_c Sat Dec 11
05:59:46 2004
+++ pilot-link/patches/patch-src_read-todos_c Thu Jan 1 01:00:00 1970
@@ -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)
diff -ruN --exclude CVS /usr/ports/comms/pilot-link/pkg/PFRAG.shared
pilot-link/pkg/PFRAG.shared
--- /usr/ports/comms/pilot-link/pkg/PFRAG.shared Fri Dec 23 15:16:01 2005
+++ pilot-link/pkg/PFRAG.shared Sat Sep 30 19:11:42 2006
@@ -1,5 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2005/12/23 14:16:01 bernd Exp $
[EMAIL PROTECTED] lib/libpisock++.so.${LIBpisock++_VERSION}
@lib lib/libpisock.so.${LIBpisock_VERSION}
@lib lib/libpisync.so.${LIBpisync_VERSION}
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/PDA/Pilot/Pilot.so
diff -ruN --exclude CVS /usr/ports/comms/pilot-link/pkg/PLIST
pilot-link/pkg/PLIST
--- /usr/ports/comms/pilot-link/pkg/PLIST Sat Dec 11 05:59:46 2004
+++ pilot-link/pkg/PLIST Sun Oct 1 10:52:41 2006
@@ -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
bin/ietf2datebook
bin/install-datebook
bin/install-expenses
@@ -13,44 +8,47 @@
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-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-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
[EMAIL PROTECTED] libdata/perl5/${MACHINE_ARCH}-openbsd/
[EMAIL PROTECTED] libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/
[EMAIL PROTECTED] 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/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
[EMAIL PROTECTED] man/man1/addresses.1
[EMAIL PROTECTED] man/man1/dlpsh.1
[EMAIL PROTECTED] 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 @@
@man man/man1/install-memo.1
@man man/man1/install-netsync.1
@man man/man1/install-todo.1
[EMAIL PROTECTED] man/man1/install-todos.1
@man man/man1/install-user.1
[EMAIL PROTECTED] man/man1/memos.1
[EMAIL PROTECTED] man/man1/pi-getram.1
[EMAIL PROTECTED] man/man1/pi-getrom.1
@man man/man1/pilot-addresses.1
[EMAIL PROTECTED] man/man1/pilot-clip.1
[EMAIL PROTECTED] man/man1/pilot-csd.1
[EMAIL PROTECTED] man/man1/pilot-debugsh.1
[EMAIL PROTECTED] man/man1/pilot-dedupe.1
[EMAIL PROTECTED] man/man1/pilot-dlpsh.1
[EMAIL PROTECTED] man/man1/pilot-file.1
@man man/man1/pilot-foto.1
[EMAIL PROTECTED] man/man1/pilot-getram.1
[EMAIL PROTECTED] man/man1/pilot-getrom.1
[EMAIL PROTECTED] man/man1/pilot-getromtoken.1
[EMAIL PROTECTED] man/man1/pilot-hinotes.1
[EMAIL PROTECTED] man/man1/pilot-memos.1
[EMAIL PROTECTED] man/man1/pilot-nredir.1
[EMAIL PROTECTED] man/man1/pilot-reminders.1
[EMAIL PROTECTED] man/man1/pilot-schlep.1
[EMAIL PROTECTED] man/man1/pilot-treofoto.1
[EMAIL PROTECTED] 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
[EMAIL PROTECTED] man/man1/read-screenshot.1
@man man/man1/read-todos.1
[EMAIL PROTECTED] 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/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%%
[EMAIL PROTECTED] share/pilot-link/udev/
[EMAIL PROTECTED] share/pilot-link/udev/60-libpisock.rules
