mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-26 09:46:09 +00:00
Code Issues Releases Activity

Update to latest release, use preferred OpenSSL libs.

Browse Source 
CQRLOG does *not* work with the version of OpenSSL in 10.4.  This only seems
to impact the LoTW integration though, so I don't think it needs to be
marked as broken with that version.

Also, update all the patches to use makepatch.
This commit is contained in:
Stephen Hurd 2018-07-11 04:18:37 +00:00
parent 876b1a9bac
commit bea0f90ec2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=474421
15 changed files with 104 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
comms/cqrlog/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= cqrlog
PORTVERSION= 2.2.0
PORTREVISION= 2
PORTVERSION= 2.3.0
DISTVERSIONPREFIX= v
CATEGORIES= comms hamradio
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}
@ -15,13 +14,12 @@ 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
@ -37,6 +35,8 @@ 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
@ -62,6 +62,8 @@ post-patch:
${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 <bsd.port.mk>

6
comms/cqrlog/distinfo
View File

@ -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

8
comms/cqrlog/files/patch-Makefile
View File

@ -1,5 +1,5 @@
--- 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
@ -19,7 +19,7 @@
$(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
@ -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/
@@ -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

6
comms/cqrlog/files/patch-help_h1.html
View File

@ -1,6 +1,6 @@
--- 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.<
<pre>/usr/local/bin/xplanet</pre>
is OK in most cases for installation from sources,
the usual path for installation from precompiled packages is

15
comms/cqrlog/files/patch-src_cqrlog.lpi
View File

@ -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 @@
<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="/usr/local/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">
@@ -748,7 +748,7 @@
<Version Value="11"/>
<SearchPaths>
<Libraries Value="$(LazarusDir)/lcl"/>
- <OtherUnitFiles Value="lnet/lib;richmemo;richmemo/gtk2;synapse"/>
+ <OtherUnitFiles Value="lnet/lib;richmemo;richmemo/gtk2;richmemo/qt;synapse"/>
</SearchPaths>
<Parsing>
<SyntaxOptions>

55
comms/cqrlog/files/patch-src_dData.pas
View File

@ -1,60 +1,60 @@
--- 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
@ -73,3 +73,22 @@
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

6
comms/cqrlog/files/patch-src_dUtils.pas
View File

@ -1,6 +1,6 @@
--- 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 := '';
@ -9,7 +9,7 @@
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;

4
comms/cqrlog/files/patch-src_fGrayline.pas
View File

@ -1,6 +1,6 @@
--- 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

4
comms/cqrlog/files/patch-src_fLoTWExport.lfm
View File

@ -1,6 +1,6 @@
--- 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

4
comms/cqrlog/files/patch-src_fLoTWExport.pas
View File

@ -1,6 +1,6 @@
--- 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;

4
comms/cqrlog/files/patch-src_fPreferences.lfm
View File

@ -1,6 +1,6 @@
--- 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

8
comms/cqrlog/files/patch-src_fPreferences.pas
View File

@ -1,6 +1,6 @@
--- 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);
@ -9,7 +9,7 @@
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);
@ -18,7 +18,7 @@
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);

4
comms/cqrlog/files/patch-src_fRotControl.pas
View File

@ -1,6 +1,6 @@
--- 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;

4
comms/cqrlog/files/patch-src_fTRXControl.pas
View File

@ -1,6 +1,6 @@
--- 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;

29
comms/cqrlog/files/patch-src_synapse_ssl__openssl__lib.pas Normal file
View File

@ -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;