6 files changed, 64 insertions, 32 deletions

diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile
index c92a7747a086..7bf1e8685c89 100644
--- a/palm/pilot-link-devel/Makefile
+++ b/palm/pilot-link-devel/Makefile
@@ -21,15 +21,12 @@ USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 USE_PERL5=	yes
 
-MAN1=		dlpsh.1 ietf2datebook.1 install-datebook.1 \
-		install-hinote.1 install-memo.1 install-user.1 \
-		pilot-addresses.1 pilot-xfer.1 read-ical.1
-MAN7=		pilot-link.7
-
-CFLAGS+=		-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3
+CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-perl5=${PERL5} --with-libiconv=${LOCALBASE}
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
 MAKE_ARGS+=	LIBTOOL=libtool
 
+.include "${.CURDIR}/manpages.mk"
+
 .include <bsd.port.mk>
diff --git a/palm/pilot-link-devel/manpages.mk b/palm/pilot-link-devel/manpages.mk
new file mode 100644
index 000000000000..f9829ea0277d
--- /dev/null
+++ b/palm/pilot-link-devel/manpages.mk
@@ -0,0 +1,18 @@
+MAN1+=		addresses.1
+MAN1+=		dlpsh.1
+MAN1+=		hinotes.1
+MAN1+=		ietf2datebook.1
+MAN1+=		install-datebook.1
+MAN1+=		install-expenses.1
+MAN1+=		install-hinote.1
+MAN1+=		install-memo.1
+MAN1+=		install-netsync.1
+MAN1+=		install-user.1
+MAN1+=		pi-getram.1
+MAN1+=		pi-getrom.1
+MAN1+=		pilot-addresses.1
+MAN1+=		pilot-xfer.1
+MAN1+=		read-ical.1
+MAN1+=		read-notepad.1
+MAN1+=		read-palmpix.1
+MAN7+=		pilot-link.7
diff --git a/palm/pilot-link-devel/pkg-plist b/palm/pilot-link-devel/pkg-plist
index 433c97cf7692..2e5e54852d38 100644
--- a/palm/pilot-link-devel/pkg-plist
+++ b/palm/pilot-link-devel/pkg-plist
@@ -8,6 +8,7 @@ bin/install-expenses
 bin/install-hinote
 bin/install-memo
 bin/install-netsync
+bin/install-todo
 bin/install-todos
 bin/install-user
 bin/memos
@@ -18,11 +19,11 @@ bin/pi-getrom
 bin/pi-getromtoken
 bin/pi-nredir
 bin/pilot-addresses
+bin/pilot-archive
 bin/pilot-clip
 bin/pilot-datebook
 bin/pilot-dedupe
 bin/pilot-file
-bin/pilot-mail
 bin/pilot-prc
 bin/pilot-schlep
 bin/pilot-xfer
@@ -71,18 +72,18 @@ include/pi-todo.hxx
 include/pi-usb.h
 include/pi-util.h
 include/pi-version.h
+lib/libpisock++.a
+lib/libpisock++.la
+lib/libpisock++.so
+lib/libpisock++.so.0
 lib/libpisock.a
 lib/libpisock.la
 lib/libpisock.so
 lib/libpisock.so.8
-lib/libpisync.so.0
-lib/libpisync.so
-lib/libpisync.la
 lib/libpisync.a
-lib/libpisock++.so.0
-lib/libpisock++.so
-lib/libpisock++.la
-lib/libpisock++.a
+lib/libpisync.la
+lib/libpisync.so
+lib/libpisync.so.0
 share/aclocal/pilot-link.m4
 share/pilot-link/getrom.prc
 share/pilot-link/getrom2.prc
@@ -94,8 +95,8 @@ 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/casemask.xbm
 share/pilot-link/pix/case.xbm
-@dirrm share/aclocal
+share/pilot-link/pix/casemask.xbm
 @dirrm share/pilot-link/pix
 @dirrm share/pilot-link
+@dirrm share/aclocal
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index c92a7747a086..7bf1e8685c89 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -21,15 +21,12 @@ USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 USE_PERL5=	yes
 
-MAN1=		dlpsh.1 ietf2datebook.1 install-datebook.1 \
-		install-hinote.1 install-memo.1 install-user.1 \
-		pilot-addresses.1 pilot-xfer.1 read-ical.1
-MAN7=		pilot-link.7
-
-CFLAGS+=		-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3
+CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-perl5=${PERL5} --with-libiconv=${LOCALBASE}
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
 MAKE_ARGS+=	LIBTOOL=libtool
 
+.include "${.CURDIR}/manpages.mk"
+
 .include <bsd.port.mk>
diff --git a/palm/pilot-link/manpages.mk b/palm/pilot-link/manpages.mk
new file mode 100644
index 000000000000..f9829ea0277d
--- /dev/null
+++ b/palm/pilot-link/manpages.mk
@@ -0,0 +1,18 @@
+MAN1+=		addresses.1
+MAN1+=		dlpsh.1
+MAN1+=		hinotes.1
+MAN1+=		ietf2datebook.1
+MAN1+=		install-datebook.1
+MAN1+=		install-expenses.1
+MAN1+=		install-hinote.1
+MAN1+=		install-memo.1
+MAN1+=		install-netsync.1
+MAN1+=		install-user.1
+MAN1+=		pi-getram.1
+MAN1+=		pi-getrom.1
+MAN1+=		pilot-addresses.1
+MAN1+=		pilot-xfer.1
+MAN1+=		read-ical.1
+MAN1+=		read-notepad.1
+MAN1+=		read-palmpix.1
+MAN7+=		pilot-link.7
diff --git a/palm/pilot-link/pkg-plist b/palm/pilot-link/pkg-plist
index 433c97cf7692..2e5e54852d38 100644
--- a/palm/pilot-link/pkg-plist
+++ b/palm/pilot-link/pkg-plist
@@ -8,6 +8,7 @@ bin/install-expenses
 bin/install-hinote
 bin/install-memo
 bin/install-netsync
+bin/install-todo
 bin/install-todos
 bin/install-user
 bin/memos
@@ -18,11 +19,11 @@ bin/pi-getrom
 bin/pi-getromtoken
 bin/pi-nredir
 bin/pilot-addresses
+bin/pilot-archive
 bin/pilot-clip
 bin/pilot-datebook
 bin/pilot-dedupe
 bin/pilot-file
-bin/pilot-mail
 bin/pilot-prc
 bin/pilot-schlep
 bin/pilot-xfer
@@ -71,18 +72,18 @@ include/pi-todo.hxx
 include/pi-usb.h
 include/pi-util.h
 include/pi-version.h
+lib/libpisock++.a
+lib/libpisock++.la
+lib/libpisock++.so
+lib/libpisock++.so.0
 lib/libpisock.a
 lib/libpisock.la
 lib/libpisock.so
 lib/libpisock.so.8
-lib/libpisync.so.0
-lib/libpisync.so
-lib/libpisync.la
 lib/libpisync.a
-lib/libpisock++.so.0
-lib/libpisock++.so
-lib/libpisock++.la
-lib/libpisock++.a
+lib/libpisync.la
+lib/libpisync.so
+lib/libpisync.so.0
 share/aclocal/pilot-link.m4
 share/pilot-link/getrom.prc
 share/pilot-link/getrom2.prc
@@ -94,8 +95,8 @@ 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/casemask.xbm
 share/pilot-link/pix/case.xbm
-@dirrm share/aclocal
+share/pilot-link/pix/casemask.xbm
 @dirrm share/pilot-link/pix
 @dirrm share/pilot-link
+@dirrm share/aclocal