Index: head/comms/cqrlog/Makefile =================================================================== --- head/comms/cqrlog/Makefile (revision 474420) +++ head/comms/cqrlog/Makefile (revision 474421) @@ -1,67 +1,69 @@ # Created by: Stephen Hurd # $FreeBSD$ PORTNAME= cqrlog -PORTVERSION= 2.2.0 -PORTREVISION= 2 +PORTVERSION= 2.3.0 DISTVERSIONPREFIX= v CATEGORIES= comms hamradio PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} MAINTAINER= hamradio@FreeBSD.org COMMENT= Amateur Radio logging application LICENSE= GPLv2 LIB_DEPENDS= libhamlib.so:comms/hamlib +USES= fpc lazarus:flavors shebangfix ssl:run dos2unix USE_GITHUB= yes GH_ACCOUNT= ok2cqr -USES= fpc lazarus:flavors shebangfix SHEBANG_FILES= tools/cqrlog-apparmor-fix \ voice_keyer/voice_keyer.sh - USE_FPC= cairo fcl-base chm fcl-db fcl-image fcl-json fcl-net fcl-web \ fcl-registry rtl-extra fcl-xml mysql numlib openssl \ pasjpeg regexpr x11 ALL_TARGET= ${PORTNAME} MAKE_ENV+= LAZBUILD_CMD="${LAZBUILD_CMD}" \ LAZBUILD_ARGS="${LAZBUILD_ARGS}" \ LCL_PLATFORM="${LCL_PLATFORM}" \ LAZARUS_DIR="${LAZARUS_DIR}" USE_XORG+= x11 NO_LAZBUILD= yes LAZBUILD_ARGS= -d --pcp=. LAZARUS_NO_FLAVORS=qt5 +INSTALLS_ICONS= yes +DOS2UNIX_WRKSRC=${WRKSRC}/src/synapse/ gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 post-extract: @${RM} -r ${WRKSRC}/src/lnet/lib/openssl.pas post-patch: @${SED} -e s!%%LOCALBASE%%!${LOCALBASE}!g \ -e s!%%MAKE_CMD%%!${MAKE_CMD}!g \ -e s!%%LAZARUSDIR%%!${LAZARUS_DIR}!g \ ${FILESDIR}/environmentoptions.xml.in \ > ${WRKSRC}/environmentoptions.xml ${REINPLACE_CMD} -e s!%%LOCALBASE%%!${LOCALBASE}!g \ ${WRKSRC}/help/cwd.html ${WRKSRC}/help/h1.html \ ${WRKSRC}/src/cqrlog.lpi ${WRKSRC}/src/dData.pas \ ${WRKSRC}/src/dUtils.pas \ ${WRKSRC}/src/fLoTWExport.pas ${WRKSRC}/src/fLoTWExport.lfm \ ${WRKSRC}/src/fPreferences.pas ${WRKSRC}/src/fRotControl.pas \ ${WRKSRC}/src/fTRXControl.pas ${WRKSRC}/src/fGrayline.pas \ ${WRKSRC}/src/fPreferences.lfm ${WRKSRC}/src/fPreferences.pas ${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 + ${REINPLACE_CMD} -e s!%%OPENSSLLIB%%!${OPENSSLLIB}!g \ + ${WRKSRC}/src/synapse/ssl_openssl_lib.pas ${RM} -r ${WRKSRC}/src/mysql .include Index: head/comms/cqrlog/distinfo =================================================================== --- head/comms/cqrlog/distinfo (revision 474420) +++ head/comms/cqrlog/distinfo (revision 474421) @@ -1,3 +1,3 @@ -TIMESTAMP = 1518534250 -SHA256 (ok2cqr-cqrlog-v2.2.0_GH0.tar.gz) = 6e148f5dd3242aa69884db704016418daef0683da12b906b70fe9a96bf5bbb2b -SIZE (ok2cqr-cqrlog-v2.2.0_GH0.tar.gz) = 9784876 +TIMESTAMP = 1531274964 +SHA256 (ok2cqr-cqrlog-v2.3.0_GH0.tar.gz) = 59809b3fba42b17e3c50aaefe6fe57d593d847c9697ee6386ee4a64b6b04c483 +SIZE (ok2cqr-cqrlog-v2.3.0_GH0.tar.gz) = 10407716 Property changes on: head/comms/cqrlog/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/cqrlog/files/patch-Makefile =================================================================== --- head/comms/cqrlog/files/patch-Makefile (revision 474420) +++ head/comms/cqrlog/files/patch-Makefile (revision 474421) @@ -1,39 +1,39 @@ ---- Makefile.orig 2017-12-30 02:10:01.000000000 -0500 -+++ Makefile 2018-01-05 12:34:28.752177000 -0500 +--- Makefile.orig 2018-06-17 12:42:42 UTC ++++ Makefile @@ -1,12 +1,13 @@ -CC=lazbuild +LAZBUILD_CMD?=lazbuild -d ST=strip -datadir = $(DESTDIR)/usr/share/cqrlog -bindir = $(DESTDIR)/usr/bin -sharedir = $(DESTDIR)/usr/share +datadir = $(DESTDIR)${PREFIX}/share/cqrlog +bindir = $(DESTDIR)${PREFIX}/bin +sharedir = $(DESTDIR)${PREFIX}/share tmpdir = /tmp +mandir = $(DESTDIR)${PREFIX} cqrlog: src/cqrlog.lpi - $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi + $(LAZBUILD_CMD) $(LAZBUILD_ARGS) --ws=$(LCL_PLATFORM) --lazarusdir=$(LAZARUS_DIR) src/cqrlog.lpi $(ST) src/cqrlog gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz -@@ -38,7 +39,7 @@ +@@ -39,7 +40,7 @@ install: install -d -v $(sharedir)/icons/cqrlog install -d -v $(sharedir)/applications install -d -v $(sharedir)/appdata - install -d -v $(sharedir)/man/man1 + install -d -v $(mandir)/man/man1 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/ -@@ -64,7 +65,7 @@ +@@ -65,7 +66,7 @@ install: install -v -m 0644 images/icon/32x32/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png install -v -m 0644 images/icon/128x128/cqrlog.png $(sharedir)/icons/cqrlog.png install -v -m 0644 src/changelog.html $(datadir)/changelog.html - install -v -m 0644 tools/cqrlog.1.gz $(sharedir)/man/man1/cqrlog.1.gz + install -v -m 0644 tools/cqrlog.1.gz $(mandir)/man/man1/cqrlog.1.gz deb: dpkg-buildpackage -rfakeroot -i -I deb_src: Property changes on: head/comms/cqrlog/files/patch-Makefile ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/cqrlog/files/patch-help_h1.html =================================================================== --- head/comms/cqrlog/files/patch-help_h1.html (revision 474420) +++ head/comms/cqrlog/files/patch-help_h1.html (revision 474421) @@ -1,11 +1,11 @@ ---- help/h1.html.orig 2017-12-30 02:10:01.000000000 -0500 -+++ help/h1.html 2018-01-05 12:34:48.900265000 -0500 -@@ -414,7 +414,7 @@ +--- help/h1.html.orig 2018-06-17 12:42:42 UTC ++++ help/h1.html +@@ -414,7 +414,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! Property changes on: head/comms/cqrlog/files/patch-help_h1.html ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/cqrlog/files/patch-src_cqrlog.lpi =================================================================== --- head/comms/cqrlog/files/patch-src_cqrlog.lpi (revision 474420) +++ head/comms/cqrlog/files/patch-src_cqrlog.lpi (revision 474421) @@ -1,20 +1,11 @@ ---- src/cqrlog.lpi.orig 2017-12-30 02:10:01.000000000 -0500 -+++ src/cqrlog.lpi 2018-04-07 19:17:15.225110000 -0500 +--- src/cqrlog.lpi.orig 2018-07-11 03:52:28 UTC ++++ src/cqrlog.lpi @@ -35,7 +35,7 @@ - -+ ++ -@@ -748,7 +748,7 @@ - - - -- -+ - - - Index: head/comms/cqrlog/files/patch-src_dData.pas =================================================================== --- head/comms/cqrlog/files/patch-src_dData.pas (revision 474420) +++ head/comms/cqrlog/files/patch-src_dData.pas (revision 474421) @@ -1,75 +1,94 @@ ---- src/dData.pas.orig 2016-05-07 08:21:24 UTC +--- src/dData.pas.orig 2018-07-11 03:36:41 UTC +++ src/dData.pas -@@ -910,22 +910,22 @@ begin - if DirectoryExistsUTF8(fHomeDir+'members') then - fMembersDir := fHomeDir+'members'+PathDelim - else -- fMembersDir := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+ -+ fMembersDir := ExpandFileNameUTF8('%%DATADIR%%'+ - PathDelim+'members'+PathDelim); +@@ -904,22 +904,22 @@ begin + 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'+ + PathDelim+'members'+PathDelim); if DirectoryExistsUTF8(fHomeDir+'zipcodes') then fZipCodeDir := fHomeDir+'zipcodes'+PathDelim else - fZipCodeDir := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog')+ -+ fZipCodeDir := ExpandFileNameUTF8('%%DATADIR%%')+ ++ fZipCodeDir := ExpandFileNameUTF8('%%DATADIR%%'+PathDelim+'share'+PathDelim+'cqrlog')+ PathDelim+'zipcodes'+PathDelim; if not DirectoryExistsUTF8(fHomeDir+'images') then CreateDirUTF8(fHomeDir+'images'); - fHelpDir := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+ -+ fHelpDir := ExpandFileNameUTF8('%%DATADIR%%'+ ++ fHelpDir := ExpandFileNameUTF8('%%DATADIR%%'+PathDelim+'share'+PathDelim+'cqrlog'+ PathDelim+'help'+PathDelim); - fShareDir := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+ -+ fShareDir := ExpandFileNameUTF8('%%DATADIR%%'+ ++ fShareDir := ExpandFileNameUTF8('%%DATADIR%%'+PathDelim+'share'+PathDelim+'cqrlog'+ PathDelim); if not DirectoryExistsUTF8(fHomeDir + 'lotw') then -@@ -948,7 +948,7 @@ procedure TdmData.PrepareCtyData; +@@ -942,7 +942,7 @@ procedure TdmData.PrepareCtyData; var s,d : String; begin - s := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+PathDelim+'ctyfiles'+PathDelim); -+ s := ExpandFileNameUTF8('%%DATADIR%%'+PathDelim+'ctyfiles'+PathDelim); ++ s := ExpandFileNameUTF8('%%DATADIR%%'+PathDelim+'share'+PathDelim+'cqrlog'+PathDelim+'ctyfiles'+PathDelim); d := fHomeDir+'ctyfiles'+PathDelim; if not FileExistsUTF8(fHomeDir+'ctyfiles'+PathDelim+'AreaOK1RR.tbl') then -@@ -1016,7 +1016,7 @@ procedure TdmData.PrepareXplanetDir; +@@ -1015,7 +1015,7 @@ procedure TdmData.PrepareXplanetDir; var s,d : String; begin - s := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+PathDelim+'xplanet'+PathDelim); -+ s := ExpandFileNameUTF8('%%DATADIR%%'+PathDelim+'xplanet'+PathDelim); ++ s := ExpandFileNameUTF8('%%DATADIR%%'+PathDelim+'share'+PathDelim+'cqrlog'+PathDelim+'xplanet'+PathDelim); d := fHomeDir+'xplanet'+PathDelim; if not FileExistsUTF8(d+'geoconfig') then CopyFile(s+'geoconfig',d+'geoconfig') -@@ -1026,7 +1026,7 @@ procedure TdmData.PrepareVoice_keyerDir; +@@ -1025,7 +1025,7 @@ procedure TdmData.PrepareVoice_keyerDir; var s,d : String; begin - s := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+PathDelim+'voice_keyer'+PathDelim); -+ s := ExpandFileNameUTF8('%%DATADIR%%'+PathDelim+'voice_keyer'+PathDelim); ++ s := ExpandFileNameUTF8('%%DATADIR%%'+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') -@@ -3462,12 +3462,12 @@ var +@@ -3367,12 +3367,12 @@ var l : TStringList; info : String; begin - 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; +@@ -4209,17 +4209,7 @@ 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/'); + + Result := MyFindFile('libmariadbclient.so*', Paths); + if (Result='') then Index: head/comms/cqrlog/files/patch-src_dUtils.pas =================================================================== --- head/comms/cqrlog/files/patch-src_dUtils.pas (revision 474420) +++ head/comms/cqrlog/files/patch-src_dUtils.pas (revision 474421) @@ -1,20 +1,20 @@ ---- src/dUtils.pas.orig 2016-04-20 16:06:15 UTC +--- src/dUtils.pas.orig 2018-06-17 12:42:42 UTC +++ src/dUtils.pas -@@ -2394,7 +2394,7 @@ var +@@ -2376,7 +2376,7 @@ var 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', ''); if not FileExists(Result) then begin -@@ -2684,7 +2684,7 @@ begin +@@ -2667,7 +2667,7 @@ begin if Device = '' then exit; - cmd := cqrini.ReadString('TRX', 'Path', '/usr/bin/rigctld'); + cmd := cqrini.ReadString('TRX', 'Path', '%%LOCALBASE%%/bin/rigctld'); if not FileExists(cmd) then exit; cmd := cmd + ' --model=' + rigid; Index: head/comms/cqrlog/files/patch-src_fGrayline.pas =================================================================== --- head/comms/cqrlog/files/patch-src_fGrayline.pas (revision 474420) +++ head/comms/cqrlog/files/patch-src_fGrayline.pas (revision 474421) @@ -1,11 +1,11 @@ ---- src/fGrayline.pas.orig 2016-05-07 08:21:24 UTC +--- src/fGrayline.pas.orig 2018-06-17 12:42:42 UTC +++ src/fGrayline.pas -@@ -383,7 +383,7 @@ begin +@@ -411,7 +411,7 @@ begin RBNSpotList[i].band := ''; ImageFile := dmData.HomeDir+'images'+PathDelim+'grayline.bmp'; if not FileExists(ImageFile) then - ImageFile := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+ + ImageFile := ExpandFileNameUTF8('%%DATADIR%%'+ PathDelim+'images'+PathDelim+'grayline.bmp'); ob:=new(Pgrayline,init(ImageFile)) end; Index: head/comms/cqrlog/files/patch-src_fLoTWExport.lfm =================================================================== --- head/comms/cqrlog/files/patch-src_fLoTWExport.lfm (revision 474420) +++ head/comms/cqrlog/files/patch-src_fLoTWExport.lfm (revision 474421) @@ -1,11 +1,11 @@ ---- src/fLoTWExport.lfm.orig 2016-04-20 16:06:15 UTC +--- src/fLoTWExport.lfm.orig 2018-06-17 12:42:42 UTC +++ src/fLoTWExport.lfm -@@ -182,7 +182,7 @@ object frmLoTWExport: TfrmLoTWExport +@@ -185,7 +185,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 Index: head/comms/cqrlog/files/patch-src_fLoTWExport.pas =================================================================== --- head/comms/cqrlog/files/patch-src_fLoTWExport.pas (revision 474420) +++ head/comms/cqrlog/files/patch-src_fLoTWExport.pas (revision 474421) @@ -1,11 +1,11 @@ ---- src/fLoTWExport.pas.orig 2016-04-20 16:06:15 UTC +--- src/fLoTWExport.pas.orig 2018-06-17 12:42:42 UTC +++ src/fLoTWExport.pas -@@ -235,7 +235,7 @@ begin +@@ -250,7 +250,7 @@ begin else begin WindowState := wsMaximized end; - edtTqsl.Text := cqrini.ReadString('LoTWExp','cmd','/usr/bin/tqsl -d -l "your qth name" %f -x'); + edtTqsl.Text := cqrini.ReadString('LoTWExp','cmd','%%LOCALBASE%%/bin/tqsl -d -l "your qth name" %f -x'); if pgLoTWExport.ActivePageIndex = 1 then rbWebExportNotExported.SetFocus end; Index: head/comms/cqrlog/files/patch-src_fPreferences.lfm =================================================================== --- head/comms/cqrlog/files/patch-src_fPreferences.lfm (revision 474420) +++ head/comms/cqrlog/files/patch-src_fPreferences.lfm (revision 474421) @@ -1,11 +1,11 @@ ---- src/fPreferences.lfm.orig 2016-04-20 16:06:15 UTC +--- src/fPreferences.lfm.orig 2018-06-17 12:42:42 UTC +++ src/fPreferences.lfm -@@ -4428,7 +4428,7 @@ object frmPreferences: TfrmPreferences +@@ -4883,7 +4883,7 @@ object frmPreferences: TfrmPreferences Top = 15 Width = 432 TabOrder = 0 - Text = '/usr/bin/xplanet' + Text = '%%LOCALBASE%%/bin/xplanet' end end object GroupBox22: TGroupBox Index: head/comms/cqrlog/files/patch-src_fPreferences.pas =================================================================== --- head/comms/cqrlog/files/patch-src_fPreferences.pas (revision 474420) +++ head/comms/cqrlog/files/patch-src_fPreferences.pas (revision 474421) @@ -1,29 +1,29 @@ ---- src/fPreferences.pas.orig 2016-04-20 16:06:15 UTC +--- src/fPreferences.pas.orig 2018-06-17 12:42:42 UTC +++ src/fPreferences.pas -@@ -2506,7 +2506,7 @@ begin +@@ -2516,7 +2516,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); -@@ -2552,7 +2552,7 @@ begin +@@ -2562,7 +2562,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'); edtRot1Device.Text := cqrini.ReadString('ROT1', 'device', ''); edtRot1ID.Text := cqrini.ReadString('ROT1', 'model', ''); -@@ -2701,7 +2701,7 @@ begin +@@ -2713,7 +2713,7 @@ begin chkUseNewQSOFreqMode.Checked := cqrini.ReadBool('BandMap','UseNewQSOFreqMode',False); chkPlusToBandMap.Checked := cqrini.ReadBool('BandMap','PlusToBandMap',False); - edtXplanetPath.Text := cqrini.ReadString('xplanet', 'path', '/usr/bin/xplanet'); + edtXplanetPath.Text := cqrini.ReadString('xplanet', 'path', '%%LOCALBASE%%/bin/xplanet'); edtXHeight.Text := cqrini.ReadString('xplanet', 'height', '100'); edtXWidth.Text := cqrini.ReadString('xplanet', 'width', '100'); edtXTop.Text := cqrini.ReadString('xplanet', 'top', '10'); Index: head/comms/cqrlog/files/patch-src_fRotControl.pas =================================================================== --- head/comms/cqrlog/files/patch-src_fRotControl.pas (revision 474420) +++ head/comms/cqrlog/files/patch-src_fRotControl.pas (revision 474421) @@ -1,11 +1,11 @@ ---- src/fRotControl.pas.orig 2016-04-20 16:06:15 UTC +--- src/fRotControl.pas.orig 2018-06-17 12:42:42 UTC +++ src/fRotControl.pas -@@ -149,7 +149,7 @@ begin +@@ -150,7 +150,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)); rotor.RunRotCtld := cqrini.ReadBool('ROT'+n,'RunRotCtld',False); rotor.RotDevice := cqrini.ReadString('ROT'+n,'device',''); Index: head/comms/cqrlog/files/patch-src_fTRXControl.pas =================================================================== --- head/comms/cqrlog/files/patch-src_fTRXControl.pas (revision 474420) +++ head/comms/cqrlog/files/patch-src_fTRXControl.pas (revision 474421) @@ -1,11 +1,11 @@ ---- src/fTRXControl.pas.orig 2016-04-20 16:06:15 UTC +--- src/fTRXControl.pas.orig 2018-06-17 12:42:42 UTC +++ src/fTRXControl.pas -@@ -749,7 +749,7 @@ begin +@@ -856,7 +856,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)); radio.RunRigCtld := cqrini.ReadBool('TRX'+n,'RunRigCtld',False); radio.RigDevice := cqrini.ReadString('TRX'+n,'device',''); Index: head/comms/cqrlog/files/patch-src_synapse_ssl__openssl__lib.pas =================================================================== --- head/comms/cqrlog/files/patch-src_synapse_ssl__openssl__lib.pas (nonexistent) +++ head/comms/cqrlog/files/patch-src_synapse_ssl__openssl__lib.pas (revision 474421) @@ -0,0 +1,29 @@ +--- src/synapse/ssl_openssl_lib.pas.orig 2018-07-11 04:13:02 UTC ++++ src/synapse/ssl_openssl_lib.pas +@@ -1875,23 +1875,12 @@ begin + + Paths := TStringList.Create; + try +- Paths.Add('/usr/lib64/'); +- Paths.Add('/lib64/'); +- Paths.Add('/usr/lib/x86_64-linux-gnu/'); +- Paths.Add('/lib/x86_64-linux-gnu/'); +- Paths.Add('/usr/lib/i386-linux-gnu/'); +- Paths.Add('/lib/i386-linux-gnu/'); ++ Paths.Add('%%OPENSSLLIB%%'); + Paths.Add('/usr/lib/'); + Paths.Add('/lib/'); + +- DLLSSLName := MyFindFile('libssl*1.0.*', Paths); +- DLLUtilName := MyFindFile('libcrypto*1.0.*', Paths); +- +- if (DLLSSLName = '') then +- begin +- DLLSSLName := MyFindFile('libssl*1.1*', Paths); +- DLLUtilName := MyFindFile('libcrypto*1.1*', Paths) +- end ++ DLLSSLName := MyFindFile('libssl.so', Paths); ++ DLLUtilName := MyFindFile('libcrypto.so', Paths) + finally + FreeAndNil(Paths) + end; Property changes on: head/comms/cqrlog/files/patch-src_synapse_ssl__openssl__lib.pas ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property