Update jpilot to 0.99. Changes from version 0.98.1:

 Alphabetized 4 main app categories and expense categories
 New calendar begin/end setting method using keyboard
 jpilot-sync program added to allow command line syncing
 Made radio buttons for which phone # shows up in addr
 Made month/week views obey categories
 Made 4 main apps+expense more user friendly by detecting changes
 Added prefs for optionally backing up DBs
 Czech character set added
 Russian character set added
 Moved output screen to bottom panel in main window
 Fixed many bugs in Expense and improved GUI
 Fixed datebook entries showing weekly repeat
 Added a large view window to the monthview
 Fixed some DateBk3 bugs (templates showing as today, etc)
 Made Address screen stay as it was last used in quick/add view mode
 Alarms
 Sorted memos if they are sorted on the handheld
 Replaced calendar buttons (array) with a gtk_calendar widget
 Made Quickview a page on the address Notebook
 Made private records hidable using palm password
 Made changes for Japanese and Chinese and Korean and multibyte characters
 Included Synctime in rpm and made it detect and avoid PalmOS 3.3
 Made the creation of ~/.jpilot and ~/.jpilot/backup* perms 0700 & ~umask
  If upgrading then you may want to change the permissions of ~/.jpilot/ for
  security reasons.
 Made completed ToDos not print if hidden
 Minor postscript improvements
 Made plugin conduits selectable wether to sync or not

3 files changed, 45 insertions, 51 deletions

diff --git a/comms/jpilot/patches/patch-aa b/comms/jpilot/patches/patch-aa
index 1dbd2d75010..fe0890b616e 100644
--- a/comms/jpilot/patches/patch-aa
+++ b/comms/jpilot/patches/patch-aa
@@ -1,12 +1,25 @@
-$NetBSD: patch-aa,v 1.1 2000/06/15 21:14:07 rh Exp $
+$NetBSD: patch-aa,v 1.2 2001/03/01 20:38:15 jlam Exp $
 
---- configure.orig	Mon Feb 28 23:30:09 2000
-+++ configure	Thu Jun 15 18:05:22 2000
-@@ -3779,7 +3779,6 @@
-       echo $ac_n "checking for dlopen""... $ac_c" 1>&6
- echo "configure:3781: checking for dlopen" >&5
-    save_LIBS="$LIBS"
--   LIBS="$LIBS -ldl"
-    cat > conftest.$ac_ext <<EOF
- #line 3785 "configure"
- #include "confdefs.h"
+--- Makefile.in.orig	Tue Feb  6 14:31:05 2001
++++ Makefile.in
+@@ -43,7 +43,7 @@
+ INTLLIBS = @INTLLIBS@
+ 
+ # Targets
+-all: po_dir intl_dir jpilot jpilot-sync jpilot-dump
++all: po_dir intl_dir jpilot jpilot-sync jpilot-dump jpilot-upgrade-99
+ 
+ jpilot: jpilot.o datebook.o address.o todo.o memo.o \
+ 	utils.o sync.o prefs.o log.o plugins.o \
+@@ -240,9 +240,9 @@
+ 	  ./install-sh -s -c -m 555 jpilot-dump $(prefix)/jpilot-dump ; \
+ 	fi
+ 	if test -d "$(prefix)/bin" ; then \
+-	  ./install-sh -s -c -m 555 jpilot-dump $(prefix)/bin/jpilot-upgrade-99 ; \
++	  ./install-sh -s -c -m 555 jpilot-upgrade-99 $(prefix)/bin/jpilot-upgrade-99 ; \
+ 	else \
+-	  ./install-sh -s -c -m 555 jpilot-dump $(prefix)/jpilot-upgrade-99 ; \
++	  ./install-sh -s -c -m 555 jpilot-upgrade-99 $(prefix)/jpilot-upgrade-99 ; \
+ 	fi
+ 	./install-sh -d -m 755 $(prefix)/share/jpilot
+ 	./install-sh -c -m 755 jpilotrc.blue $(prefix)/share/jpilot
diff --git a/comms/jpilot/patches/patch-ab b/comms/jpilot/patches/patch-ab
index 2ad623f9886..aec64116d9a 100644
--- a/comms/jpilot/patches/patch-ab
+++ b/comms/jpilot/patches/patch-ab
@@ -1,30 +1,25 @@
-$NetBSD: patch-ab,v 1.1 2000/06/15 21:14:08 rh Exp $
+$NetBSD: patch-ab,v 1.2 2001/03/01 20:38:15 jlam Exp $
 
---- plugins.c.orig	Sun Feb 13 05:36:01 2000
-+++ plugins.c	Thu Jun 15 22:19:03 2000
-@@ -127,7 +127,7 @@
-    char name[52];
-    char db_name[52];
-    int version, major_version, minor_version;
--   /* void (*plugin_set_jpilot_logf)(int (*Pjpilot_logf)(int level, char *format, ...));*/
-+   void (*plugin_set_jpilot_logf)(int (*Pjpilot_logf)(int level, char *format, ...));
-    void (*plugin_versionM)(int *major_version, int *minor_version);
-    
-    p->full_path = NULL;
-@@ -159,14 +159,14 @@
-    p->handle=h;
-    
-    /* logf */
--/*
+--- configure.in.orig	Tue Feb  6 14:26:38 2001
++++ configure.in
+@@ -56,6 +56,9 @@
+ dnl AM_WITH_NLS()
+ AM_GNU_GETTEXT
+ 
++# Use PKGLOCALEDIR to determine location of installed locale files.
++DATADIRNAME="${PKGLOCALEDIR}"
 +
-    plugin_set_jpilot_logf = dlsym(h, "plugin_set_jpilot_logf");
-    if ((err = dlerror()) != NULL)  {
-       jpilot_logf(LOG_WARN, "plugin_set_jpilot_logf, [%s]\n [%s]\n", err, path);
-    } else {
-       plugin_set_jpilot_logf(jpilot_logf);
-    }
--*/
+ if test "x$MSGFMT" = "xno"; then
+    if test "x$GMSGFMT" = "xno"; then
+       AC_MSG_RESULT(I can't find gettext)
+@@ -179,6 +182,10 @@
+    LIBS="$LIBS -ldl"
+    AC_TRY_LINK([#include <dlfcn.h>], [dlopen("huh",0);] , have_dlopen=yes, , )
+    LIBS="$save_LIBS"
 +
++   if test "x$have_dlopen" != "yes"; then
++      AC_TRY_LINK([#include <dlfcn.h>], [dlopen("huh",0);], have_dlopen=yes,, )
++   fi
  
-    p->full_path = strdup(path);
- 
+    if test "x$have_dlopen" = "xyes"; then
+       AC_DEFINE(ENABLE_PLUGINS)
diff --git a/comms/jpilot/patches/patch-ac b/comms/jpilot/patches/patch-ac
deleted file mode 100644
index e89c765951a..00000000000
--- a/comms/jpilot/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/11/08 11:56:45 tron Exp $
-
---- jpilot.c.orig	Sat Feb 12 21:33:21 2000
-+++ jpilot.c	Wed Nov  8 12:53:18 2000
-@@ -27,6 +27,9 @@
- #include <signal.h>
- #include <string.h>
- #include <unistd.h>
-+#ifdef __NetBSD__
-+#include <locale.h>
-+#endif
- 
- #include <pi-datebook.h>
- #include <gdk/gdkkeysyms.h>