Update jpilot to 0.99.8 and latest patches.

For me this fixes the UTF-8 handling so that it works with the german PalmOS
version on the m515.

patch-0.99.8-memmory 11/11/05
 Added a patch to fix a memory problem resulting in a segfault when modifying
 records.

patch.jpilot-sync 11/05/05
 Patch to fix unresolved symbol glob_tooltips when using jpilot-sync

0.99.8 - 11/30/05
 This release is dedicated to my Mother who unexpectedly passed away
 this last year.
 Added translation for Kinyarwanda
 Added panes to Expense and KeyRing

0.99.8-pre11 - 09/11/05
 Added an install user from the menu.
 Other miscellaneous fixes/changes

0.99.8-pre10 - 08/09/05 (Released by Ludovic Rousseau)
 Solve a data corruption problem when used with pilot-link 0.12
 Better support of 64-bit platforms
 The last character was truncated using Hebrew encoding
 Support localized date formats (for example Japanese)
 jpilot-sync works again (no more jp_logf relocation error)
 Some more bugs fixed

0.99.8-pre9 - 05/03/05 (Released by Ludovic Rousseau)
 Cut-n-paste using X11 clipboard (mouse middle clic)
 Return focus to the list after major operations which facilitates usability
 Add hotkey (shift-return) to move focus between list and data window
 In week and month views you can clic on a day to select it in the main view
 Add remote sync. use "jpilot -s" to start a sync on the running jpilot
 Add support of pilot-link 0.12.0-pre3
 Some more bugs fixed
 Updated translations: it, ja, fr
 jpilot-dump.c: convert from UTF8 to local encoding

0.99.8-pre8 - 02/19/05 (Released by Ludovic Rousseau)
 Cut-n-paste using GTK+ Ctrl-C/Ctrl-V now works across all four apps
 Replace Sync and Backup text buttons by an color icon
 Add Chinese BIG-5 Palm encoding
 Update ja, zh_TW translations
 GTK2 now uses CTRL+Enter consistently to apply changes
 Add Cancel button with ESC accelerator
 Added two preferences and code to
  1) Mark current day in monthview and weekview guis by adding "TODAY"
     to display
  2) Display the absolute number of an event which repeats yearly
     (usefulf or birthdays and anniversaries)

0.99.8-pre7 - 01/08/05 (Released by Ludovic Rousseau)
 Update zh_CN, zh_TW, cs and es translations
 Solve a crash in Japanese mode in address GUI
 Extract the first day of week (sunday or monday) from the system locale setting
 Add menu color icons for the 4 main applications
 Improve todo sorting
 Allow to cycle through the KeyRing categories by calling again the plugin
 Some more bugs fixed

0.99.8-pre6 - 11/27/04 (Released by Ludovic Rousseau)
 Solve the "different user ID sync" bug
 Solve the GUI "freeze" bug
 Some more bugs fixed

0.99.8-pre5 - 11/26/04 (Ludovic Rousseau)
 Solve the "undefined symbol: jp_charset_j2p" error
 Fix Japanese menu
 Some code cleanup

0.99.8-pre4 - 11/24/04 (Released by Ludovic Rousseau)
 Some more bugs fixed
 Improved search sorting
 Improved convertion to UTF-8 in case of errors
 Use GBK instead of GB2312 charset encoding for Chinese
 Use a radio item menu for Hide/Show/Mask records so that the state is
  clearly indicated
 Fix sort order for appts in datebook
 Complete Japanese translation

0.99.8-pre3 - 11/14/04 (Released by Ludovic Rousseau)
 Some more bugs fixed
 The right-hand side of jpilot were not updated on a cursor movement.
 Fixed unpredictable bug in repeating events caused by unitialized variable
 Use iconv to convert from the Palm charset to UTF-8. Thanks to Amit Aronovitch
  we now support many new charsets when used with GTK2:
  - Hebrew (CP1255),
  - Cyrillic (CP1251),
  - Cyrillic (KOI8-R),
  - Latin 2, Eastern Europe (ISO8859-2),
  - Japanese (SJIS),
  - Chinese (GB2312)
 Complete Chinese translation. Thanks to lei Yu
 The category selection was not working from the Export window for Addresses
 Give a more explicit error message when pi_bind() fails. We now have
  "permission denied" or "file not found" instead of "Illegal seek".
  Also display the device name we are trying to use.
  Thanks to Edgar Bonet for the patch
 New preference to show or hide popup tooltips
 Entries returned from datebook app during search were in random order
 Get first day of week from locale in GTK2, no preference setting

0.99.8-pre2 - 10/20/04 (Released by Ludovic Rousseau)
 some bugs fixed
 add the same keyboards accelerators for the 4 applications:
  Ctrl-D: Delete
  Ctrl-O: Copy
  Ctrl-N: New Record
  Ctrl-R: Add Record
  Ctrl-Return: Apply Changes
  Ctrl-Y: Sync
 KeyRing: can use non ASCII characters in name/account/password
 nice GTK2 color icons in the menu

0.99.8-pre1 - 10/02/04 (Released by Ludovic Rousseau)
 better UTF-8 handling (needed when using GTK2)
 sort todo list by clicking on column title
 lots of bugs fixed:
  bug 1330: invalid postscript when printing the todo list contains ( or )
  bug 1306: Keyring plugin truncates passwords
  bug 1056: Undelete feature desired
  bug 1338: Some repeating appointments do not show in monthview gui
  bug 1176: Adding ability to e-mail directly from address book
  bug 1182: Search screen needs a button
  bug 1322: GTK2.4 libraries require changes to jpilotrc files to preserve colors
  bug 1116: Word wrap provided when printing monthly calendar
  bug 1154: resorting in address book should leave selection bar on same entry
  bug 1107: show completed todos found through search regardless of show completed checkbox status
  bug 1153: Patch reduces flicker when deleting records
  bug 1131: ALT key for accelerator instead of control
  bug 1184: truncating buffers with non ASCII charsets

7 files changed, 70 insertions, 80 deletions

diff --git a/comms/jpilot/DESCR b/comms/jpilot/DESCR
index 2fe1bb4da07..98f4f90b7c5 100644
--- a/comms/jpilot/DESCR
+++ b/comms/jpilot/DESCR
@@ -3,22 +3,38 @@ runs under Linux and Unix.  It is similar in functionality to the one
 that 3com distributes for a well known rampant legacy operating
 system.  Features include:
 
+  * Phone Dialer
+  * Syncronization of categories and editing categories on desktop
+  * Export of iCalendar format from ToDo and Datebook
+  * Export of vCard format from Address book
+  * Export of ldif format from Address book
   * Supports Datebook, Address, To Do List, and Memo Pad
+  * Support for Palm OS 4.x passwords and USB
+  * Import and Export
   * Supports some DateBk3 tags
+  * Support for PEdit palm app
   * Postscript printing
   * Monthly and Weekly Views of the datebook
   * Plugin support - comes with Expense plugin
+  * Synctime plugin for setting the time on the palm
+  * KeyRing plugin for GNU KeyRing encryption Palm app
   * Small and fast, designed to take up little screen space
   * 2 way Syncing, fast and slow syncs
   * Support for multiple backups
-  * Palm Pilot preferences are used
+  * Palm Pilot preferences are used so that things appearin the same way as
+    they do on the palm pilot.  i.e. Sorting orderof addresses, todos, memos,
+    etc.
   * Does a Full Backup, or just a Sync of supported apps
+  * Restore capability
   * Global Search (Find)
-  * Installation of files to the palm pilot
+  * Installation of files to the palm pilot, will install Graffiti Shortcuts
+  * Limited support for Japanese Kanji characters SJIS-> EUC -> SJIS
   * Support for color scheme files
   * Quick find in address application
-  * Datebook support for repeating events and exceptions to those
-    events
-  * Datebook support for modification of a single occurrence of a
-    reoccurring event
-  * Datebook support for "By Day" reoccurring events
+  * Datebook support for repeating events and exceptionsto those events
+  * Datebook support for modification of a single occurrence of a reoccurring
+    event
+  * Datebook support for "By Day" reoccurring eventseven when its on the last
+    day of the month, and not the 4th.  i.e. Try adding a monthly repeating
+    appointment "By Day" on the 4th week ofa month when there is no 5th
+    occurrence of that day in the month 
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index 047474b8252..ae37f869d08 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2006/04/17 13:46:10 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2006/06/13 21:52:11 bad Exp $
 #
 
-DISTNAME=		jpilot-0.99.7
-PKGREVISION=		3
+DISTNAME=		jpilot-0.99.8
 CATEGORIES=		comms
 MASTER_SITES=		http://jpilot.org/
 
diff --git a/comms/jpilot/PLIST b/comms/jpilot/PLIST
index 0a9763bd3a8..ad0d3de661f 100644
--- a/comms/jpilot/PLIST
+++ b/comms/jpilot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/17 07:07:14 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/06/13 21:52:11 bad Exp $
 bin/jpilot
 bin/jpilot-dump
 bin/jpilot-sync
@@ -11,7 +11,6 @@ lib/jpilot/plugins/libsynctime.la
 man/man1/jpilot-dial.1
 man/man1/jpilot-dump.1
 man/man1/jpilot-sync.1
-man/man1/jpilot-upgrade-99.1
 man/man1/jpilot.1
 share/doc/${PKGNAME}/AUTHORS
 share/doc/${PKGNAME}/BUGS
@@ -26,20 +25,27 @@ share/doc/${PKGNAME}/icons/jpilot-icon1.xpm
 share/doc/${PKGNAME}/icons/jpilot-icon2.xpm
 share/doc/${PKGNAME}/icons/jpilot-icon3.xpm
 share/doc/${PKGNAME}/icons/jpilot-icon4.xpm
-share/doc/${PKGNAME}/jpilot-address.png
-share/doc/${PKGNAME}/jpilot-datebook.png
-share/doc/${PKGNAME}/jpilot-expense.png
-share/doc/${PKGNAME}/jpilot-install.png
-share/doc/${PKGNAME}/jpilot-memo.png
-share/doc/${PKGNAME}/jpilot-prefs.png
-share/doc/${PKGNAME}/jpilot-print.png
-share/doc/${PKGNAME}/jpilot-search.png
-share/doc/${PKGNAME}/jpilot-todo.png
-share/doc/${PKGNAME}/jpilot-toplogo.jpg
-share/doc/${PKGNAME}/manual.html
-share/doc/${PKGNAME}/plugin.html
+share/doc/${PKGNAME}/manual/jpilot-address.png
+share/doc/${PKGNAME}/manual/jpilot-datebook.png
+share/doc/${PKGNAME}/manual/jpilot-expense.png
+share/doc/${PKGNAME}/manual/jpilot-install.png
+share/doc/${PKGNAME}/manual/jpilot-memo.png
+share/doc/${PKGNAME}/manual/jpilot-prefs-1.png
+share/doc/${PKGNAME}/manual/jpilot-prefs-2.png
+share/doc/${PKGNAME}/manual/jpilot-prefs-3.png
+share/doc/${PKGNAME}/manual/jpilot-prefs-4.png
+share/doc/${PKGNAME}/manual/jpilot-prefs-5.png
+share/doc/${PKGNAME}/manual/jpilot-prefs-6.png
+share/doc/${PKGNAME}/manual/jpilot-prefs-7.png
+share/doc/${PKGNAME}/manual/jpilot-prefs-8.png
+share/doc/${PKGNAME}/manual/jpilot-print.png
+share/doc/${PKGNAME}/manual/jpilot-search.png
+share/doc/${PKGNAME}/manual/jpilot-todo.png
+share/doc/${PKGNAME}/manual/jpilot-toplogo.jpg
+share/doc/${PKGNAME}/manual/manual.html
+share/doc/${PKGNAME}/manual/plugin.html
 share/doc/jpilot/BUGS
-share/gnome/apps/Applications/jpilot.desktop
+share/applications/jpilot.desktop
 share/jpilot/AddressDB.pdb
 share/jpilot/DatebookDB.pdb
 share/jpilot/ExpenseDB.pdb
@@ -62,14 +68,15 @@ share/locale/ja/LC_MESSAGES/jpilot.mo
 share/locale/nl/LC_MESSAGES/jpilot.mo
 share/locale/no/LC_MESSAGES/jpilot.mo
 share/locale/ru/LC_MESSAGES/jpilot.mo
+share/locale/rw/LC_MESSAGES/jpilot.mo
 share/locale/sv/LC_MESSAGES/jpilot.mo
 share/locale/tr/LC_MESSAGES/jpilot.mo
 share/locale/vi/LC_MESSAGES/jpilot.mo
 share/locale/zh_CN/LC_MESSAGES/jpilot.mo
 share/locale/zh_TW/LC_MESSAGES/jpilot.mo
 @dirrm share/jpilot
-@dirrm share/gnome/apps/Applications
 @dirrm share/doc/${PKGNAME}/icons
+@dirrm share/doc/${PKGNAME}/manual
 @dirrm share/doc/${PKGNAME}
 @dirrm share/doc/jpilot
 @dirrm lib/jpilot/plugins
diff --git a/comms/jpilot/distinfo b/comms/jpilot/distinfo
index 0e61d730876..b540036d63f 100644
--- a/comms/jpilot/distinfo
+++ b/comms/jpilot/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2005/09/22 12:07:29 rillig Exp $
+$NetBSD: distinfo,v 1.18 2006/06/13 21:52:11 bad Exp $
 
-SHA1 (jpilot-0.99.7.tar.gz) = 4ecdc3c00fa4b7d475d156f1cef6840c5e8aa4dc
-RMD160 (jpilot-0.99.7.tar.gz) = 04516b0be321addaf636205372483178dff5c839
-Size (jpilot-0.99.7.tar.gz) = 1197119 bytes
-SHA1 (patch-ab) = 00252b62491d894572a59645dcdfdf8edd3d0b21
+SHA1 (jpilot-0.99.8.tar.gz) = 5ad7c15f4583a15afb7acd96db2c4e8e58311b29
+RMD160 (jpilot-0.99.8.tar.gz) = 9d19e41a8d73f1dbfc5107e0ee1657ac09b55189
+Size (jpilot-0.99.8.tar.gz) = 1589217 bytes
+SHA1 (patch-aa) = 02a3fabe17e9144db09c0fad896fe46d695b4465
+SHA1 (patch-ac) = 0990cb0a8ebf2cc779c149eee35cd5584bfc128a
 SHA1 (patch-ad) = cac013141685ff632cafc7a45841d4c9b77a957f
-SHA1 (patch-ae) = 62ae557a7f9c3692bfec8f6efcdc664db776d4c9
diff --git a/comms/jpilot/patches/patch-ab b/comms/jpilot/patches/patch-ab
deleted file mode 100644
index 0160495f2bd..00000000000
--- a/comms/jpilot/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2005/09/05 07:52:22 rh Exp $
-
---- KeyRing/keyring.c.orig	2004-02-17 16:59:38.000000000 -0800
-+++ KeyRing/keyring.c
-@@ -182,7 +182,7 @@ static int pack_KeyRing(struct KeyRing *
-    for (i=strlen(kr->name)+1; i<n; i=i+8) {
-       /* des_encrypt3((DES_LONG *)&buf[i], s1, s2, s1); */
- #ifdef HEADER_NEW_DES_H
--      DES_ecb3_encrypt((const_des_cblock *)&buf[i], (des_cblock *)(&buf[i]), 
-+      DES_ecb3_encrypt((const_DES_cblock *)&buf[i], (DES_cblock *)(&buf[i]), 
- 		       &s1, &s2, &s1, DES_ENCRYPT);
- #else
-       des_ecb3_encrypt((const_des_cblock *)&buf[i], (des_cblock *)(&buf[i]),
-@@ -281,7 +281,7 @@ static int unpack_KeyRing(struct KeyRing
-       /* des_decrypt3((DES_LONG *)chunk, s1, s2, s1); */
-       /* memcpy(clear_text+i, chunk, 8); */
- #ifdef HEADER_NEW_DES_H
--      DES_ecb3_encrypt((const_des_cblock *)&P[i], (DES_cblock *)(clear_text+i),
-+      DES_ecb3_encrypt((const_DES_cblock *)&P[i], (DES_cblock *)(clear_text+i),
- 		       &s1, &s2, &s1, DES_DECRYPT);
- #else
-       des_ecb3_encrypt((const_des_cblock *)&P[i], (des_cblock *)(clear_text+i),
diff --git a/comms/jpilot/patches/patch-ac b/comms/jpilot/patches/patch-ac
new file mode 100644
index 00000000000..52f0a549c9f
--- /dev/null
+++ b/comms/jpilot/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.5 2006/06/13 21:52:11 bad Exp $
+
+http://www.jpilot.org/patch.0.99.8-memory
+
+--- utils.c.orig	2005-12-11 13:04:24.000000000 -0500
++++ utils.c	2005-12-11 13:04:38.000000000 -0500
+@@ -2042,9 +2042,6 @@
+       fwrite(RecordBuffer->data, header.rec_len, 1, pc_in);
+ #endif /* PILOT_LINK_0_12 */
+       jp_logf(JP_LOG_DEBUG, "record deleted\n");
+-#ifdef PILOT_LINK_0_12
+-      pi_buffer_free(RecordBuffer);
+-#endif /* PILOT_LINK_0_12 */
+       fclose(pc_in);
+ #ifdef PILOT_LINK_0_12
+       pi_buffer_free(RecordBuffer);
diff --git a/comms/jpilot/patches/patch-ae b/comms/jpilot/patches/patch-ae
deleted file mode 100644
index 2aec63947a0..00000000000
--- a/comms/jpilot/patches/patch-ae
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2005/09/22 12:07:29 rillig Exp $
-
-ISO C90 does not allow declarations after code.
-
---- address_gui.c.orig	Sun Feb 22 20:34:23 2004
-+++ address_gui.c	Thu Sep 22 13:59:00 2005
-@@ -1426,14 +1426,16 @@ void cb_dialer(GtkWidget *widget, gpoint
-    char *Px;
-    char number[100];
-    char ext[100];
--
--   number[0]=ext[0]='\0';
--   text=data;
- #ifdef ENABLE_GTK2
-    GtkTextIter    start_iter;
-    GtkTextIter    end_iter;
-    GtkTextBuffer *text_buffer;
-+#endif
- 
-+   number[0]=ext[0]='\0';
-+   text=data;
-+
-+#ifdef ENABLE_GTK2
-    text_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
-    gtk_text_buffer_get_bounds(GTK_TEXT_BUFFER(text),&start_iter,&end_iter);
-    str = gtk_text_buffer_get_text(GTK_TEXT_BUFFER(text),&start_iter,&end_iter,TRUE);