From owner-svn-ports-all@freebsd.org Sun Apr 24 21:29:35 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4D0D7B1BAE9; Sun, 24 Apr 2016 21:29:35 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C60918D7; Sun, 24 Apr 2016 21:29:34 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OLTY9p067547; Sun, 24 Apr 2016 21:29:34 GMT (envelope-from shurd@FreeBSD.org) Received: (from shurd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OLTW6i067525; Sun, 24 Apr 2016 21:29:32 GMT (envelope-from shurd@FreeBSD.org) Message-Id: <201604242129.u3OLTW6i067525@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: shurd set sender to shurd@FreeBSD.org using -f From: Stephen Hurd Date: Sun, 24 Apr 2016 21:29:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413961 - in head/comms/cqrlog: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 21:29:35 -0000 Author: shurd Date: Sun Apr 24 21:29:32 2016 New Revision: 413961 URL: https://svnweb.freebsd.org/changeset/ports/413961 Log: Update to latest release Remove expansion of lat/lon field as upstream says it will never be necessary again. Added: head/comms/cqrlog/files/patch-help_cwd.html (contents, props changed) head/comms/cqrlog/files/patch-help_h1.html (contents, props changed) head/comms/cqrlog/files/patch-src_cqrlog.lpi (contents, props changed) head/comms/cqrlog/files/patch-src_fLoTWExport.lfm (contents, props changed) head/comms/cqrlog/files/patch-src_fLoTWExport.lrs (contents, props changed) head/comms/cqrlog/files/patch-src_fPreferences.lfm (contents, props changed) head/comms/cqrlog/files/patch-src_fPreferences.lrs (contents, props changed) Deleted: head/comms/cqrlog/files/patch-src-lnet-lib_lcommon.pp head/comms/cqrlog/files/patch-src_dData.lfm head/comms/cqrlog/files/patch-src_dData.lrs Modified: head/comms/cqrlog/Makefile head/comms/cqrlog/distinfo head/comms/cqrlog/files/patch-Makefile head/comms/cqrlog/files/patch-src_dData.pas head/comms/cqrlog/files/patch-src_dUtils.pas head/comms/cqrlog/files/patch-src_fGrayline.pas head/comms/cqrlog/files/patch-src_fLoTWExport.pas head/comms/cqrlog/files/patch-src_fPreferences.pas head/comms/cqrlog/files/patch-src_fRotControl.pas head/comms/cqrlog/files/patch-src_fTRXControl.pas head/comms/cqrlog/files/patch-src_ssl__openssl__lib.pas head/comms/cqrlog/files/patch-src_synaser.pas head/comms/cqrlog/pkg-plist (contents, props changed) Modified: head/comms/cqrlog/Makefile ============================================================================== --- head/comms/cqrlog/Makefile Sun Apr 24 21:21:15 2016 (r413960) +++ head/comms/cqrlog/Makefile Sun Apr 24 21:29:32 2016 (r413961) @@ -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 \ Modified: head/comms/cqrlog/distinfo ============================================================================== --- head/comms/cqrlog/distinfo Sun Apr 24 21:21:15 2016 (r413960) +++ head/comms/cqrlog/distinfo Sun Apr 24 21:29:32 2016 (r413961) @@ -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 Modified: head/comms/cqrlog/files/patch-Makefile ============================================================================== --- head/comms/cqrlog/files/patch-Makefile Sun Apr 24 21:21:15 2016 (r413960) +++ head/comms/cqrlog/files/patch-Makefile Sun Apr 24 21:29:32 2016 (r413961) @@ -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 Added: head/comms/cqrlog/files/patch-help_cwd.html ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/cqrlog/files/patch-help_cwd.html Sun Apr 24 21:29:32 2016 (r413961) @@ -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 ++%%LOCALBASE%%/sbin/cwdaemon -x n + + Remember the cwdaemon options:

+

Added: head/comms/cqrlog/files/patch-help_h1.html ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/cqrlog/files/patch-help_h1.html Sun Apr 24 21:29:32 2016 (r413961) @@ -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.< + 
/usr/local/bin/xplanet
+ is OK in most cases for installation from sources, + the usual path for installation from precompiled packages is +- 
/usr/bin/xplanet
++ 
%%LOCALBASE%%/bin/xplanet
+ Adjust the window size (remember to set up a square, ie. 400x400, + 300x300 etc. to avoid strange effects). Also, the window position + must be set up to create a nice looking screen. Use the Test it! Added: head/comms/cqrlog/files/patch-src_cqrlog.lpi ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/cqrlog/files/patch-src_cqrlog.lpi Sun Apr 24 21:29:32 2016 (r413961) @@ -0,0 +1,11 @@ +--- src/cqrlog.lpi.orig 2016-04-20 16:06:15 UTC ++++ src/cqrlog.lpi +@@ -32,7 +32,7 @@ + + + +- ++ + + + Modified: head/comms/cqrlog/files/patch-src_dData.pas ============================================================================== --- head/comms/cqrlog/files/patch-src_dData.pas Sun Apr 24 21:21:15 2016 (r413960) +++ head/comms/cqrlog/files/patch-src_dData.pas Sun Apr 24 21:29:32 2016 (r413961) @@ -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'); - -- 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; +- 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'; + +@@ -3452,12 +3452,12 @@ var + l : TStringList; + info : 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; - 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; Modified: head/comms/cqrlog/files/patch-src_dUtils.pas ============================================================================== --- head/comms/cqrlog/files/patch-src_dUtils.pas Sun Apr 24 21:21:15 2016 (r413960) +++ head/comms/cqrlog/files/patch-src_dUtils.pas Sun Apr 24 21:29:32 2016 (r413961) @@ -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; Modified: head/comms/cqrlog/files/patch-src_fGrayline.pas ============================================================================== --- head/comms/cqrlog/files/patch-src_fGrayline.pas Sun Apr 24 21:21:15 2016 (r413960) +++ head/comms/cqrlog/files/patch-src_fGrayline.pas Sun Apr 24 21:29:32 2016 (r413961) @@ -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 := ''; Added: head/comms/cqrlog/files/patch-src_fLoTWExport.lfm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/cqrlog/files/patch-src_fLoTWExport.lfm Sun Apr 24 21:29:32 2016 (r413961) @@ -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 Added: head/comms/cqrlog/files/patch-src_fLoTWExport.lrs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/cqrlog/files/patch-src_fLoTWExport.lrs Sun Apr 24 21:29:32 2016 (r413961) @@ -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' Modified: head/comms/cqrlog/files/patch-src_fLoTWExport.pas ============================================================================== --- head/comms/cqrlog/files/patch-src_fLoTWExport.pas Sun Apr 24 21:21:15 2016 (r413960) +++ head/comms/cqrlog/files/patch-src_fLoTWExport.pas Sun Apr 24 21:29:32 2016 (r413961) @@ -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 Added: head/comms/cqrlog/files/patch-src_fPreferences.lfm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/cqrlog/files/patch-src_fPreferences.lfm Sun Apr 24 21:29:32 2016 (r413961) @@ -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 Added: head/comms/cqrlog/files/patch-src_fPreferences.lrs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/cqrlog/files/patch-src_fPreferences.lrs Sun Apr 24 21:29:32 2016 (r413961) @@ -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 Modified: head/comms/cqrlog/files/patch-src_fPreferences.pas ============================================================================== --- head/comms/cqrlog/files/patch-src_fPreferences.pas Sun Apr 24 21:21:15 2016 (r413960) +++ head/comms/cqrlog/files/patch-src_fPreferences.pas Sun Apr 24 21:29:32 2016 (r413961) @@ -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); Modified: head/comms/cqrlog/files/patch-src_fRotControl.pas ============================================================================== --- head/comms/cqrlog/files/patch-src_fRotControl.pas Sun Apr 24 21:21:15 2016 (r413960) +++ head/comms/cqrlog/files/patch-src_fRotControl.pas Sun Apr 24 21:29:32 2016 (r413961) @@ -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)); Modified: head/comms/cqrlog/files/patch-src_fTRXControl.pas ============================================================================== --- head/comms/cqrlog/files/patch-src_fTRXControl.pas Sun Apr 24 21:21:15 2016 (r413960) +++ head/comms/cqrlog/files/patch-src_fTRXControl.pas Sun Apr 24 21:29:32 2016 (r413961) @@ -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)); Modified: head/comms/cqrlog/files/patch-src_ssl__openssl__lib.pas ============================================================================== --- head/comms/cqrlog/files/patch-src_ssl__openssl__lib.pas Sun Apr 24 21:21:15 2016 (r413960) +++ head/comms/cqrlog/files/patch-src_ssl__openssl__lib.pas Sun Apr 24 21:29:32 2016 (r413961) @@ -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 Modified: head/comms/cqrlog/files/patch-src_synaser.pas ============================================================================== --- head/comms/cqrlog/files/patch-src_synaser.pas Sun Apr 24 21:21:15 2016 (r413960) +++ head/comms/cqrlog/files/patch-src_synaser.pas Sun Apr 24 21:29:32 2016 (r413961) @@ -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; Modified: head/comms/cqrlog/pkg-plist ============================================================================== --- head/comms/cqrlog/pkg-plist Sun Apr 24 21:21:15 2016 (r413960) +++ head/comms/cqrlog/pkg-plist Sun Apr 24 21:29:32 2016 (r413961) @@ -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