Update jpilot to 1.8.2.

While here restore old behaviour of not alphabetically sorting memos by default.

Changes since 1.8.1:
1.8.2 - 05/18/14
 Many bug fixes
 Fixed VCard output
 Added export for B-Folders
 Added export for KeePassX
 Changed the "enye" letter in Manana an "n", got tired of it causing problems
  (Ma\303\261ana to Manana)
 Made lots of stupid code changes to make the compiler warnings go away

3 files changed, 28 insertions, 26 deletions

diff --git a/comms/jpilot/patches/patch-memo.c b/comms/jpilot/patches/patch-memo.c
new file mode 100644
index 00000000000..45af7b7b4ba
--- /dev/null
+++ b/comms/jpilot/patches/patch-memo.c
@@ -0,0 +1,28 @@
+/* $NetBSD: patch-memo.c,v 1.1 2015/05/19 10:58:46 bad Exp $ */
+Only sort memos alphabetically when enabled in the app_info.
+
+--- memo.c.orig	2014-05-25 03:25:20.000000000 +0000
++++ memo.c	2015-05-19 10:51:57.000000000 +0000
+@@ -262,7 +262,7 @@
+ 
+ static int memo_sort(MemoList **memol, int sort_order)
+ {
+-   /* struct MemoAppInfo memo_ai; */
++   struct MemoAppInfo memo_ai;
+    MemoList *temp_memol;
+    MemoList **sort_memol;
+    int count, i;
+@@ -291,13 +291,10 @@
+       sort_memol[i] = temp_memol;
+    }
+ 
+-   /* TODO: Restore code when syncing of AppInfo blocks is implemented
+    get_memo_app_info(&memo_ai);
+    if (memo_ai.sortByAlpha==1) {
+       qsort(sort_memol, count, sizeof(MemoList *), memo_compare);
+    }
+-   */
+-   qsort(sort_memol, count, sizeof(MemoList *), memo_compare);
+ 
+    /* Put the linked list in the order of the array */
+    if (sort_order==SORT_ASCENDING) {
diff --git a/comms/jpilot/patches/patch-utils.c b/comms/jpilot/patches/patch-utils.c
deleted file mode 100644
index b51a2f2bee2..00000000000
--- a/comms/jpilot/patches/patch-utils.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-utils.c,v 1.1 2013/10/14 14:33:31 joerg Exp $
-
---- utils.c.orig	2013-10-14 13:14:27.000000000 +0000
-+++ utils.c
-@@ -899,7 +899,7 @@ void clist_clear(GtkCList *clist)
- 
- /* Encapsulate GTK tooltip function which no longer supports disabling as
-  * of GTK 2.12 */
--inline void set_tooltip(int show_tooltip, 
-+void set_tooltip(int show_tooltip, 
-                         GtkTooltips *tooltips,
-                         GtkWidget *widget,
-                         const gchar *tip_text,
diff --git a/comms/jpilot/patches/patch-utils.h b/comms/jpilot/patches/patch-utils.h
deleted file mode 100644
index 33821eae31b..00000000000
--- a/comms/jpilot/patches/patch-utils.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-utils.h,v 1.1 2013/10/14 14:33:31 joerg Exp $
-
---- utils.h.orig	2013-10-14 13:14:44.000000000 +0000
-+++ utils.h
-@@ -349,7 +349,7 @@ void entry_set_multiline_truncate(GtkEnt
- 
- void clist_clear(GtkCList *clist);
- 
--inline void set_tooltip(int show_tooltip, 
-+void set_tooltip(int show_tooltip, 
-                         GtkTooltips *tooltips,
-                         GtkWidget *widget,
-                         const gchar *tip_text,