- Update to 2.4.0

- Remove LAZARUS_NO_FLAVORS. Now cqrlog can be compiled with lazarus-qt5 interface
- Add CONFLICTS

PR:		243006
Approved by:	db

5 files changed, 99 insertions, 63 deletions

diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile
index 923036da5b8e..98c64bcd7993 100644
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	cqrlog
-PORTVERSION=	2.3.0
+PORTVERSION=	2.4.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
 CATEGORIES=	comms hamradio
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
@@ -38,10 +37,12 @@ MAKE_ENV+=	LAZBUILD_CMD="${LAZBUILD_CMD}" \
 
 NO_LAZBUILD=	yes
 LAZBUILD_ARGS=	-d --pcp=.
-LAZARUS_NO_FLAVORS=qt5
 INSTALLS_ICONS=	yes
 DOS2UNIX_WRKSRC=${WRKSRC}/src/synapse/
 
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
+qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
+
 post-extract:
 	@${RM} -r ${WRKSRC}/src/lnet/lib/openssl.pas
 
@@ -62,7 +63,8 @@ post-patch:
 	${REINPLACE_CMD} -e s!%%DATADIR%%!${DATADIR}!g \
 		${WRKSRC}/src/dData.pas ${WRKSRC}/src/fGrayline.pas
 	${REINPLACE_CMD} -e s!Linux!FreeBSD!g \
-		${WRKSRC}/src/fMain.lfm
+		${WRKSRC}/src/fMain.lfm ${WRKSRC}/src/fNewQSO.lfm \
+		${WRKSRC}/src/dUtils.pas
 	${REINPLACE_CMD} -e s!%%OPENSSLLIB%%!${OPENSSLLIB}!g \
 		${WRKSRC}/src/synapse/ssl_openssl_lib.pas
 	${RM} -r ${WRKSRC}/src/mysql
diff --git a/comms/cqrlog/distinfo b/comms/cqrlog/distinfo
index 6ed22cc88432..b872a2c31737 100644
--- a/comms/cqrlog/distinfo
+++ b/comms/cqrlog/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531274964
-SHA256 (ok2cqr-cqrlog-v2.3.0_GH0.tar.gz) = 59809b3fba42b17e3c50aaefe6fe57d593d847c9697ee6386ee4a64b6b04c483
-SIZE (ok2cqr-cqrlog-v2.3.0_GH0.tar.gz) = 10407716
+TIMESTAMP = 1577681574
+SHA256 (ok2cqr-cqrlog-v2.4.0_GH0.tar.gz) = f492839803f7fdbaed873308c169ae251e7b9e6c3eb232a20a5773fd0d9acecd
+SIZE (ok2cqr-cqrlog-v2.4.0_GH0.tar.gz) = 12361259
diff --git a/comms/cqrlog/files/patch-src_cqrlog.lpi b/comms/cqrlog/files/patch-src_cqrlog.lpi
index 179a6b048426..3df0209706d0 100644
--- a/comms/cqrlog/files/patch-src_cqrlog.lpi
+++ b/comms/cqrlog/files/patch-src_cqrlog.lpi
@@ -1,11 +1,20 @@
---- src/cqrlog.lpi.orig	2018-07-11 03:52:28 UTC
-+++ src/cqrlog.lpi
-@@ -35,7 +35,7 @@
+--- src/cqrlog.lpi	2019-10-27 07:21:10.000000000 -0500
++++ src/cqrlog.lpi	2019-12-29 23:56:25.793361000 -0500
+@@ -40,7 +40,7 @@
+     <RunParams>
        <local>
-         <FormatVersion Value="1"/>
-         <CommandLineParams Value="--DEBUG=1"/>
+         <CommandLineParams Value="--DEBUG=0"/>
 -        <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">
+@@ -53,7 +53,7 @@
+         <Mode0 Name="default">
+           <local>
+             <CommandLineParams Value="--DEBUG=0"/>
+-            <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.pas b/comms/cqrlog/files/patch-src_dData.pas
index b64a818df2a0..31eab9e5d2a8 100644
--- a/comms/cqrlog/files/patch-src_dData.pas
+++ b/comms/cqrlog/files/patch-src_dData.pas
@@ -1,63 +1,82 @@
---- src/dData.pas.orig	2018-06-17 12:42:42 UTC
-+++ src/dData.pas
-@@ -904,22 +904,22 @@ begin
+--- src/dData.pas	2019-10-27 07:21:10.000000000 -0500
++++ src/dData.pas	2019-12-31 11:49:17.753800000 -0500
+@@ -908,22 +908,22 @@
    if not DirectoryExistsUTF8(fHomeDir+'members') then
      CreateDirUTF8(fHomeDir+'members');
    fMembersDir := fHomeDir+'members'+PathDelim;
 -  fGlobalMembersDir := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+
-+  fGlobalMembersDir := ExpandFileNameUTF8('%%DATADIR%%'+PathDelim+'share'+PathDelim+'cqrlog'+
++  fGlobalMembersDir := ExpandFileNameUTF8('%%DATADIR%%'+
                         PathDelim+'members'+PathDelim);
  
    if DirectoryExistsUTF8(fHomeDir+'zipcodes') then
      fZipCodeDir := fHomeDir+'zipcodes'+PathDelim
    else
 -    fZipCodeDir := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog')+
-+    fZipCodeDir := ExpandFileNameUTF8('%%DATADIR%%'+PathDelim+'share'+PathDelim+'cqrlog')+
++    fZipCodeDir := ExpandFileNameUTF8('%%DATADIR%%')+
                     PathDelim+'zipcodes'+PathDelim;
  
    if not DirectoryExistsUTF8(fHomeDir+'images') then
      CreateDirUTF8(fHomeDir+'images');
  
 -  fHelpDir := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+
-+  fHelpDir := ExpandFileNameUTF8('%%DATADIR%%'+PathDelim+'share'+PathDelim+'cqrlog'+
++  fHelpDir := ExpandFileNameUTF8('%%DATADIR%%'+
                PathDelim+'help'+PathDelim);
  
 -  fShareDir := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+
-+  fShareDir := ExpandFileNameUTF8('%%DATADIR%%'+PathDelim+'share'+PathDelim+'cqrlog'+
++  fShareDir := ExpandFileNameUTF8('%%DATADIR%%'+
                 PathDelim);
  
    if not DirectoryExistsUTF8(fHomeDir + 'lotw') then
-@@ -942,7 +942,7 @@ procedure TdmData.PrepareCtyData;
+@@ -946,7 +946,7 @@
  var
    s,d : String;
  begin
 -  s := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+PathDelim+'ctyfiles'+PathDelim);
-+  s := ExpandFileNameUTF8('%%DATADIR%%'+PathDelim+'share'+PathDelim+'cqrlog'+PathDelim+'ctyfiles'+PathDelim);
++  s := ExpandFileNameUTF8('%%DATADIR%%'+PathDelim+'ctyfiles'+PathDelim);
    d := fHomeDir+'ctyfiles'+PathDelim;
  
    if not FileExistsUTF8(fHomeDir+'ctyfiles'+PathDelim+'AreaOK1RR.tbl') then
-@@ -1015,7 +1015,7 @@ procedure TdmData.PrepareXplanetDir;
+@@ -1019,7 +1019,7 @@
  var
    s,d : String;
  begin
 -  s := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+PathDelim+'xplanet'+PathDelim);
-+  s := ExpandFileNameUTF8('%%DATADIR%%'+PathDelim+'share'+PathDelim+'cqrlog'+PathDelim+'xplanet'+PathDelim);
++  s := ExpandFileNameUTF8('%%DATADIR%%'+PathDelim+'xplanet'+PathDelim);
    d := fHomeDir+'xplanet'+PathDelim;
    if not FileExistsUTF8(d+'geoconfig') then
      CopyFile(s+'geoconfig',d+'geoconfig')
-@@ -1025,7 +1025,7 @@ procedure TdmData.PrepareVoice_keyerDir;
+@@ -1029,7 +1029,7 @@
  var
    s,d : String;
  begin
 -  s := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+PathDelim+'voice_keyer'+PathDelim);
-+  s := ExpandFileNameUTF8('%%DATADIR%%'+PathDelim+'share'+PathDelim+'cqrlog'+PathDelim+'voice_keyer'+PathDelim);
++  s := ExpandFileNameUTF8('%%DATADIR%%'+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')
-@@ -3367,12 +3367,12 @@ var
-   l : TStringList;
-   info : String;
- begin
+@@ -1096,15 +1096,15 @@
+   AProcess := TProcess.Create(nil);
+   AStringList := TStringList.Create;
+   Try
+-  AProcess.Executable := 'cat';
+-  AProcess.Parameters.Add('/proc/version');
++  AProcess.Executable := 'uname';
++  AProcess.Parameters.Add('-srm');
+   AProcess.Options := AProcess.Options + [poWaitOnExit, poUsePipes];
+   AProcess.Execute;
+   AStringList.LoadFromStream(AProcess.Output);
+   for i:=0 to pred(AStringList.Count) do
+     writeln(AStringList[i]);
+   except
+-    writeln('Could not get Linux version! [tried: cat /proc/version]');
++    writeln('Could not get FreeBSD version! [tried: uname -srm]');
+   end;
+   AStringList.Free;
+   AProcess.Free;
+@@ -3240,12 +3240,12 @@
+   Writeln(ExtractFilePath(Paramstr(0))  + 'mysqld');
+   if FileExistsUTF8(ExtractFilePath(Paramstr(0))  + 'mysqld') then
+     Result := ExtractFilePath(Paramstr(0))  + 'mysqld';
 -  if FileExistsUTF8('/usr/bin/mysqld') then
 -    Result := '/usr/bin/mysqld';
 -  if FileExistsUTF8('/usr/bin/mysqld_safe') then //Fedora
@@ -73,30 +92,3 @@
    if Result = '' then  //don't know where mysqld is, so hopefully will be in  $PATH
      Result := 'mysqld'
  end;
-@@ -4209,22 +4209,13 @@ begin
-   Result := '';
-   Paths := TStringList.Create;
-   try
--    Paths.Add('/usr/lib64/');
--    Paths.Add('/lib64/');
--    Paths.Add('/usr/lib/x86_64-linux-gnu/');
--    Paths.Add('/usr/lib64/mysql/');
--    Paths.Add('/lib/x86_64-linux-gnu/');
--
--    Paths.Add('/usr/lib/i386-linux-gnu/');
--    Paths.Add('/lib/i386-linux-gnu/');
--    Paths.Add('/usr/lib/');
--    Paths.Add('/lib/');
--    Paths.Add('/usr/lib/mysql/');
-+    Paths.Add('%%LOCALBASE%%/lib/mysql/');
-+    Paths.Add('%%LOCALBASE%%/lib/');
- 
--    Result := MyFindFile('libmariadbclient.so*', Paths);
-+    Result := MyFindFile('libmariadbclient.so', Paths);
-     if (Result='') then
-     begin
--      Result := MyFindFile('libmysqlclient.so*', Paths)
-+      Result := MyFindFile('libmysqlclient.so', Paths)
-     end
-   finally
-     FreeAndNil(Paths)
diff --git a/comms/cqrlog/pkg-plist b/comms/cqrlog/pkg-plist
index 23287671c5bb..2311bef6eb48 100644
--- a/comms/cqrlog/pkg-plist
+++ b/comms/cqrlog/pkg-plist
@@ -7,6 +7,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/ctyfiles/Ambiguous.tbl
 %%DATADIR%%/ctyfiles/AreaOK1RR.tbl
 %%DATADIR%%/ctyfiles/CallResolution.tbl
+%%DATADIR%%/ctyfiles/ContestName.tab
 %%DATADIR%%/ctyfiles/Country.tab
 %%DATADIR%%/ctyfiles/CountryDel.tab
 %%DATADIR%%/ctyfiles/Exceptions.tab
@@ -21,9 +22,14 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/ctyfiles/us_states.tab
 %%DATADIR%%/help/contest.html
 %%DATADIR%%/help/cwd.html
+%%DATADIR%%/help/cwd.html.bak
+%%DATADIR%%/help/cwd.html.orig
 %%DATADIR%%/help/cwh.html
 %%DATADIR%%/help/fldxml.html
+%%DATADIR%%/help/gridmap.html
 %%DATADIR%%/help/h1.html
+%%DATADIR%%/help/h1.html.bak
+%%DATADIR%%/help/h1.html.orig
 %%DATADIR%%/help/h20.html
 %%DATADIR%%/help/h21.html
 %%DATADIR%%/help/h22.html
@@ -34,8 +40,8 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/h27.html
 %%DATADIR%%/help/h28.html
 %%DATADIR%%/help/h29.html
-%%DATADIR%%/help/h30.html
 %%DATADIR%%/help/h3.html
+%%DATADIR%%/help/h30.html
 %%DATADIR%%/help/h4.html
 %%DATADIR%%/help/h5.html
 %%DATADIR%%/help/h6.html
@@ -50,10 +56,14 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/img/fxml5.png
 %%DATADIR%%/help/img/fxml8.png
 %%DATADIR%%/help/img/fxml9.png
+%%DATADIR%%/help/img/gm1.png
+%%DATADIR%%/help/img/gm2.png
+%%DATADIR%%/help/img/gm3.png
 %%DATADIR%%/help/img/h1.png
 %%DATADIR%%/help/img/h10.png
 %%DATADIR%%/help/img/h100.png
 %%DATADIR%%/help/img/h101.png
+%%DATADIR%%/help/img/h101b.png
 %%DATADIR%%/help/img/h102.png
 %%DATADIR%%/help/img/h103.png
 %%DATADIR%%/help/img/h104.png
@@ -64,9 +74,6 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/img/h109.png
 %%DATADIR%%/help/img/h11.png
 %%DATADIR%%/help/img/h110.png
-%%DATADIR%%/help/img/h117.png
-%%DATADIR%%/help/img/h118.png
-%%DATADIR%%/help/img/h165.png
 %%DATADIR%%/help/img/h111.png
 %%DATADIR%%/help/img/h1112.png
 %%DATADIR%%/help/img/h1114.png
@@ -76,11 +83,18 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/img/h114.png
 %%DATADIR%%/help/img/h115.png
 %%DATADIR%%/help/img/h116.png
+%%DATADIR%%/help/img/h117.png
+%%DATADIR%%/help/img/h118.png
+%%DATADIR%%/help/img/h119.png
 %%DATADIR%%/help/img/h12.png
+%%DATADIR%%/help/img/h120.png
+%%DATADIR%%/help/img/h121.png
+%%DATADIR%%/help/img/h122.png
 %%DATADIR%%/help/img/h13.png
 %%DATADIR%%/help/img/h14.png
 %%DATADIR%%/help/img/h15.png
 %%DATADIR%%/help/img/h16.png
+%%DATADIR%%/help/img/h165.png
 %%DATADIR%%/help/img/h17.png
 %%DATADIR%%/help/img/h18.png
 %%DATADIR%%/help/img/h19.png
@@ -113,6 +127,10 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/img/h43.png
 %%DATADIR%%/help/img/h44.png
 %%DATADIR%%/help/img/h45.png
+%%DATADIR%%/help/img/h45b.png
+%%DATADIR%%/help/img/h45c.png
+%%DATADIR%%/help/img/h45d.png
+%%DATADIR%%/help/img/h45e.png
 %%DATADIR%%/help/img/h46.png
 %%DATADIR%%/help/img/h47.png
 %%DATADIR%%/help/img/h48.png
@@ -141,6 +159,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/img/h69.png
 %%DATADIR%%/help/img/h7.png
 %%DATADIR%%/help/img/h70.png
+%%DATADIR%%/help/img/h70b.png
 %%DATADIR%%/help/img/h71.png
 %%DATADIR%%/help/img/h72.png
 %%DATADIR%%/help/img/h73.png
@@ -172,6 +191,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/img/h97.png
 %%DATADIR%%/help/img/h98.png
 %%DATADIR%%/help/img/h99.png
+%%DATADIR%%/help/img/h9b.png
 %%DATADIR%%/help/img/line.png
 %%DATADIR%%/help/img/misc12.png
 %%DATADIR%%/help/img/misc13.png
@@ -184,8 +204,11 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/img/misc44.png
 %%DATADIR%%/help/img/misc5.png
 %%DATADIR%%/help/img/misc8.png
+%%DATADIR%%/help/img/n1mm1.png
+%%DATADIR%%/help/img/n1mm2.png
+%%DATADIR%%/help/img/n1mm3.png
 %%DATADIR%%/help/img/note.png
-%%DATADIR%%/help/img/radio_memory.png
+%%DATADIR%%/help/img/setting_rigctld_for_all_programs.pdf
 %%DATADIR%%/help/img/wkdgrid10.png
 %%DATADIR%%/help/img/wkdgrid11.png
 %%DATADIR%%/help/img/wkdgrid9.png
@@ -212,6 +235,9 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/img/wsjt36.png
 %%DATADIR%%/help/img/wsjt4.png
 %%DATADIR%%/help/index.html
+%%DATADIR%%/help/index_left.html
+%%DATADIR%%/help/index_right.html
+%%DATADIR%%/help/n1mm.html
 %%DATADIR%%/help/remi.html
 %%DATADIR%%/help/sql_console.html
 %%DATADIR%%/help/wkdgrid.html
@@ -219,6 +245,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/wsjt.html
 %%DATADIR%%/images/BigEarth.bmp
 %%DATADIR%%/images/HamQTH.png
+%%DATADIR%%/images/attach.png
 %%DATADIR%%/images/bck.png
 %%DATADIR%%/images/connect.png
 %%DATADIR%%/images/cqrlog.png
@@ -267,8 +294,8 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/members/599dxa.txt
 %%DATADIR%%/members/9acwg.txt
 %%DATADIR%%/members/a1-club.txt
-%%DATADIR%%/members/a1a-ea.txt
 %%DATADIR%%/members/a1-op.txt
+%%DATADIR%%/members/a1a-ea.txt
 %%DATADIR%%/members/afm.txt
 %%DATADIR%%/members/agb.txt
 %%DATADIR%%/members/agcw.txt
@@ -280,6 +307,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/members/bmars.txt
 %%DATADIR%%/members/bscc.txt
 %%DATADIR%%/members/btc.txt
+%%DATADIR%%/members/bug.txt
 %%DATADIR%%/members/cav.txt
 %%DATADIR%%/members/cct.txt
 %%DATADIR%%/members/cdxc.txt
@@ -295,6 +323,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/members/dig.txt
 %%DATADIR%%/members/dmc.txt
 %%DATADIR%%/members/dtc.txt
+%%DATADIR%%/members/ecwarc.txt
 %%DATADIR%%/members/ehsc.txt
 %%DATADIR%%/members/epc.txt
 %%DATADIR%%/members/ffr.txt
@@ -303,6 +332,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/members/fists.txt
 %%DATADIR%%/members/fmc.txt
 %%DATADIR%%/members/fnars.txt
+%%DATADIR%%/members/fo.txt
 %%DATADIR%%/members/foc.txt
 %%DATADIR%%/members/foc_names.txt
 %%DATADIR%%/members/fog.txt
@@ -318,9 +348,9 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/members/hhc.txt
 %%DATADIR%%/members/hsc.txt
 %%DATADIR%%/members/htc.txt
-%%DATADIR%%/members/kdr.txt
 %%DATADIR%%/members/inorc.txt
 %%DATADIR%%/members/jaig.txt
+%%DATADIR%%/members/kdr.txt
 %%DATADIR%%/members/lcc.txt
 %%DATADIR%%/members/lids.txt
 %%DATADIR%%/members/marac.txt
@@ -333,11 +363,13 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/members/mfca.txt
 %%DATADIR%%/members/naqcc.txt
 %%DATADIR%%/members/nra.txt
+%%DATADIR%%/members/nrr.txt
 %%DATADIR%%/members/okdxc.txt
 %%DATADIR%%/members/okdxf.txt
 %%DATADIR%%/members/okqrp.txt
 %%DATADIR%%/members/omiss.txt
 %%DATADIR%%/members/ootc.txt
+%%DATADIR%%/members/opnames.txt
 %%DATADIR%%/members/otc-sara.txt
 %%DATADIR%%/members/prc.txt
 %%DATADIR%%/members/prl.txt
@@ -366,6 +398,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/members/tenten.txt
 %%DATADIR%%/members/tfc.txt
 %%DATADIR%%/members/trc.txt
+%%DATADIR%%/members/trn.txt
 %%DATADIR%%/members/udxc.txt
 %%DATADIR%%/members/uft.txt
 %%DATADIR%%/members/uksmg.txt