mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00
Code Issues Releases Activity

Update to latest release

Browse Source 
Fix relative paths to share directory.
Use DATADIR in the software instead of constructing it from PREFIX.
This commit is contained in:
Stephen Hurd 2016-05-10 09:16:40 +00:00
parent 09362c29dd
commit 24bd216d00
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=414931
4 changed files with 75 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
comms/cqrlog/Makefile
View File

@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= cqrlog
PORTVERSION= 2.0.0
PORTVERSION= 2.0.1
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= comms hamradio
MAINTAINER= hamradio@FreeBSD.org
@ -53,20 +52,22 @@ post-patch:
${FILESDIR}/environmentoptions.xml.in \
> ${WRKSRC}/environmentoptions.xml
${REINPLACE_CMD} -e s!%%LOCALBASE%%!${LOCALBASE}!g \
${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}/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}/help/cwd.html ${WRKSRC}/help/h1.html \
${WRKSRC}/src/cqrlog.lpi ${WRKSRC}/src/dData.pas \
${WRKSRC}/src/dUtils.pas ${WRKSRC}/src/fLoTWExport.lrs \
${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 \
${WRKSRC}/src/fPreferences.lrs
${REINPLACE_CMD} -e s!%%DATADIR%%!${DATADIR}!g \
${WRKSRC}/src/dData.pas ${WRKSRC}/src/fGrayline.pas
${REINPLACE_CMD} -e s!%%LAZARUSDIR%%!${LAZARUS_DIR}!g \
${WRKSRC}/Makefile
${RM} -rf ${WRKSRC}/src/mysql
${LAZARUS_DIR}/tools/lazres ${WRKSRC}/src/fLoTWExport.lrs ${WRKSRC}/src/fLoTWExport.lfm
${LAZARUS_DIR}/tools/lazres ${WRKSRC}/src/fPreferences.lrs ${WRKSRC}/src/fPreferences.lfm
${LAZARUS_DIR}/tools/lazres ${WRKSRC}/src/fLoTWExport.lrs \
${WRKSRC}/src/fLoTWExport.lfm
${LAZARUS_DIR}/tools/lazres ${WRKSRC}/src/fPreferences.lrs \
${WRKSRC}/src/fPreferences.lfm
.include <bsd.port.mk>

4
comms/cqrlog/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ok2cqr-cqrlog-v2.0.0_GH0.tar.gz) = f3c324b3cdb9f0c7a8e9efea05a1776854a0ca4707da52a2dfe99fce251bf860
SIZE (ok2cqr-cqrlog-v2.0.0_GH0.tar.gz) = 7894125
SHA256 (ok2cqr-cqrlog-v2.0.1_GH0.tar.gz) = 17eaa17820e668eb21bc8ac75199aac5aa7ab0725b58b77ad3a86e09145d7977
SIZE (ok2cqr-cqrlog-v2.0.1_GH0.tar.gz) = 7899762

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

@ -1,6 +1,60 @@
--- src/dData.pas.orig 2016-04-20 16:06:15 UTC
--- src/dData.pas.orig 2016-05-07 08:21:24 UTC
+++ src/dData.pas
@@ -1278,12 +1278,12 @@ begin
@@ -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);
if DirectoryExistsUTF8(fHomeDir+'zipcodes') then
fZipCodeDir := fHomeDir+'zipcodes'+PathDelim
else
- fZipCodeDir := ExpandFileNameUTF8('..'+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+'help'+PathDelim);
- fShareDir := ExpandFileNameUTF8('..'+PathDelim+'share'+PathDelim+'cqrlog'+
+ fShareDir := ExpandFileNameUTF8('%%DATADIR%%'+
PathDelim);
if not DirectoryExistsUTF8(fHomeDir + 'lotw') then
@@ -948,7 +948,7 @@ procedure TdmData.PrepareCtyData;
var
s,d : String;
begin
- s := ExpandFileNameUTF8('..'+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
@@ -1016,7 +1016,7 @@ procedure TdmData.PrepareXplanetDir;
var
s,d : String;
begin
- s := ExpandFileNameUTF8('..'+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')
@@ -1026,7 +1026,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);
d := fHomeDir+'voice_keyer'+PathDelim;
if not FileExistsUTF8(d+'voice_keyer.sh') then
CopyFile(s+'voice_keyer.sh',d+'voice_keyer.sh')
@@ -1288,12 +1288,12 @@ begin
{
@ -19,7 +73,7 @@
if mysqld = '' then //don't know where mysqld is, so hopefully will be in $PATH
mysqld := 'mysqld';
@@ -3452,12 +3452,12 @@ var
@@ -3462,12 +3462,12 @@ var
l : TStringList;
info : String;
begin

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

@ -1,11 +1,11 @@
--- src/fGrayline.pas.orig 2016-04-20 16:06:15 UTC
--- src/fGrayline.pas.orig 2016-05-07 08:21:24 UTC
+++ src/fGrayline.pas
@@ -383,7 +383,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('%%PREFIX%%'+PathDelim+'share'+PathDelim+'cqrlog'+
+ ImageFile := ExpandFileNameUTF8('%%DATADIR%%'+
PathDelim+'images'+PathDelim+'grayline.bmp');
ob:=new(Pgrayline,init(ImageFile))
end;