6 files changed, 204 insertions, 198 deletions

diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile
index 96459c070bb1..6305881158ea 100644
--- a/palm/pilot-link-devel/Makefile
+++ b/palm/pilot-link-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pilot-link
 PORTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	palm comms tk83
 MASTER_SITES=	http://www.gnu-designs.com/pilot-link/source/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
@@ -20,12 +21,10 @@ USE_BZIP2=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 USE_PERL5=	yes
-PREFIX=		${LOCALBASE}/pilot
-CONFIGURE_ARGS=	--with-perl5=${PERL5} --with-libiconv=${LOCALBASE}
 
 MAN1=		dlpsh.1 ietf2datebook.1 install-datebook.1 \
 		install-hinote.1 install-memo.1 install-user.1 \
-		pilot-xfer.1 read-ical.1
+		pilot-addresses.1 pilot-xfer.1 read-ical.1
 MAN7=		pilot-link.7
 
 CFLAGS+=	-I${LOCALBASE}/include
@@ -43,7 +42,13 @@ post-patch:
 	${RM} -f ${WRKSRC}/getopt*
 
 post-install:
-	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pilot-link.sh > ${LOCALBASE}/etc/rc.d/pilot-link.sh
-	@${CHMOD} 750 ${LOCALBASE}/etc/rc.d/pilot-link.sh
+	@${SED} "s|%%PREFIX%%|${PREFIX}/pilot|g" < ${FILESDIR}/pilot-link.sh \
+		> ${PREFIX}/etc/rc.d/pilot-link.sh
+	@${CHMOD} 750 ${PREFIX}/etc/rc.d/pilot-link.sh
 
 .include <bsd.port.mk>
+
+# Leave this here -- we need to override the default CONFIGURE_ARGS.
+CONFIGURE_ARGS=	--with-perl5=${PERL5} --with-libiconv=${LOCALBASE} \
+		--prefix=${PREFIX}/pilot ${CONFIGURE_TARGET} \
+		--mandir=${PREFIX}/man
diff --git a/palm/pilot-link-devel/files/patch-ab b/palm/pilot-link-devel/files/patch-ab
index 5d3eee04be8f..a6cb9e0069aa 100644
--- a/palm/pilot-link-devel/files/patch-ab
+++ b/palm/pilot-link-devel/files/patch-ab
@@ -1,12 +1,5 @@
 --- configure.orig	Sat Aug 21 10:57:14 1999
 +++ configure	Sat Aug 21 11:05:26 1999
-@@ -10,5 +10,5 @@
- # Defaults:
- ac_help=
--ac_default_prefix=/usr/local
-+ac_default_prefix=/usr/local/pilot
- # Any additions from configure.in:
- ac_help="$ac_help
 @@ -876,9 +876,9 @@
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
diff --git a/palm/pilot-link-devel/pkg-plist b/palm/pilot-link-devel/pkg-plist
index be02e8f57d17..abe5bd449fa1 100644
--- a/palm/pilot-link-devel/pkg-plist
+++ b/palm/pilot-link-devel/pkg-plist
@@ -1,88 +1,93 @@
-@cwd /usr/local
 etc/rc.d/pilot-link.sh
-@cwd /usr/local/pilot
-bin/addresses
-bin/ccexample
-bin/debugsh
-bin/dlpsh
-bin/getrom
-bin/hinotes
-bin/iambicexample
-bin/ietf2datebook
-bin/install-datebook
-bin/install-hinote
-bin/install-memo
-bin/install-todos
-bin/install-user
-bin/memos
-bin/money2qif
-bin/pi-csd
-bin/pi-getram
-bin/pi-getrom
-bin/pi-nredir
-bin/pi-port
-bin/pilot-addresses
-bin/pilot-clip
-bin/pilot-debug
-bin/pilot-dedupe
-bin/pilot-file
-bin/pilot-mail
-bin/pilot-schlep
-bin/pilot-undelete
-bin/pilot-xfer
-bin/read-expenses
-bin/read-ical
-bin/read-todos
-bin/reminders
-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-cmp.h
-include/pi-config-win32.h
-include/pi-config.h
-include/pi-datebook.h
-include/pi-datebook.hxx
-include/pi-dlp.h
-include/pi-dlp.hxx
-include/pi-expense.h
-include/pi-file.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-memo.h
-include/pi-memo.hxx
-include/pi-money.h
-include/pi-padp.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-syspkt.h
-include/pi-todo.h
-include/pi-todo.hxx
-include/pi-version.h
-lib/libpicc.a
-lib/libpisock.a
-lib/libpisock.so
-lib/libpisock.so.4.0
-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
-@dirrm lib/pix
+pilot/bin/addresses
+pilot/bin/ccexample
+pilot/bin/debugsh
+pilot/bin/dlpsh
+pilot/bin/getrom
+pilot/bin/hinotes
+pilot/bin/iambicexample
+pilot/bin/ietf2datebook
+pilot/bin/install-datebook
+pilot/bin/install-hinote
+pilot/bin/install-memo
+pilot/bin/install-todos
+pilot/bin/install-user
+pilot/bin/memos
+pilot/bin/money2qif
+pilot/bin/pi-csd
+pilot/bin/pi-getram
+pilot/bin/pi-getrom
+pilot/bin/pi-nredir
+pilot/bin/pi-port
+pilot/bin/pilot-addresses
+pilot/bin/pilot-clip
+pilot/bin/pilot-debug
+pilot/bin/pilot-dedupe
+pilot/bin/pilot-file
+pilot/bin/pilot-mail
+pilot/bin/pilot-prc
+pilot/bin/pilot-schlep
+pilot/bin/pilot-undelete
+pilot/bin/pilot-xfer
+pilot/bin/read-expenses
+pilot/bin/read-ical
+pilot/bin/read-todos
+pilot/bin/reminders
+pilot/bin/sync-plan
+pilot/include/pi-address.h
+pilot/include/pi-address.hxx
+pilot/include/pi-appinfo.h
+pilot/include/pi-appinfo.hxx
+pilot/include/pi-args.h
+pilot/include/pi-cmp.h
+pilot/include/pi-config-win32.h
+pilot/include/pi-config.h
+pilot/include/pi-datebook.h
+pilot/include/pi-datebook.hxx
+pilot/include/pi-dlp.h
+pilot/include/pi-dlp.hxx
+pilot/include/pi-expense.h
+pilot/include/pi-file.h
+pilot/include/pi-header.h
+pilot/include/pi-hinote.h
+pilot/include/pi-iambicExpense.h
+pilot/include/pi-iambicExpense.hxx
+pilot/include/pi-inet.h
+pilot/include/pi-inetserial.h
+pilot/include/pi-macros.h
+pilot/include/pi-mail.h
+pilot/include/pi-memo.h
+pilot/include/pi-memo.hxx
+pilot/include/pi-money.h
+pilot/include/pi-padp.h
+pilot/include/pi-serial.h
+pilot/include/pi-slp.h
+pilot/include/pi-sockaddr-win32.h
+pilot/include/pi-sockaddr.h
+pilot/include/pi-socket.h
+pilot/include/pi-source.h
+pilot/include/pi-sync.h
+pilot/include/pi-syspkt.h
+pilot/include/pi-todo.h
+pilot/include/pi-todo.hxx
+pilot/include/pi-util.h
+pilot/include/pi-version.h
+pilot/lib/libpicc.a
+pilot/lib/libpisock.a
+pilot/lib/libpisock.so
+pilot/lib/libpisock.so.4.0
+pilot/lib/pix/b1.gif
+pilot/lib/pix/b2.gif
+pilot/lib/pix/b3.gif
+pilot/lib/pix/b4.gif
+pilot/lib/pix/b5.gif
+pilot/lib/pix/b6.gif
+pilot/lib/pix/b7.gif
+pilot/lib/pix/case.gif
+pilot/lib/pix/case.xbm
+pilot/lib/pix/casemask.xbm
+@dirrm pilot/lib/pix
+@dirrm pilot/lib
+@dirrm pilot/include
+@dirrm pilot/bin
+@dirrm pilot
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index 96459c070bb1..6305881158ea 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pilot-link
 PORTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	palm comms tk83
 MASTER_SITES=	http://www.gnu-designs.com/pilot-link/source/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
@@ -20,12 +21,10 @@ USE_BZIP2=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 USE_PERL5=	yes
-PREFIX=		${LOCALBASE}/pilot
-CONFIGURE_ARGS=	--with-perl5=${PERL5} --with-libiconv=${LOCALBASE}
 
 MAN1=		dlpsh.1 ietf2datebook.1 install-datebook.1 \
 		install-hinote.1 install-memo.1 install-user.1 \
-		pilot-xfer.1 read-ical.1
+		pilot-addresses.1 pilot-xfer.1 read-ical.1
 MAN7=		pilot-link.7
 
 CFLAGS+=	-I${LOCALBASE}/include
@@ -43,7 +42,13 @@ post-patch:
 	${RM} -f ${WRKSRC}/getopt*
 
 post-install:
-	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pilot-link.sh > ${LOCALBASE}/etc/rc.d/pilot-link.sh
-	@${CHMOD} 750 ${LOCALBASE}/etc/rc.d/pilot-link.sh
+	@${SED} "s|%%PREFIX%%|${PREFIX}/pilot|g" < ${FILESDIR}/pilot-link.sh \
+		> ${PREFIX}/etc/rc.d/pilot-link.sh
+	@${CHMOD} 750 ${PREFIX}/etc/rc.d/pilot-link.sh
 
 .include <bsd.port.mk>
+
+# Leave this here -- we need to override the default CONFIGURE_ARGS.
+CONFIGURE_ARGS=	--with-perl5=${PERL5} --with-libiconv=${LOCALBASE} \
+		--prefix=${PREFIX}/pilot ${CONFIGURE_TARGET} \
+		--mandir=${PREFIX}/man
diff --git a/palm/pilot-link/files/patch-ab b/palm/pilot-link/files/patch-ab
index 5d3eee04be8f..a6cb9e0069aa 100644
--- a/palm/pilot-link/files/patch-ab
+++ b/palm/pilot-link/files/patch-ab
@@ -1,12 +1,5 @@
 --- configure.orig	Sat Aug 21 10:57:14 1999
 +++ configure	Sat Aug 21 11:05:26 1999
-@@ -10,5 +10,5 @@
- # Defaults:
- ac_help=
--ac_default_prefix=/usr/local
-+ac_default_prefix=/usr/local/pilot
- # Any additions from configure.in:
- ac_help="$ac_help
 @@ -876,9 +876,9 @@
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
diff --git a/palm/pilot-link/pkg-plist b/palm/pilot-link/pkg-plist
index be02e8f57d17..abe5bd449fa1 100644
--- a/palm/pilot-link/pkg-plist
+++ b/palm/pilot-link/pkg-plist
@@ -1,88 +1,93 @@
-@cwd /usr/local
 etc/rc.d/pilot-link.sh
-@cwd /usr/local/pilot
-bin/addresses
-bin/ccexample
-bin/debugsh
-bin/dlpsh
-bin/getrom
-bin/hinotes
-bin/iambicexample
-bin/ietf2datebook
-bin/install-datebook
-bin/install-hinote
-bin/install-memo
-bin/install-todos
-bin/install-user
-bin/memos
-bin/money2qif
-bin/pi-csd
-bin/pi-getram
-bin/pi-getrom
-bin/pi-nredir
-bin/pi-port
-bin/pilot-addresses
-bin/pilot-clip
-bin/pilot-debug
-bin/pilot-dedupe
-bin/pilot-file
-bin/pilot-mail
-bin/pilot-schlep
-bin/pilot-undelete
-bin/pilot-xfer
-bin/read-expenses
-bin/read-ical
-bin/read-todos
-bin/reminders
-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-cmp.h
-include/pi-config-win32.h
-include/pi-config.h
-include/pi-datebook.h
-include/pi-datebook.hxx
-include/pi-dlp.h
-include/pi-dlp.hxx
-include/pi-expense.h
-include/pi-file.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-memo.h
-include/pi-memo.hxx
-include/pi-money.h
-include/pi-padp.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-syspkt.h
-include/pi-todo.h
-include/pi-todo.hxx
-include/pi-version.h
-lib/libpicc.a
-lib/libpisock.a
-lib/libpisock.so
-lib/libpisock.so.4.0
-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
-@dirrm lib/pix
+pilot/bin/addresses
+pilot/bin/ccexample
+pilot/bin/debugsh
+pilot/bin/dlpsh
+pilot/bin/getrom
+pilot/bin/hinotes
+pilot/bin/iambicexample
+pilot/bin/ietf2datebook
+pilot/bin/install-datebook
+pilot/bin/install-hinote
+pilot/bin/install-memo
+pilot/bin/install-todos
+pilot/bin/install-user
+pilot/bin/memos
+pilot/bin/money2qif
+pilot/bin/pi-csd
+pilot/bin/pi-getram
+pilot/bin/pi-getrom
+pilot/bin/pi-nredir
+pilot/bin/pi-port
+pilot/bin/pilot-addresses
+pilot/bin/pilot-clip
+pilot/bin/pilot-debug
+pilot/bin/pilot-dedupe
+pilot/bin/pilot-file
+pilot/bin/pilot-mail
+pilot/bin/pilot-prc
+pilot/bin/pilot-schlep
+pilot/bin/pilot-undelete
+pilot/bin/pilot-xfer
+pilot/bin/read-expenses
+pilot/bin/read-ical
+pilot/bin/read-todos
+pilot/bin/reminders
+pilot/bin/sync-plan
+pilot/include/pi-address.h
+pilot/include/pi-address.hxx
+pilot/include/pi-appinfo.h
+pilot/include/pi-appinfo.hxx
+pilot/include/pi-args.h
+pilot/include/pi-cmp.h
+pilot/include/pi-config-win32.h
+pilot/include/pi-config.h
+pilot/include/pi-datebook.h
+pilot/include/pi-datebook.hxx
+pilot/include/pi-dlp.h
+pilot/include/pi-dlp.hxx
+pilot/include/pi-expense.h
+pilot/include/pi-file.h
+pilot/include/pi-header.h
+pilot/include/pi-hinote.h
+pilot/include/pi-iambicExpense.h
+pilot/include/pi-iambicExpense.hxx
+pilot/include/pi-inet.h
+pilot/include/pi-inetserial.h
+pilot/include/pi-macros.h
+pilot/include/pi-mail.h
+pilot/include/pi-memo.h
+pilot/include/pi-memo.hxx
+pilot/include/pi-money.h
+pilot/include/pi-padp.h
+pilot/include/pi-serial.h
+pilot/include/pi-slp.h
+pilot/include/pi-sockaddr-win32.h
+pilot/include/pi-sockaddr.h
+pilot/include/pi-socket.h
+pilot/include/pi-source.h
+pilot/include/pi-sync.h
+pilot/include/pi-syspkt.h
+pilot/include/pi-todo.h
+pilot/include/pi-todo.hxx
+pilot/include/pi-util.h
+pilot/include/pi-version.h
+pilot/lib/libpicc.a
+pilot/lib/libpisock.a
+pilot/lib/libpisock.so
+pilot/lib/libpisock.so.4.0
+pilot/lib/pix/b1.gif
+pilot/lib/pix/b2.gif
+pilot/lib/pix/b3.gif
+pilot/lib/pix/b4.gif
+pilot/lib/pix/b5.gif
+pilot/lib/pix/b6.gif
+pilot/lib/pix/b7.gif
+pilot/lib/pix/case.gif
+pilot/lib/pix/case.xbm
+pilot/lib/pix/casemask.xbm
+@dirrm pilot/lib/pix
+@dirrm pilot/lib
+@dirrm pilot/include
+@dirrm pilot/bin
+@dirrm pilot