[pkgsrc/trunk]: pkgsrc/comms/jpilot Update jpilot to 1.8.2.

[bad <bad%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d75634151a27
branches:  trunk
changeset: 651956:d75634151a27
user:      bad <bad%pkgsrc.org@localhost>
date:      Tue May 19 10:58:46 2015 +0000

description:
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

diffstat:

 comms/jpilot/Makefile              |   5 ++---
 comms/jpilot/PLIST                 |   5 +++--
 comms/jpilot/distinfo              |  11 +++++------
 comms/jpilot/patches/patch-memo.c  |  28 ++++++++++++++++++++++++++++
 comms/jpilot/patches/patch-utils.c |  13 -------------
 comms/jpilot/patches/patch-utils.h |  13 -------------
 6 files changed, 38 insertions(+), 37 deletions(-)

diffs (122 lines):

diff -r 4a8eb8b5bf27 -r d75634151a27 comms/jpilot/Makefile
--- a/comms/jpilot/Makefile     Tue May 19 07:52:26 2015 +0000
+++ b/comms/jpilot/Makefile     Tue May 19 10:58:46 2015 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2015/04/25 14:20:29 tnn Exp $
+# $NetBSD: Makefile,v 1.101 2015/05/19 10:58:46 bad Exp $
 #
 
-DISTNAME=              jpilot-1.8.1
-PKGREVISION=           5
+DISTNAME=              jpilot-1.8.2
 CATEGORIES=            comms
 MASTER_SITES=          http://www.jpilot.org/
 
diff -r 4a8eb8b5bf27 -r d75634151a27 comms/jpilot/PLIST
--- a/comms/jpilot/PLIST        Tue May 19 07:52:26 2015 +0000
+++ b/comms/jpilot/PLIST        Tue May 19 10:58:46 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2013/10/10 10:58:38 bad Exp $
+@comment $NetBSD: PLIST,v 1.15 2015/05/19 10:58:46 bad Exp $
 bin/jpilot
 bin/jpilot-dump
 bin/jpilot-merge
@@ -11,6 +11,7 @@
 lib/jpilot/plugins/libsynctime.la
 man/man1/jpilot-dial.1
 man/man1/jpilot-dump.1
+man/man1/jpilot-merge.1
 man/man1/jpilot-sync.1
 man/man1/jpilot.1
 share/applications/jpilot.desktop
@@ -50,7 +51,7 @@
 share/jpilot/ContactsDB-PAdd.pdb
 share/jpilot/DatebookDB.pdb
 share/jpilot/ExpenseDB.pdb
-share/jpilot/MañanaDB.pdb
+share/jpilot/MananaDB.pdb
 share/jpilot/Memo32DB.pdb
 share/jpilot/MemoDB.pdb
 share/jpilot/MemosDB-PMem.pdb
diff -r 4a8eb8b5bf27 -r d75634151a27 comms/jpilot/distinfo
--- a/comms/jpilot/distinfo     Tue May 19 07:52:26 2015 +0000
+++ b/comms/jpilot/distinfo     Tue May 19 10:58:46 2015 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.24 2013/10/14 14:33:31 joerg Exp $
+$NetBSD: distinfo,v 1.25 2015/05/19 10:58:46 bad Exp $
 
-SHA1 (jpilot-1.8.1.tar.gz) = 98a70bbb30bcccb8ba74aecb6a41b819dc8a4a3b
-RMD160 (jpilot-1.8.1.tar.gz) = 4b40d625d4582994eeb5acfa296ed0925a59b7bd
-Size (jpilot-1.8.1.tar.gz) = 1582869 bytes
-SHA1 (patch-utils.c) = 3e7551d0859820cc103a6c5cbfbac8d4ff21eee9
-SHA1 (patch-utils.h) = 950d4de9824620847ca8b7f197d788c666a69d81
+SHA1 (jpilot-1.8.2.tar.gz) = 3348bf3e49928f4b5202bac546ab62852155291c
+RMD160 (jpilot-1.8.2.tar.gz) = b162f2e2f91ef9fd4fc07026312f0f21ddbc345a
+Size (jpilot-1.8.2.tar.gz) = 1740735 bytes
+SHA1 (patch-memo.c) = 9390f307c185bdd6a7d89513de5e9e1411f9a0f0
diff -r 4a8eb8b5bf27 -r d75634151a27 comms/jpilot/patches/patch-memo.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/comms/jpilot/patches/patch-memo.c Tue May 19 10:58:46 2015 +0000
@@ -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 -r 4a8eb8b5bf27 -r d75634151a27 comms/jpilot/patches/patch-utils.c
--- a/comms/jpilot/patches/patch-utils.c        Tue May 19 07:52:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 4a8eb8b5bf27 -r d75634151a27 comms/jpilot/patches/patch-utils.h
--- a/comms/jpilot/patches/patch-utils.h        Tue May 19 07:52:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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,