4 files changed, 55 insertions, 55 deletions

diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index e6b525580282..acbde52bb3cf 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -7,8 +7,7 @@
 # "?=" and "+=" are for including this Makefile from japanese/jpilot
 
 PORTNAME=	jpilot
-PORTVERSION=	0.99.6
-PORTREVISION=	2
+PORTVERSION=	0.99.7
 CATEGORIES+=	palm comms
 MASTER_SITES=	http://jpilot.org/
 
@@ -55,28 +54,28 @@ post-install:
 	${CP} ${WRKSRC}/jpilotrc.purple ${PREFIX}/share/jpilot
 	${CP} ${WRKSRC}/jpilotrc.steel ${PREFIX}/share/jpilot
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/docs/manual.html ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/docs/plugin.html ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/BUGS ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/COPYING ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/README ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/TODO ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/UPGRADING ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/docs/jpilot-address.png ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/docs/jpilot-datebook.png ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/docs/jpilot-expense.png ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/docs/jpilot-install.png ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/docs/jpilot-memo.png ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/docs/jpilot-prefs.png ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/docs/jpilot-print.png ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/docs/jpilot-search.png ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/docs/jpilot-todo.png ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/docs/jpilot-toplogo.jpg ${PREFIX}/share/doc/jpilot
-	${CP} ${WRKSRC}/icons/README ${PREFIX}/share/doc/jpilot/README.icons
+	${MKDIR} ${DOCSDIR}
+	${CP} ${WRKSRC}/docs/manual.html ${DOCSDIR}
+	${CP} ${WRKSRC}/docs/plugin.html ${DOCSDIR}
+	${CP} ${WRKSRC}/AUTHORS ${DOCSDIR}
+	${CP} ${WRKSRC}/BUGS ${DOCSDIR}
+	${CP} ${WRKSRC}/COPYING ${DOCSDIR}
+	${CP} ${WRKSRC}/ChangeLog ${DOCSDIR}
+	${CP} ${WRKSRC}/INSTALL ${DOCSDIR}
+	${CP} ${WRKSRC}/README ${DOCSDIR}
+	${CP} ${WRKSRC}/TODO ${DOCSDIR}
+	${CP} ${WRKSRC}/UPGRADING ${DOCSDIR}
+	${CP} ${WRKSRC}/docs/jpilot-address.png ${DOCSDIR}
+	${CP} ${WRKSRC}/docs/jpilot-datebook.png ${DOCSDIR}
+	${CP} ${WRKSRC}/docs/jpilot-expense.png ${DOCSDIR}
+	${CP} ${WRKSRC}/docs/jpilot-install.png ${DOCSDIR}
+	${CP} ${WRKSRC}/docs/jpilot-memo.png ${DOCSDIR}
+	${CP} ${WRKSRC}/docs/jpilot-prefs.png ${DOCSDIR}
+	${CP} ${WRKSRC}/docs/jpilot-print.png ${DOCSDIR}
+	${CP} ${WRKSRC}/docs/jpilot-search.png ${DOCSDIR}
+	${CP} ${WRKSRC}/docs/jpilot-todo.png ${DOCSDIR}
+	${CP} ${WRKSRC}/docs/jpilot-toplogo.jpg ${DOCSDIR}
+	${CP} ${WRKSRC}/icons/README ${DOCSDIR}/README.icons
 .endif
 
 .include <bsd.port.mk>
diff --git a/palm/jpilot/distinfo b/palm/jpilot/distinfo
index fb7b36463e58..6455ea5fa2b7 100644
--- a/palm/jpilot/distinfo
+++ b/palm/jpilot/distinfo
@@ -1 +1,2 @@
-MD5 (jpilot-0.99.6.tar.gz) = 1572138321ce6759c65ecf83b8c84ef4
+MD5 (jpilot-0.99.7.tar.gz) = 11bb7236702e2e4c7e3d06372bdc9695
+SIZE (jpilot-0.99.7.tar.gz) = 1197119
diff --git a/palm/jpilot/files/patch-Makefile.in b/palm/jpilot/files/patch-Makefile.in
index 5cc2e99f5a2c..49c9ede7e12c 100644
--- a/palm/jpilot/files/patch-Makefile.in
+++ b/palm/jpilot/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Thu Jul 10 15:34:16 2003
-+++ Makefile.in	Sat Jul 12 15:51:43 2003
-@@ -183,7 +183,7 @@
+--- Makefile.in.orig	Sat Feb 28 15:19:48 2004
++++ Makefile.in	Sun Feb 29 17:22:11 2004
+@@ -312,7 +312,7 @@
+ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
+-SUBDIRS = Expense SyncTime KeyRing docs dialer po m4 empty icons
++SUBDIRS = Expense SyncTime KeyRing dialer po m4 empty
  
--SUBDIRS = intl Expense SyncTime KeyRing docs dialer po m4 empty icons
-+SUBDIRS = intl Expense SyncTime KeyRing dialer po m4 empty
- 
- EXTRA_DIST = reconf autogen.sh ChangeLog \
- 	config.rpath mkinstalldirs \
+ # install the manual docs
+ colordir = $(prefix)/share/$(PACKAGE)
diff --git a/palm/jpilot/pkg-plist b/palm/jpilot/pkg-plist
index f19c3c6eb7fa..e3a151d63304 100644
--- a/palm/jpilot/pkg-plist
+++ b/palm/jpilot/pkg-plist
@@ -10,27 +10,27 @@ lib/jpilot/plugins/libkeyring.so.0
 lib/jpilot/plugins/libsynctime.la
 lib/jpilot/plugins/libsynctime.so
 lib/jpilot/plugins/libsynctime.so.0
-%%PORTDOCS%%share/doc/jpilot/AUTHORS
-%%PORTDOCS%%share/doc/jpilot/BUGS
-%%PORTDOCS%%share/doc/jpilot/COPYING
-%%PORTDOCS%%share/doc/jpilot/ChangeLog
-%%PORTDOCS%%share/doc/jpilot/INSTALL
-%%PORTDOCS%%share/doc/jpilot/README
-%%PORTDOCS%%share/doc/jpilot/README.icons
-%%PORTDOCS%%share/doc/jpilot/TODO
-%%PORTDOCS%%share/doc/jpilot/UPGRADING
-%%PORTDOCS%%share/doc/jpilot/jpilot-address.png
-%%PORTDOCS%%share/doc/jpilot/jpilot-datebook.png
-%%PORTDOCS%%share/doc/jpilot/jpilot-expense.png
-%%PORTDOCS%%share/doc/jpilot/jpilot-install.png
-%%PORTDOCS%%share/doc/jpilot/jpilot-memo.png
-%%PORTDOCS%%share/doc/jpilot/jpilot-prefs.png
-%%PORTDOCS%%share/doc/jpilot/jpilot-print.png
-%%PORTDOCS%%share/doc/jpilot/jpilot-search.png
-%%PORTDOCS%%share/doc/jpilot/jpilot-todo.png
-%%PORTDOCS%%share/doc/jpilot/jpilot-toplogo.jpg
-%%PORTDOCS%%share/doc/jpilot/manual.html
-%%PORTDOCS%%share/doc/jpilot/plugin.html
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.icons
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-address.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-datebook.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-expense.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-install.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-memo.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-prefs.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-print.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-search.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-todo.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-toplogo.jpg
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/plugin.html
 share/gnome/apps/Applications/jpilot.desktop
 share/jpilot/AddressDB.pdb
 share/jpilot/DatebookDB.pdb
@@ -65,7 +65,7 @@ share/locale/zh_CN/LC_MESSAGES/jpilot.mo
 share/locale/zh_TW/LC_MESSAGES/jpilot.mo
 @dirrm share/jpilot/icons
 @dirrm share/jpilot
-%%PORTDOCS%%@dirrm share/doc/jpilot
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/jpilot/plugins
 @dirrm lib/jpilot
 @unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true