Update to 1.8.2

Too many minor updates to list, see src/CHANGELOG for fill list.
This includes a patch to fix import of new country lists.

6 files changed, 37 insertions, 28 deletions

diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile
index 5143d8abbcec..fb21614d1cee 100644
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	cqrlog
-PORTVERSION=	1.7.4
+PORTVERSION=	1.8.2
 CATEGORIES=	comms hamradio
-MASTER_SITES=	http://www.cqrlog.com/files/cqrlog_1.7.4/ \
+MASTER_SITES=	http://www.cqrlog.com/files/cqrlog_${PORTVERSION}/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	shurd
 DISTNAME=	${PORTNAME}_${PORTVERSION}.src
diff --git a/comms/cqrlog/distinfo b/comms/cqrlog/distinfo
index 2f3f4883b4ec..98accf49db6c 100644
--- a/comms/cqrlog/distinfo
+++ b/comms/cqrlog/distinfo
@@ -1,4 +1,2 @@
-SHA256 (cqrlog_1.7.4.src.tar.gz) = c9c06fc9f0d428a63dc97a9e4d046bfc70bf3fc97be419e2a94cb21c82fbaf2e
-SIZE (cqrlog_1.7.4.src.tar.gz) = 7859696
-SHA256 (lnet-0.6.5.zip) = 6efc2dc00e63f516dc023a515ef7a9c7a09ce0256371485c382c8952ce463e2f
-SIZE (lnet-0.6.5.zip) = 247305
+SHA256 (cqrlog_1.8.2.src.tar.gz) = 2d4b76949bcad5bed2683fce928524c683c6d69999d45526959a3d2f7e16516e
+SIZE (cqrlog_1.8.2.src.tar.gz) = 7949130
diff --git a/comms/cqrlog/files/patch-src_cqrlog.lpi b/comms/cqrlog/files/patch-src_cqrlog.lpi
deleted file mode 100644
index da9e46e84d7f..000000000000
--- a/comms/cqrlog/files/patch-src_cqrlog.lpi
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cqrlog.lpi.orig	2014-06-30 22:29:40.000000000 -0700
-+++ src/cqrlog.lpi	2014-06-30 22:29:47.000000000 -0700
-@@ -633,7 +633,7 @@
-     <Version Value="9"/>
-     <SearchPaths>
-       <Libraries Value="$(LazarusDir)/lcl"/>
--      <OtherUnitFiles Value="lnet/lib;ipc;mysql"/>
-+      <OtherUnitFiles Value="lnet/lib;mysql"/>
-       <SrcPath Value="$(LazarusDir)/lcl;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)"/>
-       <LCLWidgetType Value="gtk2"/>
-     </SearchPaths>
diff --git a/comms/cqrlog/files/patch-src_dData.lfm b/comms/cqrlog/files/patch-src_dData.lfm
new file mode 100644
index 000000000000..7d54172523d7
--- /dev/null
+++ b/comms/cqrlog/files/patch-src_dData.lfm
@@ -0,0 +1,11 @@
+--- src/dData.lfm.orig	2014-12-20 19:39:40.000000000 -0800
++++ src/dData.lfm	2014-12-20 19:40:02.000000000 -0800
+@@ -113,7 +113,7 @@
+       '            cont VARCHAR(6) NOT NULL,'
+       '            utc VARCHAR(12)NOT NULL,'
+       '            lat VARCHAR(10) NOT NULL,'
+-      '            longit VARCHAR(10) NOT NULL,'
++      '            longit VARCHAR(12) NOT NULL,'
+       '            itu VARCHAR(20) NOT NULL,'
+       '            waz VARCHAR(20) NOT NULL,'
+       '            adif SMALLINT NOT NULL DEFAULT 0,'
diff --git a/comms/cqrlog/files/patch-src_dData.lrs b/comms/cqrlog/files/patch-src_dData.lrs
new file mode 100644
index 000000000000..8db39a31ad0f
--- /dev/null
+++ b/comms/cqrlog/files/patch-src_dData.lrs
@@ -0,0 +1,11 @@
+--- src/dData.lrs.orig	2014-10-03 12:37:57.000000000 -0700
++++ src/dData.lrs	2014-12-20 19:41:40.000000000 -0800
+@@ -38,7 +38,7 @@
+   +'ARY KEY,'#6'&            pref VARCHAR(20) NOT NULL,'#6'''            name V'
+   +'ARCHAR(100) NOT NULL,'#6'%            cont VARCHAR(6) NOT NULL,'#6'$       '
+   +'     utc VARCHAR(12)NOT NULL,'#6'%            lat VARCHAR(10) NOT NULL,'#6
+-  +'(            longit VARCHAR(10) NOT NULL,'#6'%            itu VARCHAR(20) N'
++  +'(            longit VARCHAR(12) NOT NULL,'#6'%            itu VARCHAR(20) N'
+   +'OT NULL,'#6'%            waz VARCHAR(20) NOT NULL,'#6'-            adif SMA'
+   +'LLINT NOT NULL DEFAULT 0,'#6'/            deleted SMALLINT NOT NULL DEFAULT'
+   +' 0'#6#2');'#6'$CREATE INDEX pref ON dxcc_ref(pref);'#6'$CREATE INDEX adif O'
diff --git a/comms/cqrlog/files/patch-src_dUtils.pas b/comms/cqrlog/files/patch-src_dUtils.pas
index 6628f9c10936..e24156e3411a 100644
--- a/comms/cqrlog/files/patch-src_dUtils.pas
+++ b/comms/cqrlog/files/patch-src_dUtils.pas
@@ -1,20 +1,20 @@
---- src/dUtils.pas.orig	2014-06-30 23:37:31.000000000 -0700
-+++ src/dUtils.pas	2014-06-30 23:38:03.000000000 -0700
-@@ -2229,7 +2229,7 @@
-   proj   : String = '';
+--- src/dUtils.pas.orig	2014-10-03 12:37:57.000000000 -0700
++++ src/dUtils.pas	2014-12-20 18:13:35.000000000 -0800
+@@ -2380,7 +2380,7 @@
+   proj: string = '';
  begin
    Result := '';
--  Result := cqrini.ReadString('xplanet','path','/usr/bin/xplanet');
-+  Result := cqrini.ReadString('xplanet','path','%%LOCALBASE%%/bin/xplanet');
-   myloc  := cqrini.ReadString('Station','LOC','');
+-  Result := cqrini.ReadString('xplanet', 'path', '/usr/bin/xplanet');
++  Result := cqrini.ReadString('xplanet', 'path', '%%LOCALBASE%%/xplanet');
+   myloc := cqrini.ReadString('Station', 'LOC', '');
    if not FileExists(Result) then
    begin
-@@ -2502,7 +2502,7 @@
+@@ -2670,7 +2670,7 @@
    if Device = '' then
      exit;
  
--  cmd := cqrini.ReadString('TRX','Path','/usr/bin/rigctld');
-+  cmd := cqrini.ReadString('TRX','Path','%%LOCALBASE%%/bin/rigctld');
+-  cmd := cqrini.ReadString('TRX', 'Path', '/usr/bin/rigctld');
++  cmd := cqrini.ReadString('TRX', 'Path', '%%LOCALBASE%%/rigctld');
    if not FileExists(cmd) then
      exit;
-   cmd := cmd+' --model='+rigid;
+   cmd := cmd + ' --model=' + rigid;