(upstream) update 2.0.5 to 2.0.12

- Changes for xlog version 2.0.12 - 2014-apr-01
  * Updated cty.dat to 20140331 (cty-2404)

- Changes for xlog version 2.0.11 - 2013-nov-16
  * Updated cty.dat to 20131009
  * Fixed "Write and Click All"
  * Increased log name limit to 30 characters
  * Fixed truncated "QSO <number>" label in main window
  * Fixed dxcc 3 character callsigns

- Changes for xlog version 2.0.10 - 2013-July-22
  * Fix compilation warning in labels.c regarding strptime
  * Convert all compilation warnings into errors
  * Get rid of the "unused-but-set-variable" warnings

- Changes for xlog version 2.0.9 - 2013-July-20
  * Fix month to number conversion for non-English languages in Cabrillo export
    (thank you Alex EW1LN for reporting the problem and testing the fix)
  * Modify date in TSV file to be ISO 8601 format to aid in spreadsheet import
  * Updated cty.dat to 20130625

- Changes for xlog version 2.0.8 - 2013-May-23
  * Fix Debian lint issue (config.sub config.guess)
  * Merge Debian bug #617374 fix into dxcc.c to avoid segfault
  * Fix cabrillo import - incorporate patch from Thomas (DL1JBE) Beierlein
  * Updated cty.dat to 20130510

- Changes for xlog version 2.0.7 - 2013-March-31
  * Fixed remarks box for Unity et al (bug #38637)
  * Updated cty.dat to 20130312 (CTY-2303)

- Changes for xlog version 2.0.6 - 2013-March-01
  * First version with new maintainer: Andy Stewart, KB1OIQ
  * Updated to Cabrillo v3 format - export and import (bug #37740)
  * Added preference setting for "Are You Sure" dialog on exit (bug #37761)
  * Updated cty.dat to 20130222 (CTY-2302) (bug #37748)
  * Updated to Amateur Data Interchange Format (ADIF) 2.2.7 format (bug #37741)
  ** Added a large number(!) of modes
  ** Added the 560m band
  * Fixed cosmetic issues with the scoring window (bug #37743)
  * Fixed Ubuntu bug #608718: Keyer window displayed, hitting return in RX(RST)
    with no call logged bogus QSO.
  * Fixed Task #10916 - user preference to save Cabrillo freq or band
  * New manual from Chris Story (K6RWJ)
  * Entering "callsigns" like "3D2/R" will show proper DXCC entity in scoring
    window locator box for all except WAE countries.

8 files changed, 236 insertions, 72 deletions

diff --git a/ham/xlog/Makefile b/ham/xlog/Makefile
index e0e52b06b69..18cdef9ee80 100644
--- a/ham/xlog/Makefile
+++ b/ham/xlog/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.61 2014/05/05 00:48:02 ryoon Exp $
+# $NetBSD: Makefile,v 1.62 2014/12/15 08:36:40 mef Exp $
 #
 
-DISTNAME=	xlog-2.0.5
-PKGREVISION=	10
+DISTNAME=	xlog-2.0.12
 CATEGORIES=	ham
 MASTER_SITES=	http://download.savannah.gnu.org/releases/xlog/
+LICENSE=	gnu-gpl-v3
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.nongnu.org/xlog/
diff --git a/ham/xlog/PLIST b/ham/xlog/PLIST
index a7d47b550a8..52a79c0dd55 100644
--- a/ham/xlog/PLIST
+++ b/ham/xlog/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2010/12/25 13:39:54 mef Exp $
+@comment $NetBSD: PLIST,v 1.15 2014/12/15 08:36:40 mef Exp $
 bin/xlog
 man/man1/xlog.1
 share/applications/xlog.desktop
@@ -8,69 +8,122 @@ share/doc/xlog/ChangeLog
 share/doc/xlog/KEYS
 share/doc/xlog/TODO
 share/doc/xlog/glabels/qsllabels.glabels
-share/doc/xlog/manual/img1.png
-share/doc/xlog/manual/index.html
-share/doc/xlog/manual/manual.css
-share/doc/xlog/manual/manual.html
-share/doc/xlog/manual/next.png
-share/doc/xlog/manual/next_g.png
-share/doc/xlog/manual/node1.html
-share/doc/xlog/manual/node10.html
-share/doc/xlog/manual/node11.html
-share/doc/xlog/manual/node12.html
-share/doc/xlog/manual/node13.html
-share/doc/xlog/manual/node14.html
-share/doc/xlog/manual/node15.html
-share/doc/xlog/manual/node16.html
-share/doc/xlog/manual/node17.html
-share/doc/xlog/manual/node18.html
-share/doc/xlog/manual/node19.html
-share/doc/xlog/manual/node2.html
-share/doc/xlog/manual/node20.html
-share/doc/xlog/manual/node21.html
-share/doc/xlog/manual/node22.html
-share/doc/xlog/manual/node23.html
-share/doc/xlog/manual/node24.html
-share/doc/xlog/manual/node25.html
-share/doc/xlog/manual/node26.html
-share/doc/xlog/manual/node27.html
-share/doc/xlog/manual/node28.html
-share/doc/xlog/manual/node29.html
-share/doc/xlog/manual/node3.html
-share/doc/xlog/manual/node30.html
-share/doc/xlog/manual/node31.html
-share/doc/xlog/manual/node32.html
-share/doc/xlog/manual/node33.html
-share/doc/xlog/manual/node34.html
-share/doc/xlog/manual/node35.html
-share/doc/xlog/manual/node4.html
-share/doc/xlog/manual/node5.html
-share/doc/xlog/manual/node6.html
-share/doc/xlog/manual/node7.html
-share/doc/xlog/manual/node8.html
-share/doc/xlog/manual/node9.html
-share/doc/xlog/manual/prev.png
-share/doc/xlog/manual/prev_g.png
-share/doc/xlog/manual/up.png
-share/doc/xlog/manual/up_g.png
-share/doc/xlog/manual/xlog-defaultsdialog.png
-share/doc/xlog/manual/xlog-dupecheckdialog.png
-share/doc/xlog/manual/xlog-exportsettings.png
-share/doc/xlog/manual/xlog-importdialog.png
-share/doc/xlog/manual/xlog-keyerwindow.png
-share/doc/xlog/manual/xlog-logeditor.png
-share/doc/xlog/manual/xlog-mainwindow.png
-share/doc/xlog/manual/xlog-mergelogdialog.png
-share/doc/xlog/manual/xlog-newlogdialog.png
-share/doc/xlog/manual/xlog-pagesetupdialog.png
-share/doc/xlog/manual/xlog-preferencesdialog-general.png
-share/doc/xlog/manual/xlog-preferencesdialog-hamlib.png
-share/doc/xlog/manual/xlog-preferencesdialog-info.png
-share/doc/xlog/manual/xlog-preferencesdialog-logs.png
-share/doc/xlog/manual/xlog-printdialog.png
-share/doc/xlog/manual/xlog-scorewindow.png
-share/doc/xlog/manual/xlog-searchdialog.png
-share/doc/xlog/manual/xlog-workedwindow.png
+share/doc/xlog/manual/README
+share/doc/xlog/manual/appendix-bands.dox
+share/doc/xlog/manual/appendix-keys.dox
+share/doc/xlog/manual/appendix-modes.dox
+share/doc/xlog/manual/appendix-prosigns.dox
+share/doc/xlog/manual/appendix-qcodes.dox
+share/doc/xlog/manual/dialogs-and-windows.dox
+share/doc/xlog/manual/getting_started.dox
+share/doc/xlog/manual/intro.dox
+share/doc/xlog/manual/keyer.dox
+share/doc/xlog/manual/license.dox
+share/doc/xlog/manual/output/html/appendix-bands.html
+share/doc/xlog/manual/output/html/appendix-keys.html
+share/doc/xlog/manual/output/html/appendix-modes.html
+share/doc/xlog/manual/output/html/appendix-prosigns.html
+share/doc/xlog/manual/output/html/appendix-qcodes.html
+share/doc/xlog/manual/output/html/bc_s.png
+share/doc/xlog/manual/output/html/bdwn.png
+share/doc/xlog/manual/output/html/closed.png
+share/doc/xlog/manual/output/html/dialogs-and-windows.html
+share/doc/xlog/manual/output/html/doxygen.css
+share/doc/xlog/manual/output/html/doxygen.png
+share/doc/xlog/manual/output/html/dynsections.js
+share/doc/xlog/manual/output/html/ftv2blank.png
+share/doc/xlog/manual/output/html/ftv2cl.png
+share/doc/xlog/manual/output/html/ftv2doc.png
+share/doc/xlog/manual/output/html/ftv2folderclosed.png
+share/doc/xlog/manual/output/html/ftv2folderopen.png
+share/doc/xlog/manual/output/html/ftv2lastnode.png
+share/doc/xlog/manual/output/html/ftv2link.png
+share/doc/xlog/manual/output/html/ftv2mlastnode.png
+share/doc/xlog/manual/output/html/ftv2mnode.png
+share/doc/xlog/manual/output/html/ftv2mo.png
+share/doc/xlog/manual/output/html/ftv2node.png
+share/doc/xlog/manual/output/html/ftv2ns.png
+share/doc/xlog/manual/output/html/ftv2plastnode.png
+share/doc/xlog/manual/output/html/ftv2pnode.png
+share/doc/xlog/manual/output/html/ftv2splitbar.png
+share/doc/xlog/manual/output/html/ftv2vertline.png
+share/doc/xlog/manual/output/html/getting-started.html
+share/doc/xlog/manual/output/html/index.html
+share/doc/xlog/manual/output/html/jquery.js
+share/doc/xlog/manual/output/html/keyer.html
+share/doc/xlog/manual/output/html/license.html
+share/doc/xlog/manual/output/html/nav_f.png
+share/doc/xlog/manual/output/html/nav_g.png
+share/doc/xlog/manual/output/html/nav_h.png
+share/doc/xlog/manual/output/html/navtree.css
+share/doc/xlog/manual/output/html/navtree.js
+share/doc/xlog/manual/output/html/navtreeindex0.js
+share/doc/xlog/manual/output/html/open.png
+share/doc/xlog/manual/output/html/pages.html
+share/doc/xlog/manual/output/html/preferences.html
+share/doc/xlog/manual/output/html/resize.js
+share/doc/xlog/manual/output/html/search/all_61.html
+share/doc/xlog/manual/output/html/search/all_61.js
+share/doc/xlog/manual/output/html/search/all_64.html
+share/doc/xlog/manual/output/html/search/all_64.js
+share/doc/xlog/manual/output/html/search/all_67.html
+share/doc/xlog/manual/output/html/search/all_67.js
+share/doc/xlog/manual/output/html/search/all_69.html
+share/doc/xlog/manual/output/html/search/all_69.js
+share/doc/xlog/manual/output/html/search/all_6b.html
+share/doc/xlog/manual/output/html/search/all_6b.js
+share/doc/xlog/manual/output/html/search/all_6c.html
+share/doc/xlog/manual/output/html/search/all_6c.js
+share/doc/xlog/manual/output/html/search/all_70.html
+share/doc/xlog/manual/output/html/search/all_70.js
+share/doc/xlog/manual/output/html/search/close.png
+share/doc/xlog/manual/output/html/search/mag_sel.png
+share/doc/xlog/manual/output/html/search/nomatches.html
+share/doc/xlog/manual/output/html/search/pages_61.html
+share/doc/xlog/manual/output/html/search/pages_61.js
+share/doc/xlog/manual/output/html/search/pages_64.html
+share/doc/xlog/manual/output/html/search/pages_64.js
+share/doc/xlog/manual/output/html/search/pages_67.html
+share/doc/xlog/manual/output/html/search/pages_67.js
+share/doc/xlog/manual/output/html/search/pages_69.html
+share/doc/xlog/manual/output/html/search/pages_69.js
+share/doc/xlog/manual/output/html/search/pages_6b.html
+share/doc/xlog/manual/output/html/search/pages_6b.js
+share/doc/xlog/manual/output/html/search/pages_6c.html
+share/doc/xlog/manual/output/html/search/pages_6c.js
+share/doc/xlog/manual/output/html/search/pages_70.html
+share/doc/xlog/manual/output/html/search/pages_70.js
+share/doc/xlog/manual/output/html/search/search.css
+share/doc/xlog/manual/output/html/search/search.js
+share/doc/xlog/manual/output/html/search/search_l.png
+share/doc/xlog/manual/output/html/search/search_m.png
+share/doc/xlog/manual/output/html/search/search_r.png
+share/doc/xlog/manual/output/html/sync_off.png
+share/doc/xlog/manual/output/html/sync_on.png
+share/doc/xlog/manual/output/html/tab_a.png
+share/doc/xlog/manual/output/html/tab_b.png
+share/doc/xlog/manual/output/html/tab_h.png
+share/doc/xlog/manual/output/html/tab_s.png
+share/doc/xlog/manual/output/html/tabs.css
+share/doc/xlog/manual/output/html/xlog-clock.png
+share/doc/xlog/manual/output/html/xlog-dialogs-export.png
+share/doc/xlog/manual/output/html/xlog-dialogs-scoring.png
+share/doc/xlog/manual/output/html/xlog-dialogs-workedbefore.png
+share/doc/xlog/manual/output/html/xlog-dropdown.png
+share/doc/xlog/manual/output/html/xlog-editbox.png
+share/doc/xlog/manual/output/html/xlog-keyer.png
+share/doc/xlog/manual/output/html/xlog-large.png
+share/doc/xlog/manual/output/html/xlog-prefs-general.png
+share/doc/xlog/manual/output/html/xlog-prefs-hamlib.png
+share/doc/xlog/manual/output/html/xlog-prefs-info.png
+share/doc/xlog/manual/output/html/xlog-prefs-logs.png
+share/doc/xlog/manual/output/html/xlog.png
+share/doc/xlog/manual/output/html/xlog_manual.css
+share/doc/xlog/manual/preferences.dox
+share/doc/xlog/manual/xlog.png
+share/doc/xlog/manual/xlog_manual.css
+share/doc/xlog/manual/xlog_user.doxy
+share/doc/xlog/manual/xlog_user.txt
 share/icons/gnome-mime-text-x-xlog.png
 share/icons/xlog-icon.png
 share/locale/cs/LC_MESSAGES/xlog.mo
diff --git a/ham/xlog/distinfo b/ham/xlog/distinfo
index 47c3075ef4e..ed0a022970c 100644
--- a/ham/xlog/distinfo
+++ b/ham/xlog/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.14 2012/11/21 02:09:06 gdt Exp $
+$NetBSD: distinfo,v 1.15 2014/12/15 08:36:40 mef Exp $
 
-SHA1 (xlog-2.0.5.tar.gz) = 26b36eaf4533fbef2caf016de47abe54164e2ff5
-RMD160 (xlog-2.0.5.tar.gz) = 011a518067fe14d84e519601bac3f38f12b0fd56
-Size (xlog-2.0.5.tar.gz) = 11173514 bytes
-SHA1 (patch-aa) = ae23e56971d16454791dca298756c65654bfc961
+SHA1 (xlog-2.0.12.tar.gz) = d63c200f388720e4cb594be6d8d2925b0df0511a
+RMD160 (xlog-2.0.12.tar.gz) = b597452ae9468517da2c263c3f4dfcdf1702aecd
+Size (xlog-2.0.12.tar.gz) = 11396005 bytes
+SHA1 (patch-src_callbacks_mainwindow_qsoframe_c) = 354d979f0f591039df0377e640bdc76b6d4831a4
+SHA1 (patch-src_dxcc_c) = 2fea7448ecd452064ff86ab228ec7490a0c187f3
+SHA1 (patch-src_logfile_edittest_c) = 803cec0af65e359eecfea6fc9e079899999a7529
+SHA1 (patch-src_logfile_logfile_c) = 92ccae2d101297365ef1cd69464edd182b142338
+SHA1 (patch-src_strptime_c) = 5471f5acc7adc16ca08d479473b424c6798bf30c
diff --git a/ham/xlog/patches/patch-src_callbacks_mainwindow_qsoframe_c b/ham/xlog/patches/patch-src_callbacks_mainwindow_qsoframe_c
new file mode 100644
index 00000000000..abca08fb6a6
--- /dev/null
+++ b/ham/xlog/patches/patch-src_callbacks_mainwindow_qsoframe_c
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_callbacks_mainwindow_qsoframe_c,v 1.1 2014/12/15 08:36:40 mef Exp $
+
+error: array subscript has type 'char' [-Werror=char-subscripts]
+
+--- src/callbacks_mainwindow_qsoframe.c~	2012-11-04 00:46:05.000000000 +0900
++++ src/callbacks_mainwindow_qsoframe.c	2014-11-18 09:09:57.000000000 +0900
+@@ -111,11 +111,11 @@ void
+ on_callentry_insert_text (GtkEditable * editable, gchar * new_text,
+ 	gint new_text_length, gpointer position, gpointer user_data)
+ {
+-	gint i;
++	unsigned int i;
+ 	gchar *result = g_new (gchar, new_text_length);
+ 
+ 	for (i = 0; i < new_text_length; i++)
+-result[i] = islower (new_text[i]) ? toupper (new_text[i]) : new_text[i];
++	  result[i] = islower ((unsigned int) new_text[i]) ? toupper ((unsigned int) new_text[i]) : new_text[i];
+ 
+ /* insert the new callsign and block insert_text, so we don't call this twice */
+ 	g_signal_handlers_block_by_func
+@@ -132,11 +132,12 @@ void
+ on_awardsentry_insert_text (GtkEditable * editable, gchar * new_text,
+ 	gint new_text_length, gpointer position, gpointer user_data)
+ {
+-	gint i;
++	unsigned int i;
+ 	gchar *result = g_new (gchar, new_text_length);
+ 
+ 	for (i = 0; i < new_text_length; i++)
+-result[i] = islower (new_text[i]) ? toupper (new_text[i]) : new_text[i];
++ result[i] = islower ((unsigned char) new_text[i]) ?
++   toupper ((unsigned char) new_text[i]) : new_text[i];
+ 
+ 	g_signal_handlers_block_by_func
+ 		(GTK_OBJECT (editable),	on_awardsentry_insert_text, user_data);
diff --git a/ham/xlog/patches/patch-src_dxcc_c b/ham/xlog/patches/patch-src_dxcc_c
new file mode 100644
index 00000000000..34b39db60bb
--- /dev/null
+++ b/ham/xlog/patches/patch-src_dxcc_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_dxcc_c,v 1.1 2014/12/15 08:36:40 mef Exp $
+
+error: array subscript has type 'char' [-Werror=char-subscripts]
+
+--- src/dxcc.c~	2013-11-11 13:21:26.000000000 +0900
++++ src/dxcc.c	2014-11-18 09:11:46.000000000 +0900
+@@ -520,7 +520,7 @@ readctydata (void)
+ 	    {
+ 	      for (i=0; i<strlen(split[7]); i++)
+ 		{
+-		  tmp[i] = toupper(split[7][i]);
++		  tmp[i] = toupper((unsigned char) split[7][i]);
+ 		}
+ 	      tmp[i] = '\0';
+ 	      g_hash_table_insert (prefixes, g_strdup (tmp), GINT_TO_POINTER (programstate.countries));	      
diff --git a/ham/xlog/patches/patch-src_logfile_edittest_c b/ham/xlog/patches/patch-src_logfile_edittest_c
new file mode 100644
index 00000000000..9b10fe1f03a
--- /dev/null
+++ b/ham/xlog/patches/patch-src_logfile_edittest_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_logfile_edittest_c,v 1.1 2014/12/15 08:36:40 mef Exp $
+
+error: array subscript has type 'char' [-Werror=char-subscripts]
+
+--- src/logfile/editest.c~	2012-11-04 00:46:05.000000000 +0900
++++ src/logfile/editest.c	2014-11-17 20:26:23.000000000 +0900
+@@ -268,7 +268,7 @@ editest_qso_foreach (LOGDB * handle,
+ 		break;
+               case LOCATOR:
+ 		/* HF logs don't have locator, but useless NR */
+-		qfield = g_strdup ( isalpha(field[0]) ? field : "");
++		qfield = g_strdup ( isalpha((unsigned char) field[0]) ? field : "");
+ 		break;
+ 	      default:
+ 		qfield = g_strdup (field);
diff --git a/ham/xlog/patches/patch-src_logfile_logfile_c b/ham/xlog/patches/patch-src_logfile_logfile_c
new file mode 100644
index 00000000000..c319567020a
--- /dev/null
+++ b/ham/xlog/patches/patch-src_logfile_logfile_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_logfile_logfile_c,v 1.1 2014/12/15 08:36:40 mef Exp $
+
+error: array subscript has type 'char' [-Werror=char-subscripts]
+
+--- src/logfile/logfile.c~	2012-12-05 09:12:54.000000000 +0900
++++ src/logfile/logfile.c	2014-11-17 20:26:54.000000000 +0900
+@@ -304,7 +304,7 @@ scan_month (const gchar * s)
+ 	}
+ 
+ 	/* fall back to english abreviations */
+-	switch (tolower (s[0]))
++	switch (tolower ((unsigned char) s[0]))
+ 	{
+ 		case 'j':
+ 			if (s[1] == 'a')
diff --git a/ham/xlog/patches/patch-src_strptime_c b/ham/xlog/patches/patch-src_strptime_c
new file mode 100644
index 00000000000..2dcfdbb262d
--- /dev/null
+++ b/ham/xlog/patches/patch-src_strptime_c
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_strptime_c,v 1.1 2014/12/15 08:36:40 mef Exp $
+
+error: array subscript has type 'char' [-Werror=char-subscripts]
+
+--- src/strptime.c~	2012-11-04 00:46:05.000000000 +0900
++++ src/strptime.c	2014-11-18 09:02:47.000000000 +0900
+@@ -287,9 +287,9 @@ strptime_internal (rp, fmt, tm, decided,
+     {
+       /* A white space in the format string matches 0 more or white
+ 	 space in the input string.  */
+-      if (isspace (*fmt))
++      if (isspace ((unsigned char) *fmt))
+ 	{
+-	  while (isspace (*rp))
++	  while (isspace ((unsigned char) *rp))
+ 	    ++rp;
+ 	  ++fmt;
+ 	  continue;
+@@ -510,7 +510,7 @@ strptime_internal (rp, fmt, tm, decided,
+ 	case 'n':
+ 	case 't':
+ 	  /* Match any white space.  */
+-	  while (isspace (*rp))
++	  while (isspace ((unsigned char) *rp))
+ 	    ++rp;
+ 	  break;
+ 	case 'p':