Update to latest release

Remove expansion of lat/lon field as upstream says it will never be
necessary again.

23 files changed, 160 insertions, 140 deletions

diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile
index 3af4f2d73871..9fc4a38bbc4d 100644
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cqrlog
-PORTVERSION=	1.9.1
-PORTREVISION=	1
+PORTVERSION=	2.0.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	comms hamradio
 
@@ -56,7 +55,11 @@ post-patch:
 		${WRKSRC}/src/dData.pas ${WRKSRC}/src/dUtils.pas \
 		${WRKSRC}/src/fLoTWExport.pas ${WRKSRC}/src/fPreferences.pas \
 		${WRKSRC}/src/fRotControl.pas ${WRKSRC}/src/fTRXControl.pas \
-		${WRKSRC}/src/fGrayline.pas
+		${WRKSRC}/src/fGrayline.pas ${WRKSRC}/help/cwd.html \
+		${WRKSRC}/help/h1.html ${WRKSRC}/src/fPreferences.pas \
+		${WRKSRC}/src/fLoTWExport.lrs ${WRKSRC}/src/fPreferences.lfm \
+		${WRKSRC}/src/fPreferences.lrs ${WRKSRC}/src/fLoTWExport.lfm \
+		${WRKSRC}/src/cqrlog.lpi
 	${REINPLACE_CMD} -e s!%%PREFIX%%!${PREFIX}!g \
 		${WRKSRC}/src/dData.pas ${WRKSRC}/src/fGrayline.pas
 	${REINPLACE_CMD} -e s!%%LAZARUSDIR%%!${LAZARUS_DIR}!g \
diff --git a/comms/cqrlog/distinfo b/comms/cqrlog/distinfo
index f4933a52681d..59dadc399ea4 100644
--- a/comms/cqrlog/distinfo
+++ b/comms/cqrlog/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ok2cqr-cqrlog-v1.9.1_GH0.tar.gz) = 3df51aecb6745854fa1812d488c74c5855927d082f06f469187389bd0fbcdf20
-SIZE (ok2cqr-cqrlog-v1.9.1_GH0.tar.gz) = 7354976
+SHA256 (ok2cqr-cqrlog-v2.0.0_GH0.tar.gz) = f3c324b3cdb9f0c7a8e9efea05a1776854a0ca4707da52a2dfe99fce251bf860
+SIZE (ok2cqr-cqrlog-v2.0.0_GH0.tar.gz) = 7894125
diff --git a/comms/cqrlog/files/patch-Makefile b/comms/cqrlog/files/patch-Makefile
index 8bf345573e65..cfdf3c99e1af 100644
--- a/comms/cqrlog/files/patch-Makefile
+++ b/comms/cqrlog/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2015-11-28 17:28:12.000000000 -0500
-+++ Makefile	2016-03-17 12:05:09.138035000 -0500
+--- Makefile.orig	2016-04-20 16:06:15 UTC
++++ Makefile
 @@ -1,12 +1,13 @@
 -CC=lazbuild
 +CC=lazbuild -d
@@ -19,7 +19,7 @@
  	$(ST) src/cqrlog
  	gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
  
-@@ -30,7 +31,7 @@
+@@ -30,7 +31,7 @@ install:
  	install -d -v         $(sharedir)/pixmaps/cqrlog
  	install -d -v         $(sharedir)/icons
  	install -d -v         $(sharedir)/applications
@@ -28,7 +28,7 @@
  	install    -v -m 0755 src/cqrlog $(bindir)
  	install    -v -m 0755 tools/cqrlog-apparmor-fix $(datadir)/cqrlog-apparmor-fix
  	install    -v -m 0644 ctyfiles/* $(datadir)/ctyfiles/
-@@ -47,7 +48,7 @@
+@@ -47,7 +48,7 @@ install:
  	install    -v -m 0644 images/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png
  	install    -v -m 0644 images/cqrlog.png $(sharedir)/icons/cqrlog.png  
  	install    -v -m 0644 src/changelog.html $(datadir)/changelog.html
diff --git a/comms/cqrlog/files/patch-help_cwd.html b/comms/cqrlog/files/patch-help_cwd.html
new file mode 100644
index 000000000000..e78329a03e1f
--- /dev/null
+++ b/comms/cqrlog/files/patch-help_cwd.html
@@ -0,0 +1,11 @@
+--- help/cwd.html.orig	2016-04-20 16:06:15 UTC
++++ help/cwd.html
+@@ -88,7 +88,7 @@ echo "starting cwdaemon" 
+ # rmmod lp 
+ cd /dev 
+ mknod -m 0660 parport0 c 99 0 
+-/usr/local/sbin/cwdaemon -x n </pre>
++%%LOCALBASE%%/sbin/cwdaemon -x n </pre>
+ 
+ Remember the cwdaemon options:<br><br>
+ <img src="img/cwdaem.png"><br><br>
diff --git a/comms/cqrlog/files/patch-help_h1.html b/comms/cqrlog/files/patch-help_h1.html
new file mode 100644
index 000000000000..8ca2d51991cd
--- /dev/null
+++ b/comms/cqrlog/files/patch-help_h1.html
@@ -0,0 +1,11 @@
+--- help/h1.html.orig	2016-04-24 21:16:09 UTC
++++ help/h1.html
+@@ -401,7 +401,7 @@ There are no known dependencies issues.<
+     <pre>/usr/local/bin/xplanet</pre>
+     is OK in most cases for installation from sources,
+     the usual path for installation from precompiled packages is
+-    <pre>/usr/bin/xplanet</pre>
++    <pre>%%LOCALBASE%%/bin/xplanet</pre>
+     Adjust the <strong>window size</strong> (remember to set up a square, ie. 400x400,
+     300x300 etc. to avoid strange effects). Also, the <strong>window position</strong>
+     must be set up to create a nice looking screen. Use the <strong>Test it!</strong>
diff --git a/comms/cqrlog/files/patch-src-lnet-lib_lcommon.pp b/comms/cqrlog/files/patch-src-lnet-lib_lcommon.pp
deleted file mode 100644
index f6661d72f129..000000000000
--- a/comms/cqrlog/files/patch-src-lnet-lib_lcommon.pp
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/lnet/lib/lcommon.pp	2016-03-17 12:36:41.744524000 -0500
-+++ src/lnet/lib/lcommon.pp	2016-03-17 12:37:31.449533000 -0500
-@@ -512,15 +512,15 @@
- procedure FillAddressInfo(var aAddrInfo: TLSocketAddress; const aFamily: sa_family_t;
-   const Address: string; const aPort: Word);
- begin
--  aAddrInfo.IPv4.family := aFamily;
--  aAddrInfo.IPv4.Port := htons(aPort);
-+  aAddrInfo.IPv4.sin_family := aFamily;
-+  aAddrInfo.IPv4.sin_port := htons(aPort);
- 
-   case aFamily of
-     LAF_INET  :
-       begin
--        aAddrInfo.IPv4.Addr := StrToNetAddr(Address);
--        if (Address <> LADDR_ANY) and (aAddrInfo.IPv4.Addr = 0) then
--          aAddrInfo.IPv4.Addr := StrToNetAddr(GetHostIP(Address));
-+        aAddrInfo.IPv4.sin_addr.s_addr := StrToNetAddr(Address);
-+        if (Address <> LADDR_ANY) and (aAddrInfo.IPv4.sin_addr.s_addr = 0) then
-+          aAddrInfo.IPv4.sin_addr.s_addr := StrToNetAddr(GetHostIP(Address));
-       end;
-     LAF_INET6 :
-       begin
diff --git a/comms/cqrlog/files/patch-src_cqrlog.lpi b/comms/cqrlog/files/patch-src_cqrlog.lpi
new file mode 100644
index 000000000000..9c5f05f40149
--- /dev/null
+++ b/comms/cqrlog/files/patch-src_cqrlog.lpi
@@ -0,0 +1,11 @@
+--- src/cqrlog.lpi.orig	2016-04-20 16:06:15 UTC
++++ src/cqrlog.lpi
+@@ -32,7 +32,7 @@
+       <local>
+         <FormatVersion Value="1"/>
+         <CommandLineParams Value="--DEBUG=1"/>
+-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
++        <LaunchingApplication PathPlusParams="%%LOCALBASE%%/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+       </local>
+       <environment>
+         <UserOverrides Count="2">
diff --git a/comms/cqrlog/files/patch-src_dData.lfm b/comms/cqrlog/files/patch-src_dData.lfm
deleted file mode 100644
index 09f8e96b8f9c..000000000000
--- a/comms/cqrlog/files/patch-src_dData.lfm
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dData.lfm.orig	2015-03-04 15:17:21 UTC
-+++ src/dData.lfm
-@@ -113,7 +113,7 @@ object dmData: TdmData
-       '            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
deleted file mode 100644
index 9d205b044a38..000000000000
--- a/comms/cqrlog/files/patch-src_dData.lrs
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dData.lrs.orig	2015-03-04 15:17:21 UTC
-+++ src/dData.lrs
-@@ -38,7 +38,7 @@ LazarusResources.Add('TdmData','FORMDATA
-   +'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_dData.pas b/comms/cqrlog/files/patch-src_dData.pas
index b58b09bd6f9c..1e204abca941 100644
--- a/comms/cqrlog/files/patch-src_dData.pas
+++ b/comms/cqrlog/files/patch-src_dData.pas
@@ -1,65 +1,40 @@
---- src/dData.pas.orig	2015-03-04 15:17:21 UTC
+--- src/dData.pas.orig	2016-04-20 16:06:15 UTC
 +++ src/dData.pas
-@@ -911,22 +911,22 @@ begin
-   if DirectoryExistsUTF8(fHomeDir+'members') then
-     fMembersDir := fHomeDir+'members'+PathDelim
-   else
--    fMembersDir := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+
-+    fMembersDir := ExpandFileNameUTF8('%%PREFIX%%'+PathDelim+'share'+PathDelim+'cqrlog'+
-                    PathDelim+'members'+PathDelim);
+@@ -1278,12 +1278,12 @@ begin
  
-   if DirectoryExistsUTF8(fHomeDir+'zipcodes') then
-     fZipCodeDir := fHomeDir+'zipcodes'+PathDelim
-   else
--    fZipCodeDir := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog')+
-+    fZipCodeDir := ExpandFileNameUTF8('%%PREFIX%%'+PathDelim+'share'+PathDelim+'cqrlog')+
-                    PathDelim+'zipcodes'+PathDelim;
+   {
  
-   if not DirectoryExistsUTF8(fHomeDir+'images') then
-     CreateDirUTF8(fHomeDir+'images');
+-  if FileExistsUTF8('/usr/bin/mysqld') then
+-    mysqld := '/usr/bin/mysqld';
+-  if FileExistsUTF8('/usr/bin/mysqld_safe') then //Fedora
+-    mysqld := '/usr/bin/mysqld_safe';
+-  if FileExistsUTF8('/usr/sbin/mysqld') then //openSUSE
+-    mysqld := '/usr/sbin/mysqld';
++  if FileExistsUTF8('%%LOCALBASE%%/bin/mysqld') then
++    mysqld := '%%LOCALBASE%%/bin/mysqld';
++  if FileExistsUTF8('%%LOCALBASE%%/bin/mysqld_safe') then //Fedora
++    mysqld := '%%LOCALBASE%%/bin/mysqld_safe';
++  if FileExistsUTF8('%%LOCALBASE%%/sbin/mysqld') then //openSUSE
++    mysqld := '%%LOCALBASE%%/sbin/mysqld';
+   if mysqld = '' then  //don't know where mysqld is, so hopefully will be in  $PATH
+     mysqld := 'mysqld';
  
--  fHelpDir := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+
-+  fHelpDir := ExpandFileNameUTF8('%%PREFIX%%'+PathDelim+'share'+PathDelim+'cqrlog'+
-               PathDelim+'help'+PathDelim);
- 
--  fShareDir := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+
-+  fShareDir := ExpandFileNameUTF8('%%PREFIX%%'+PathDelim+'share'+PathDelim+'cqrlog'+
-                PathDelim);
- 
-   if not DirectoryExistsUTF8(fHomeDir + 'lotw') then
-@@ -949,7 +949,7 @@ procedure TdmData.PrepareCtyData;
- var
-   s,d : String;
- begin
--  s := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+PathDelim+'ctyfiles'+PathDelim);
-+  s := ExpandFileNameUTF8('%%PREFIX%%'+PathDelim+'share'+PathDelim+'cqrlog'+PathDelim+'ctyfiles'+PathDelim);
-   d := fHomeDir+'ctyfiles'+PathDelim;
- 
-   if not FileExistsUTF8(fHomeDir+'ctyfiles'+PathDelim+'AreaOK1RR.tbl') then
-@@ -1013,7 +1013,7 @@ procedure TdmData.PrepareXplanetDir;
- var
-   s,d : String;
- begin
--  s := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+PathDelim+'xplanet'+PathDelim);
-+  s := ExpandFileNameUTF8('%%LOCALBASE%%'+PathDelim+'share'+PathDelim+'cqrlog'+PathDelim+'xplanet'+PathDelim);
-   d := fHomeDir+'xplanet'+PathDelim;
-   if not FileExistsUTF8(d+'geoconfig') then
-     CopyFile(s+'geoconfig',d+'geoconfig')
-@@ -1023,7 +1023,7 @@ procedure TdmData.PrepareVoice_keyerDir;
- var
-   s,d : String;
+@@ -3452,12 +3452,12 @@ var
+   l : TStringList;
+   info : String;
  begin
--  s := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+PathDelim+'voice_keyer'+PathDelim);
-+  s := ExpandFileNameUTF8('%%PREFIX%%'+PathDelim+'share'+PathDelim+'cqrlog'+PathDelim+'voice_keyer'+PathDelim);
-   d := fHomeDir+'voice_keyer'+PathDelim;
-   if not FileExistsUTF8(d+'voice_keyer.sh') then
-     CopyFile(s+'voice_keyer.sh',d+'voice_keyer.sh')
-@@ -1122,7 +1122,7 @@ begin
-   if lib <> '' then
-     fDLLUtilName := lib;
- 
--  lib := FindLib('/usr/lib64/','libmysqlclient.so*');
-+  lib := FindLib('%%LOCALBASE%%/lib/','libmysqlclient.so*');
-   if (lib = '') then
-     lib := FindLib('/lib64/','libmysqlclient.so*');
-   if (lib='') then
+-  if FileExistsUTF8('/usr/bin/mysqld') then
+-    Result := '/usr/bin/mysqld';
+-  if FileExistsUTF8('/usr/bin/mysqld_safe') then //Fedora
+-    Result := '/usr/bin/mysqld_safe';
+-  if FileExistsUTF8('/usr/sbin/mysqld') then //openSUSE
+-    Result := '/usr/sbin/mysqld';
++  if FileExistsUTF8('%%LOCALBASE%%/bin/mysqld') then
++    Result := '%%LOCALBASE%%/bin/mysqld';
++  if FileExistsUTF8('%%LOCALBASE%%/bin/mysqld_safe') then //Fedora
++    Result := '%%LOCALBASE%%/bin/mysqld_safe';
++  if FileExistsUTF8('%%LOCALBASE%%/sbin/mysqld') then //openSUSE
++    Result := '%%LOCALBASE%%/sbin/mysqld';
+   if Result = '' then  //don't know where mysqld is, so hopefully will be in  $PATH
+     Result := 'mysqld'
+ end;
diff --git a/comms/cqrlog/files/patch-src_dUtils.pas b/comms/cqrlog/files/patch-src_dUtils.pas
index c38a12b90071..48deee51f1e3 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	2015-03-04 15:17:21 UTC
+--- src/dUtils.pas.orig	2016-04-20 16:06:15 UTC
 +++ src/dUtils.pas
-@@ -2381,7 +2381,7 @@ var
+@@ -2394,7 +2394,7 @@ var
    proj: string = '';
  begin
    Result := '';
 -  Result := cqrini.ReadString('xplanet', 'path', '/usr/bin/xplanet');
-+  Result := cqrini.ReadString('xplanet', 'path', '%%LOCALBASE%%/xplanet');
++  Result := cqrini.ReadString('xplanet', 'path', '%%LOCALBASE%%/bin/xplanet');
    myloc := cqrini.ReadString('Station', 'LOC', '');
    if not FileExists(Result) then
    begin
-@@ -2671,7 +2671,7 @@ begin
+@@ -2684,7 +2684,7 @@ begin
    if Device = '' then
      exit;
  
 -  cmd := cqrini.ReadString('TRX', 'Path', '/usr/bin/rigctld');
-+  cmd := cqrini.ReadString('TRX', 'Path', '%%LOCALBASE%%/rigctld');
++  cmd := cqrini.ReadString('TRX', 'Path', '%%LOCALBASE%%/bin/rigctld');
    if not FileExists(cmd) then
      exit;
    cmd := cmd + ' --model=' + rigid;
diff --git a/comms/cqrlog/files/patch-src_fGrayline.pas b/comms/cqrlog/files/patch-src_fGrayline.pas
index ee741c2c7be7..803d1af51b54 100644
--- a/comms/cqrlog/files/patch-src_fGrayline.pas
+++ b/comms/cqrlog/files/patch-src_fGrayline.pas
@@ -1,4 +1,4 @@
---- src/fGrayline.pas.orig	2015-03-04 15:17:21 UTC
+--- src/fGrayline.pas.orig	2016-04-20 16:06:15 UTC
 +++ src/fGrayline.pas
 @@ -383,7 +383,7 @@ begin
      RBNSpotList[i].band := '';
diff --git a/comms/cqrlog/files/patch-src_fLoTWExport.lfm b/comms/cqrlog/files/patch-src_fLoTWExport.lfm
new file mode 100644
index 000000000000..a0d0fce9d6ef
--- /dev/null
+++ b/comms/cqrlog/files/patch-src_fLoTWExport.lfm
@@ -0,0 +1,11 @@
+--- src/fLoTWExport.lfm.orig	2016-04-20 16:06:15 UTC
++++ src/fLoTWExport.lfm
+@@ -182,7 +182,7 @@ object frmLoTWExport: TfrmLoTWExport
+           Top = 29
+           Width = 424
+           TabOrder = 0
+-          Text = '/usr/bin/tqsl -d -l "your qth name" %f -x'
++          Text = '%%LOCALBASE%%/bin/tqsl -d -l "your qth name" %f -x'
+         end
+       end
+       object GroupBox6: TGroupBox
diff --git a/comms/cqrlog/files/patch-src_fLoTWExport.lrs b/comms/cqrlog/files/patch-src_fLoTWExport.lrs
new file mode 100644
index 000000000000..50407f4b19cf
--- /dev/null
+++ b/comms/cqrlog/files/patch-src_fLoTWExport.lrs
@@ -0,0 +1,11 @@
+--- src/fLoTWExport.lrs.orig	2016-04-20 16:06:15 UTC
++++ src/fLoTWExport.lrs
+@@ -50,7 +50,7 @@ LazarusResources.Add('TfrmLoTWExport','F
+   +#2'8'#5'Width'#3'7'#1#7'Caption'#6'I"your qth name" means the qth which you '
+   +'have '#10'defined in tqsl QTH profile'#11'ParentColor'#8#0#0#5'TEdit'#7'edt'
+   +'Tqsl'#4'Left'#2#14#6'Height'#2#27#3'Top'#2#29#5'Width'#3#168#1#8'TabOrder'#2
+-  +#0#4'Text'#6')/usr/bin/tqsl -d -l "your qth name" %f -x'#0#0#0#9'TGroupBox'#9
++  +#0#4'Text'#6')%%LOCALBASE%%/bin/tqsl -d -l "your qth name" %f -x'#0#0#0#9'TGroupBox'#9
+   +'GroupBox6'#4'Left'#2#0#6'Height'#3#6#1#3'Top'#3#216#0#5'Width'#3#217#1#5'Al'
+   +'ign'#7#8'alClient'#7'Caption'#6#8' Upload '#12'ClientHeight'#3#243#0#11'Cli'
+   +'entWidth'#3#213#1#8'TabOrder'#2#2#0#5'TMemo'#5'mStat'#4'Left'#2#0#6'Height'
diff --git a/comms/cqrlog/files/patch-src_fLoTWExport.pas b/comms/cqrlog/files/patch-src_fLoTWExport.pas
index e0f023d60177..87430a6bc940 100644
--- a/comms/cqrlog/files/patch-src_fLoTWExport.pas
+++ b/comms/cqrlog/files/patch-src_fLoTWExport.pas
@@ -1,4 +1,4 @@
---- src/fLoTWExport.pas.orig	2015-03-04 15:17:21 UTC
+--- src/fLoTWExport.pas.orig	2016-04-20 16:06:15 UTC
 +++ src/fLoTWExport.pas
 @@ -235,7 +235,7 @@ begin
    else begin
diff --git a/comms/cqrlog/files/patch-src_fPreferences.lfm b/comms/cqrlog/files/patch-src_fPreferences.lfm
new file mode 100644
index 000000000000..8e1adb7157c3
--- /dev/null
+++ b/comms/cqrlog/files/patch-src_fPreferences.lfm
@@ -0,0 +1,11 @@
+--- src/fPreferences.lfm.orig	2016-04-20 16:06:15 UTC
++++ src/fPreferences.lfm
+@@ -4428,7 +4428,7 @@ object frmPreferences: TfrmPreferences
+           Top = 15
+           Width = 432
+           TabOrder = 0
+-          Text = '/usr/bin/xplanet'
++          Text = '%%LOCALBASE%%/bin/xplanet'
+         end
+       end
+       object GroupBox22: TGroupBox
diff --git a/comms/cqrlog/files/patch-src_fPreferences.lrs b/comms/cqrlog/files/patch-src_fPreferences.lrs
new file mode 100644
index 000000000000..117209b169c9
--- /dev/null
+++ b/comms/cqrlog/files/patch-src_fPreferences.lrs
@@ -0,0 +1,11 @@
+--- src/fPreferences.lrs.orig	2016-04-20 16:06:15 UTC
++++ src/fPreferences.lrs
+@@ -1024,7 +1024,7 @@ LazarusResources.Add('TfrmPreferences','
+   +#2#14#6'Height'#2'Y'#3'Top'#2#11#5'Width'#3#9#2#7'Caption'#6#23' Path for th'
+   +'e xplanet  '#12'ClientHeight'#2'F'#11'ClientWidth'#3#5#2#8'TabOrder'#2#0#0#5
+   +'TEdit'#14'edtXplanetPath'#4'Left'#2#6#6'Height'#2#27#3'Top'#2#15#5'Width'#3
+-  +#176#1#8'TabOrder'#2#0#4'Text'#6#16'/usr/bin/xplanet'#0#0#0#9'TGroupBox'#10
++  +#176#1#8'TabOrder'#2#0#4'Text'#6#16'%%LOCALBASE%%/bin/xplanet'#0#0#0#9'TGroupBox'#10
+   ,'GroupBox22'#4'Left'#2#14#6'Height'#2'p'#3'Top'#2'k'#5'Width'#2'q'#7'Caption'
+   +#6#13' Window size '#12'ClientHeight'#2']'#11'ClientWidth'#2'm'#8'TabOrder'#2
+   +#1#0#6'TLabel'#7'Label66'#4'Left'#2#6#6'Height'#2#17#3'Top'#2#15#5'Width'#2
diff --git a/comms/cqrlog/files/patch-src_fPreferences.pas b/comms/cqrlog/files/patch-src_fPreferences.pas
index 1d6e52987653..02e51d89c777 100644
--- a/comms/cqrlog/files/patch-src_fPreferences.pas
+++ b/comms/cqrlog/files/patch-src_fPreferences.pas
@@ -1,24 +1,24 @@
---- src/fPreferences.pas.orig	2015-03-04 15:17:21 UTC
+--- src/fPreferences.pas.orig	2016-04-20 16:06:15 UTC
 +++ src/fPreferences.pas
-@@ -2582,7 +2582,7 @@ begin
+@@ -2506,7 +2506,7 @@ begin
    cb47GHz.Checked := cqrini.ReadBool('Bands', '47GHz', False);
    cb76GHz.Checked := cqrini.ReadBool('Bands', '76GHz', False);
  
 -  edtRigCtldPath.Text := cqrini.ReadString('TRX', 'RigCtldPath', '/usr/bin/rigctld');
 +  edtRigCtldPath.Text := cqrini.ReadString('TRX', 'RigCtldPath', '%%LOCALBASE%%/bin/rigctld');
+   chkTrxControlDebug.Checked := cqrini.ReadBool('TRX','Debug',False);
+   chkModeRelatedOnly.Checked := cqrini.ReadBool('TRX','MemModeRelated',False);
  
-   edtR1Device.Text := cqrini.ReadString('TRX1', 'device', '');
-   edtRigID1.Text := cqrini.ReadString('TRX1', 'model', '');
-@@ -2619,7 +2619,7 @@ begin
+@@ -2552,7 +2552,7 @@ begin
    cmbDTRR2.ItemIndex := cqrini.ReadInteger('TRX2', 'DTR', 0);
    cmbRTSR2.ItemIndex := cqrini.ReadInteger('TRX2', 'RTS', 0);
  
 -  edtRotCtldPath.Text := cqrini.ReadString('ROT', 'RotCtldPath', '/usr/bin/rotctld');
-+  edtRotCtldPath.Text := cqrini.ReadString('ROT', 'RotCtldPath', '%%LOCALBASE%%/bin/rotctld');
++  edtRotCtldPath.Text := cqrini.ReadString('ROT', 'RotCtldPath', '$$LOCALBASE%%/bin/rotctld');
  
    edtRot1Device.Text := cqrini.ReadString('ROT1', 'device', '');
    edtRot1ID.Text := cqrini.ReadString('ROT1', 'model', '');
-@@ -2844,7 +2844,7 @@ begin
+@@ -2701,7 +2701,7 @@ begin
    chkUseNewQSOFreqMode.Checked := cqrini.ReadBool('BandMap','UseNewQSOFreqMode',False);
    chkPlusToBandMap.Checked := cqrini.ReadBool('BandMap','PlusToBandMap',False);
  
diff --git a/comms/cqrlog/files/patch-src_fRotControl.pas b/comms/cqrlog/files/patch-src_fRotControl.pas
index d96e9427ea2e..7dbdd80b77d2 100644
--- a/comms/cqrlog/files/patch-src_fRotControl.pas
+++ b/comms/cqrlog/files/patch-src_fRotControl.pas
@@ -1,9 +1,9 @@
---- src/fRotControl.pas.orig	2015-03-04 15:17:21 UTC
+--- src/fRotControl.pas.orig	2016-04-20 16:06:15 UTC
 +++ src/fRotControl.pas
-@@ -137,7 +137,7 @@ begin
-     rotor.RotId := 1
-   else
-     rotor.RotId := id;
+@@ -149,7 +149,7 @@ begin
+   if not TryStrToInt(cqrini.ReadString('ROT'+n,'poll','500'),poll) then
+     poll := 500;
+ 
 -  rotor.RotCtldPath := cqrini.ReadString('ROT','RigCtldPath','/usr/bin/rotctld');
 +  rotor.RotCtldPath := cqrini.ReadString('ROT','RigCtldPath','%%LOCALBASE%%/bin/rotctld');
    rotor.RotCtldArgs := dmUtils.GetRotorRotCtldCommandLine(StrToInt(n));
diff --git a/comms/cqrlog/files/patch-src_fTRXControl.pas b/comms/cqrlog/files/patch-src_fTRXControl.pas
index f1a1e4de8a0e..84c67d3e547b 100644
--- a/comms/cqrlog/files/patch-src_fTRXControl.pas
+++ b/comms/cqrlog/files/patch-src_fTRXControl.pas
@@ -1,9 +1,9 @@
---- src/fTRXControl.pas.orig	2015-03-04 15:17:21 UTC
+--- src/fTRXControl.pas.orig	2016-04-20 16:06:15 UTC
 +++ src/fTRXControl.pas
-@@ -660,7 +660,7 @@ begin
-   else
-     radio.RigId := id;
-   //Writeln('huu4');
+@@ -749,7 +749,7 @@ begin
+   if not TryStrToInt(cqrini.ReadString('TRX'+n,'poll','500'),poll) then
+     poll := 500;
+ 
 -  radio.RigCtldPath := cqrini.ReadString('TRX','RigCtldPath','/usr/bin/rigctld');
 +  radio.RigCtldPath := cqrini.ReadString('TRX','RigCtldPath','%%LOCALBASE%%/bin/rigctld');
    radio.RigCtldArgs := dmUtils.GetRadioRigCtldCommandLine(StrToInt(n));
diff --git a/comms/cqrlog/files/patch-src_ssl__openssl__lib.pas b/comms/cqrlog/files/patch-src_ssl__openssl__lib.pas
index 92da3a15bd50..e1e66d989d61 100644
--- a/comms/cqrlog/files/patch-src_ssl__openssl__lib.pas
+++ b/comms/cqrlog/files/patch-src_ssl__openssl__lib.pas
@@ -1,4 +1,4 @@
---- src/ssl_openssl_lib.pas.orig	2015-03-04 15:17:21 UTC
+--- src/ssl_openssl_lib.pas.orig	2016-04-20 16:06:15 UTC
 +++ src/ssl_openssl_lib.pas
 @@ -86,7 +86,7 @@ uses
  
diff --git a/comms/cqrlog/files/patch-src_synaser.pas b/comms/cqrlog/files/patch-src_synaser.pas
index f270b45f2632..e8837eb7e65d 100644
--- a/comms/cqrlog/files/patch-src_synaser.pas
+++ b/comms/cqrlog/files/patch-src_synaser.pas
@@ -1,4 +1,4 @@
---- src/synaser.pas.orig	2015-03-04 15:17:21 UTC
+--- src/synaser.pas.orig	2016-04-20 16:06:15 UTC
 +++ src/synaser.pas
 @@ -302,7 +302,7 @@ type
      procedure DcbToTermios(const dcb: TDCB; var term: termios); virtual;
diff --git a/comms/cqrlog/pkg-plist b/comms/cqrlog/pkg-plist
index bde6a4dafdb5..a7640beb389e 100644
--- a/comms/cqrlog/pkg-plist
+++ b/comms/cqrlog/pkg-plist
@@ -14,6 +14,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/ctyfiles/iota.tbl
 %%DATADIR%%/ctyfiles/lotw1.txt
 %%DATADIR%%/ctyfiles/qslmgr.csv
+%%DATADIR%%/ctyfiles/us_states.tab
 %%DATADIR%%/help/cwd.html
 %%DATADIR%%/help/h1.html
 %%DATADIR%%/help/h20.html
@@ -155,6 +156,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/img/h99.png
 %%DATADIR%%/help/img/line.png
 %%DATADIR%%/help/img/note.png
+%%DATADIR%%/help/img/radio_memory.png
 %%DATADIR%%/help/index.html
 %%DATADIR%%/help/sql_console.html
 %%DATADIR%%/help/wkusb.html
@@ -199,16 +201,21 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/images/uses_eqsl.png
 %%DATADIR%%/images/view.png
 %%DATADIR%%/members/070-club.txt
+%%DATADIR%%/members/10-10.txt
+%%DATADIR%%/members/599dxa.txt
 %%DATADIR%%/members/9acwg.txt
 %%DATADIR%%/members/a1-club.txt
 %%DATADIR%%/members/a1-op.txt
 %%DATADIR%%/members/afm.txt
 %%DATADIR%%/members/agcw.txt
 %%DATADIR%%/members/arktika.txt
+%%DATADIR%%/members/arci.txt
 %%DATADIR%%/members/armi.txt
+%%DATADIR%%/members/aviaham.txt
 %%DATADIR%%/members/bcc.txt
 %%DATADIR%%/members/bmars.txt
 %%DATADIR%%/members/bscc.txt
+%%DATADIR%%/members/btc.txt
 %%DATADIR%%/members/cav.txt
 %%DATADIR%%/members/cct.txt
 %%DATADIR%%/members/cdxc.txt
@@ -235,6 +242,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/members/gacw.txt
 %%DATADIR%%/members/gdxf.txt
 %%DATADIR%%/members/gqrpc.txt
+%%DATADIR%%/members/gtc.txt
 %%DATADIR%%/members/hacwg.txt
 %%DATADIR%%/members/hh.txt
 %%DATADIR%%/members/hhc.txt
@@ -242,6 +250,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/members/htc.txt
 %%DATADIR%%/members/inorc.txt
 %%DATADIR%%/members/jaig.txt
+%%DATADIR%%/members/lids.txt
 %%DATADIR%%/members/marac.txt
 %%DATADIR%%/members/marconista.txt
 %%DATADIR%%/members/mcl.txt
@@ -272,6 +281,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/members/sdxg.txt
 %%DATADIR%%/members/shsc.txt
 %%DATADIR%%/members/skcc.txt
+%%DATADIR%%/members/soc.txt
 %%DATADIR%%/members/spar-rcc.txt
 %%DATADIR%%/members/spar.txt
 %%DATADIR%%/members/spcwc.txt