diff options
| author | Stephen Hurd <shurd@FreeBSD.org> | 2018-08-17 17:00:55 +0000 |
|---|---|---|
| committer | Stephen Hurd <shurd@FreeBSD.org> | 2018-08-17 17:00:55 +0000 |
| commit | 34eedfddef3a84a6a703a8c8572e2d7153746af7 (patch) | |
| tree | 7e396f16d464248a6a4abe6e59dd9f384aa86284 /comms/cqrlog | |
| parent | 71c181b9768122092fd000f8d9c0ecb726d40500 (diff) | |
| download | ports-34eedfddef3a84a6a703a8c8572e2d7153746af7.tar.gz ports-34eedfddef3a84a6a703a8c8572e2d7153746af7.zip | |
Notes
Diffstat (limited to 'comms/cqrlog')
| -rw-r--r-- | comms/cqrlog/Makefile | 3 | ||||
| -rw-r--r-- | comms/cqrlog/files/patch-src_dData.pas | 14 |
2 files changed, 13 insertions, 4 deletions
diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile index a496d01a1657..36f674d4f745 100644 --- a/comms/cqrlog/Makefile +++ b/comms/cqrlog/Makefile @@ -4,6 +4,7 @@ PORTNAME= cqrlog PORTVERSION= 2.3.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= comms hamradio PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} @@ -14,7 +15,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libhamlib.so:comms/hamlib -USES= fpc lazarus:flavors shebangfix ssl:run dos2unix +USES= fpc lazarus:flavors shebangfix ssl:run dos2unix mysql USE_GITHUB= yes GH_ACCOUNT= ok2cqr diff --git a/comms/cqrlog/files/patch-src_dData.pas b/comms/cqrlog/files/patch-src_dData.pas index 2e86239725c3..b64a818df2a0 100644 --- a/comms/cqrlog/files/patch-src_dData.pas +++ b/comms/cqrlog/files/patch-src_dData.pas @@ -1,4 +1,4 @@ ---- src/dData.pas.orig 2018-07-11 03:36:41 UTC +--- src/dData.pas.orig 2018-06-17 12:42:42 UTC +++ src/dData.pas @@ -904,22 +904,22 @@ begin if not DirectoryExistsUTF8(fHomeDir+'members') then @@ -73,7 +73,7 @@ if Result = '' then //don't know where mysqld is, so hopefully will be in $PATH Result := 'mysqld' end; -@@ -4209,17 +4209,7 @@ begin +@@ -4209,22 +4209,13 @@ begin Result := ''; Paths := TStringList.Create; try @@ -88,7 +88,15 @@ - 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); ++ Result := MyFindFile('libmariadbclient.so', Paths); if (Result='') then + begin +- Result := MyFindFile('libmysqlclient.so*', Paths) ++ Result := MyFindFile('libmysqlclient.so', Paths) + end + finally + FreeAndNil(Paths) |