Attachment #156926 for bug #200318

View | Details | Raw Unified | Return to bug 200318
Collapse All | Expand All




# $FreeBSD: head/comms/cqrlog/Makefile 386312 2015-05-14 10:15:04Z mat $

PORTNAME=	cqrlog
PORTVERSION=	1.9.0
#PORTREVISION=	0
CATEGORIES=	comms hamradio
MASTER_SITES=	https://github.com/ok2cqr/cqrlog/archive/
		LOCAL/shurd
DISTNAME=	${PORTNAME}_${PORTVERSION}.src

MAINTAINER=	hamradio@FreeBSD.org

WANT_GNOME=	yes
ALL_TARGET=	${PORTNAME}

LAZARUS_VER=	1.2.6
LAZARUS_DIR=	${LOCALBASE}/share/lazarus-${LAZARUS_VER}

OPTIONS_SINGLE=		LCL
OPTIONS_SINGLE_LCL=	GTK2 QT4

BUILD_DEPENDS+=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
.endif

do-fetch:
.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
	@( cd ${DISTDIR} ; ${FETCH_CMD} -o${DISTNAME}${EXTRACT_SUFX}\
		${FETCH_BEFORE_ARGS}\
		${MASTER_SITES}v${PORTVERSION}${EXTRACT_SUFX} )
.endif

post-patch:
	@${SED} -e s!%%LOCALBASE%%!${LOCALBASE}!g \
		-e s!%%MAKE_CMD%%!${MAKE_CMD}!g \

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (cqrlog_1.8.2.src.tar.gz) = 2d4b76949bcad5bed2683fce928524c683c6d69999d45526959a3d2f7e16516e	1	SHA256 (cqrlog_1.9.0.src.tar.gz) = 2f5beef08e109648812e98449ad093a9d6555e3abc72881be2f977e9a1a23850
2	SIZE (cqrlog_1.8.2.src.tar.gz) = 7949130	2	SIZE (cqrlog_1.9.0.src.tar.gz) = 7896794

Lines 1-5 Link Here

(-)./files/patch-Makefile (-4 / +4 lines)
1	--- Makefile 2014-10-03 14:37:57.000000000 -0500	1	--- Makefile.orig 2015-03-04 15:17:21 UTC
2	+++ Makefile 2015-01-10 21:44:03.000000000 -0500	2	+++ Makefile
3	@@ -1,11 +1,12 @@	3	@@ -1,11 +1,12 @@
4	-CC=lazbuild	4	-CC=lazbuild
5	+CC=lazbuild -d	5	+CC=lazbuild -d
Lines 18-24 Link Here
18	$(ST) src/cqrlog	18	$(ST) src/cqrlog
19	gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz	19	gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
20		20
21	@@ -29,7 +30,7 @@	21	@@ -29,7 +30,7 @@ install:
22	install -d -v $(sharedir)/pixmaps/cqrlog	22	install -d -v $(sharedir)/pixmaps/cqrlog
23	install -d -v $(sharedir)/icons	23	install -d -v $(sharedir)/icons
24	install -d -v $(sharedir)/applications	24	install -d -v $(sharedir)/applications
Lines 27-33 Link Here
27	install -v -m 0755 src/cqrlog $(bindir)	27	install -v -m 0755 src/cqrlog $(bindir)
28	install -v -m 0755 tools/cqrlog-apparmor-fix $(datadir)/cqrlog-apparmor-fix	28	install -v -m 0755 tools/cqrlog-apparmor-fix $(datadir)/cqrlog-apparmor-fix
29	install -v -m 0644 ctyfiles/* $(datadir)/ctyfiles/	29	install -v -m 0644 ctyfiles/* $(datadir)/ctyfiles/
30	@@ -46,7 +47,7 @@	30	@@ -46,7 +47,7 @@ install:
31	install -v -m 0644 images/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png	31	install -v -m 0644 images/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png
32	install -v -m 0644 images/cqrlog.png $(sharedir)/icons/cqrlog.png	32	install -v -m 0644 images/cqrlog.png $(sharedir)/icons/cqrlog.png
33	install -v -m 0644 src/changelog.html $(datadir)/changelog.html	33	install -v -m 0644 src/changelog.html $(datadir)/changelog.html

Lines 1-6 Link Here

(-)./files/patch-src_dData.lfm (-3 / +3 lines)
1	--- src/dData.lfm.orig 2014-12-20 19:39:40.000000000 -0800	1	--- src/dData.lfm.orig 2015-03-04 15:17:21 UTC
2	+++ src/dData.lfm 2014-12-20 19:40:02.000000000 -0800	2	+++ src/dData.lfm
3	@@ -113,7 +113,7 @@	3	@@ -113,7 +113,7 @@ object dmData: TdmData
4	' cont VARCHAR(6) NOT NULL,'	4	' cont VARCHAR(6) NOT NULL,'
5	' utc VARCHAR(12)NOT NULL,'	5	' utc VARCHAR(12)NOT NULL,'
6	' lat VARCHAR(10) NOT NULL,'	6	' lat VARCHAR(10) NOT NULL,'

Lines 1-6 Link Here

(-)./files/patch-src_dData.lrs (-3 / +3 lines)
1	--- src/dData.lrs.orig 2014-10-03 12:37:57.000000000 -0700	1	--- src/dData.lrs.orig 2015-03-04 15:17:21 UTC
2	+++ src/dData.lrs 2014-12-20 19:41:40.000000000 -0800	2	+++ src/dData.lrs
3	@@ -38,7 +38,7 @@	3	@@ -38,7 +38,7 @@ LazarusResources.Add('TdmData','FORMDATA
4	+'ARY KEY,'#6'& pref VARCHAR(20) NOT NULL,'#6''' name V'	4	+'ARY KEY,'#6'& pref VARCHAR(20) NOT NULL,'#6''' name V'
5	+'ARCHAR(100) NOT NULL,'#6'% cont VARCHAR(6) NOT NULL,'#6'$ '	5	+'ARCHAR(100) NOT NULL,'#6'% cont VARCHAR(6) NOT NULL,'#6'$ '
6	+' utc VARCHAR(12)NOT NULL,'#6'% lat VARCHAR(10) NOT NULL,'#6	6	+' utc VARCHAR(12)NOT NULL,'#6'% lat VARCHAR(10) NOT NULL,'#6




--- src/dData.pas.orig	2015-03-04 15:17:21 UTC
+++ src/dData.pas
@@ -911,22 +911,22 @@ begin
   if DirectoryExistsUTF8(fHomeDir+'members') then
     fMembersDir := fHomeDir+'members'+PathDelim
   else

                PathDelim);
 
   if not DirectoryExistsUTF8(fHomeDir + 'lotw') then
@@ -949,7 +949,7 @@ procedure TdmData.PrepareCtyData;
 var
   s,d : String;
 begin

   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

   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

   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;
 

Lines 1-6 Link Here

(-)./files/patch-src_dUtils.pas (-4 / +4 lines)
1	--- src/dUtils.pas.orig 2014-10-03 12:37:57.000000000 -0700	1	--- src/dUtils.pas.orig 2015-03-04 15:17:21 UTC
2	+++ src/dUtils.pas 2014-12-20 18:13:35.000000000 -0800	2	+++ src/dUtils.pas
3	@@ -2380,7 +2380,7 @@	3	@@ -2381,7 +2381,7 @@ var
4	proj: string = '';	4	proj: string = '';
5	begin	5	begin
6	Result := '';	6	Result := '';
Lines 9-15 Link Here
9	myloc := cqrini.ReadString('Station', 'LOC', '');	9	myloc := cqrini.ReadString('Station', 'LOC', '');
10	if not FileExists(Result) then	10	if not FileExists(Result) then
11	begin	11	begin
12	@@ -2670,7 +2670,7 @@	12	@@ -2671,7 +2671,7 @@ begin
13	if Device = '' then	13	if Device = '' then
14	exit;	14	exit;
15		15

Lines 1-6 Link Here

(-)./files/patch-src_fGrayline.pas (-3 / +3 lines)
1	--- src/fGrayline.pas.orig 2014-07-01 00:36:18.000000000 -0700	1	--- src/fGrayline.pas.orig 2015-03-04 15:17:21 UTC
2	+++ src/fGrayline.pas 2014-07-01 00:36:48.000000000 -0700	2	+++ src/fGrayline.pas
3	@@ -385,7 +385,7 @@	3	@@ -383,7 +383,7 @@ begin
4	RBNSpotList[i].band := '';	4	RBNSpotList[i].band := '';
5	ImageFile := dmData.HomeDir+'images'+PathDelim+'grayline.bmp';	5	ImageFile := dmData.HomeDir+'images'+PathDelim+'grayline.bmp';
6	if not FileExists(ImageFile) then	6	if not FileExists(ImageFile) then

Lines 1-6 Link Here

(-)./files/patch-src_fLoTWExport.pas (-3 / +3 lines)
1	--- src/fLoTWExport.pas.orig 2014-06-30 23:38:20.000000000 -0700	1	--- src/fLoTWExport.pas.orig 2015-03-04 15:17:21 UTC
2	+++ src/fLoTWExport.pas 2014-06-30 23:38:53.000000000 -0700	2	+++ src/fLoTWExport.pas
3	@@ -232,7 +232,7 @@	3	@@ -235,7 +235,7 @@ begin
4	else begin	4	else begin
5	WindowState := wsMaximized	5	WindowState := wsMaximized
6	end;	6	end;




--- src/fPreferences.pas.orig	2015-03-04 15:17:21 UTC
+++ src/fPreferences.pas
@@ -2582,7 +2582,7 @@ begin
   cb47GHz.Checked := cqrini.ReadBool('Bands', '47GHz', False);
   cb76GHz.Checked := cqrini.ReadBool('Bands', '76GHz', False);
 

 
   edtR1Device.Text := cqrini.ReadString('TRX1', 'device', '');
   edtRigID1.Text := cqrini.ReadString('TRX1', 'model', '');
@@ -2619,7 +2619,7 @@ begin
   cmbDTRR2.ItemIndex := cqrini.ReadInteger('TRX2', 'DTR', 0);
   cmbRTSR2.ItemIndex := cqrini.ReadInteger('TRX2', 'RTS', 0);
 

 
   edtRot1Device.Text := cqrini.ReadString('ROT1', 'device', '');
   edtRot1ID.Text := cqrini.ReadString('ROT1', 'model', '');
@@ -2844,7 +2844,7 @@ begin
   chkIgnoreBandFreq.Checked := cqrini.ReadBool('BandMap','IgnoreBandFreq',True);
   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');

Lines 1-6 Link Here

(-)./files/patch-src_fRotControl.pas (-3 / +3 lines)
1	--- src/fRotControl.pas.orig 2014-06-30 23:40:26.000000000 -0700	1	--- src/fRotControl.pas.orig 2015-03-04 15:17:21 UTC
2	+++ src/fRotControl.pas 2014-06-30 23:40:33.000000000 -0700	2	+++ src/fRotControl.pas
3	@@ -130,7 +130,7 @@	3	@@ -137,7 +137,7 @@ begin
4	rotor.RotId := 1	4	rotor.RotId := 1
5	else	5	else
6	rotor.RotId := id;	6	rotor.RotId := id;

Lines 1-6 Link Here

(-)./files/patch-src_fTRXControl.pas (-3 / +3 lines)
1	--- src/fTRXControl.pas.orig 2014-06-30 23:40:59.000000000 -0700	1	--- src/fTRXControl.pas.orig 2015-03-04 15:17:21 UTC
2	+++ src/fTRXControl.pas 2014-06-30 23:41:05.000000000 -0700	2	+++ src/fTRXControl.pas
3	@@ -658,7 +658,7 @@	3	@@ -660,7 +660,7 @@ begin
4	else	4	else
5	radio.RigId := id;	5	radio.RigId := id;
6	//Writeln('huu4');	6	//Writeln('huu4');




--- src/ssl_openssl_lib.pas.orig	2015-03-04 15:17:21 UTC
+++ src/ssl_openssl_lib.pas
@@ -86,7 +86,7 @@ uses
 
 {$IFDEF CIL}
 const
-  {$IFDEF LINUX}
+  {$IFNDEF WIN32}
   DLLSSLName = 'libssl.so';
   DLLUtilName = 'libcrypto.so';
   {$ELSE}
@@ -1704,7 +1704,7 @@ begin
 {$ELSE}
       SSLLibHandle := LoadLib(DLLSSLName);
       SSLUtilHandle := LoadLib(DLLUtilName);
-  {$IFNDEF LINUX}
+  {$IFDEF WIN32}
       if (SSLLibHandle = 0) then
         SSLLibHandle := LoadLib(DLLSSLName2);
   {$ENDIF}




--- src/ssl_openssl_lib.pas.orig	2014-06-30 22:02:45.000000000 -0700
+++ src/ssl_openssl_lib.pas	2014-06-30 22:04:17.000000000 -0700
@@ -86,7 +86,7 @@
 
 {$IFDEF CIL}
 const
-  {$IFDEF LINUX}
+  {$IFNDEF WIN32}
   DLLSSLName = 'libssl.so';
   DLLUtilName = 'libcrypto.so';
   {$ELSE}
@@ -1704,7 +1704,7 @@
 {$ELSE}
       SSLLibHandle := LoadLib(DLLSSLName);
       SSLUtilHandle := LoadLib(DLLUtilName);
-  {$IFNDEF LINUX}
+  {$IFDEF WIN32}
       if (SSLLibHandle = 0) then
         SSLLibHandle := LoadLib(DLLSSLName2);
   {$ENDIF}




--- src/synaser.pas.orig	2015-03-04 15:17:21 UTC
+++ src/synaser.pas
@@ -302,7 +302,7 @@ type
     procedure DcbToTermios(const dcb: TDCB; var term: termios); virtual;
     procedure TermiosToDcb(const term: termios; var dcb: TDCB); virtual;
 {$ENDIF}

     function ReadLockfile: integer; virtual;
     function LockfileName: String; virtual;
     procedure CreateLockfile(PidNr: integer); virtual;
@@ -591,7 +591,7 @@ type
 
     {:Raise Synaser error with ErrNumber code. Usually used by internal routines.}
     procedure RaiseSynaError(ErrNumber: integer); virtual;

     function  cpomComportAccessible: boolean; virtual;{HGJ}
     procedure cpomReleaseComport; virtual; {HGJ}
 {$ENDIF}
@@ -766,7 +766,7 @@ begin
   end;
   if InstanceActive then
   begin

     if FLinuxLock then
       cpomReleaseComport;
     {$ENDIF}
@@ -917,7 +917,7 @@ begin
   FHandle := THandle(fpOpen(FDevice, O_RDWR or O_SYNC));
 {$ENDIF}
   SerialCheck(integer(FHandle));

   if FLastError <> sOK then
     if FLinuxLock then
       cpomReleaseComport;
@@ -949,7 +949,7 @@ begin
   begin
     SetSynaError(ErrNoDeviceAnswer);
     FileClose(integer(FHandle));         {HGJ}

     if FLinuxLock then
       cpomReleaseComport;                {HGJ}
     {$ENDIF}                             {HGJ}
@@ -1899,7 +1899,7 @@ begin
   {$IFNDEF FPC}
   SerialCheck(ioctl(integer(FHandle), TCFLSH, TCIOFLUSH));
   {$ELSE}

   //SerialCheck(fpioctl(integer(FHandle), TCFLSH, TCIOFLUSH));
   {$ENDIF}
   FBuffer := '';
@@ -2136,7 +2136,7 @@ end;
   Ownership Manager.
 }
 

Return to bug 200318

Lines 2-12 Link Here

(-)./Makefile (-6 / +12 lines)
2	# $FreeBSD: head/comms/cqrlog/Makefile 386312 2015-05-14 10:15:04Z mat $	2	# $FreeBSD: head/comms/cqrlog/Makefile 386312 2015-05-14 10:15:04Z mat $
3		3
4	PORTNAME= cqrlog	4	PORTNAME= cqrlog
5	PORTVERSION= 1.8.2	5	PORTVERSION= 1.9.0
6	PORTREVISION= 1	6	#PORTREVISION= 0
7	CATEGORIES= comms hamradio	7	CATEGORIES= comms hamradio
8	MASTER_SITES= http://www.cqrlog.com/files/cqrlog_${PORTVERSION}/ \	8	MASTER_SITES= https://github.com/ok2cqr/cqrlog/archive/
9	LOCAL/shurd
10	DISTNAME= ${PORTNAME}_${PORTVERSION}.src	9	DISTNAME= ${PORTNAME}_${PORTVERSION}.src
11		10
12	MAINTAINER= hamradio@FreeBSD.org	11	MAINTAINER= hamradio@FreeBSD.org
Lines 22-29 Link Here
22	WANT_GNOME= yes	21	WANT_GNOME= yes
23	ALL_TARGET= ${PORTNAME}	22	ALL_TARGET= ${PORTNAME}
24		23
25	LAZARUS_VER= 1.2.6	24	LAZARUS_VER= 1.2.6
26	LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER}	25	LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER}
27		26
28	OPTIONS_SINGLE= LCL	27	OPTIONS_SINGLE= LCL
29	OPTIONS_SINGLE_LCL= GTK2 QT4	28	OPTIONS_SINGLE_LCL= GTK2 QT4
Lines 44-49 Link Here
44	BUILD_DEPENDS+= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt	43	BUILD_DEPENDS+= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
45	.endif	44	.endif
46		45
		46	do-fetch:
		47	.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
		48	@( cd ${DISTDIR} ; ${FETCH_CMD} -o${DISTNAME}${EXTRACT_SUFX}\
		49	${FETCH_BEFORE_ARGS}\
		50	${MASTER_SITES}v${PORTVERSION}${EXTRACT_SUFX} )
		51	.endif
		52
47	post-patch:	53	post-patch:
48	@${SED} -e s!%%LOCALBASE%%!${LOCALBASE}!g \	54	@${SED} -e s!%%LOCALBASE%%!${LOCALBASE}!g \
49	-e s!%%MAKE_CMD%%!${MAKE_CMD}!g \	55	-e s!%%MAKE_CMD%%!${MAKE_CMD}!g \

Lines 1-6 Link Here

(-)./files/patch-src_dData.pas (-7 / +7 lines)
1	--- src/dData.pas.orig 2014-04-13 05:14:38.000000000 -0700	1	--- src/dData.pas.orig 2015-03-04 15:17:21 UTC
2	+++ src/dData.pas 2014-07-01 00:20:19.000000000 -0700	2	+++ src/dData.pas
3	@@ -850,22 +850,22 @@	3	@@ -911,22 +911,22 @@ begin
4	if DirectoryExistsUTF8(fHomeDir+'members') then	4	if DirectoryExistsUTF8(fHomeDir+'members') then
5	fMembersDir := fHomeDir+'members'+PathDelim	5	fMembersDir := fHomeDir+'members'+PathDelim
6	else	6	else
Lines 27-33 Link Here
27	PathDelim);	27	PathDelim);
28		28
29	if not DirectoryExistsUTF8(fHomeDir + 'lotw') then	29	if not DirectoryExistsUTF8(fHomeDir + 'lotw') then
30	@@ -888,7 +888,7 @@	30	@@ -949,7 +949,7 @@ procedure TdmData.PrepareCtyData;
31	var	31	var
32	s,d : String;	32	s,d : String;
33	begin	33	begin
Lines 36-42 Link Here
36	d := fHomeDir+'ctyfiles'+PathDelim;	36	d := fHomeDir+'ctyfiles'+PathDelim;
37		37
38	if not FileExistsUTF8(fHomeDir+'ctyfiles'+PathDelim+'AreaOK1RR.tbl') then	38	if not FileExistsUTF8(fHomeDir+'ctyfiles'+PathDelim+'AreaOK1RR.tbl') then
39	@@ -952,7 +952,7 @@	39	@@ -1013,7 +1013,7 @@ procedure TdmData.PrepareXplanetDir;
40	var	40	var
41	s,d : String;	41	s,d : String;
42	begin	42	begin
Lines 45-51 Link Here
45	d := fHomeDir+'xplanet'+PathDelim;	45	d := fHomeDir+'xplanet'+PathDelim;
46	if not FileExistsUTF8(d+'geoconfig') then	46	if not FileExistsUTF8(d+'geoconfig') then
47	CopyFile(s+'geoconfig',d+'geoconfig')	47	CopyFile(s+'geoconfig',d+'geoconfig')
48	@@ -962,7 +962,7 @@	48	@@ -1023,7 +1023,7 @@ procedure TdmData.PrepareVoice_keyerDir;
49	var	49	var
50	s,d : String;	50	s,d : String;
51	begin	51	begin
Lines 54-60 Link Here
54	d := fHomeDir+'voice_keyer'+PathDelim;	54	d := fHomeDir+'voice_keyer'+PathDelim;
55	if not FileExistsUTF8(d+'voice_keyer.sh') then	55	if not FileExistsUTF8(d+'voice_keyer.sh') then
56	CopyFile(s+'voice_keyer.sh',d+'voice_keyer.sh')	56	CopyFile(s+'voice_keyer.sh',d+'voice_keyer.sh')
57	@@ -1061,7 +1061,7 @@	57	@@ -1122,7 +1122,7 @@ begin
58	if lib <> '' then	58	if lib <> '' then
59	fDLLUtilName := lib;	59	fDLLUtilName := lib;
60		60

Lines 1-6 Link Here

(-)./files/patch-src_fPreferences.pas (-6 / +6 lines)
1	--- src/fPreferences.pas.orig 2014-06-30 23:39:36.000000000 -0700	1	--- src/fPreferences.pas.orig 2015-03-04 15:17:21 UTC
2	+++ src/fPreferences.pas 2014-06-30 23:39:52.000000000 -0700	2	+++ src/fPreferences.pas
3	@@ -2471,7 +2471,7 @@	3	@@ -2582,7 +2582,7 @@ begin
4	cb47GHz.Checked := cqrini.ReadBool('Bands', '47GHz', False);	4	cb47GHz.Checked := cqrini.ReadBool('Bands', '47GHz', False);
5	cb76GHz.Checked := cqrini.ReadBool('Bands', '76GHz', False);	5	cb76GHz.Checked := cqrini.ReadBool('Bands', '76GHz', False);
6		6
Lines 9-15 Link Here
9		9
10	edtR1Device.Text := cqrini.ReadString('TRX1', 'device', '');	10	edtR1Device.Text := cqrini.ReadString('TRX1', 'device', '');
11	edtRigID1.Text := cqrini.ReadString('TRX1', 'model', '');	11	edtRigID1.Text := cqrini.ReadString('TRX1', 'model', '');
12	@@ -2508,7 +2508,7 @@	12	@@ -2619,7 +2619,7 @@ begin
13	cmbDTRR2.ItemIndex := cqrini.ReadInteger('TRX2', 'DTR', 0);	13	cmbDTRR2.ItemIndex := cqrini.ReadInteger('TRX2', 'DTR', 0);
14	cmbRTSR2.ItemIndex := cqrini.ReadInteger('TRX2', 'RTS', 0);	14	cmbRTSR2.ItemIndex := cqrini.ReadInteger('TRX2', 'RTS', 0);
15		15
Lines 18-26 Link Here
18		18
19	edtRot1Device.Text := cqrini.ReadString('ROT1', 'device', '');	19	edtRot1Device.Text := cqrini.ReadString('ROT1', 'device', '');
20	edtRot1ID.Text := cqrini.ReadString('ROT1', 'model', '');	20	edtRot1ID.Text := cqrini.ReadString('ROT1', 'model', '');
21	@@ -2725,7 +2725,7 @@	21	@@ -2844,7 +2844,7 @@ begin
22	chkIgnoreBandFreq.Checked := cqrini.ReadBool('BandMap','IgnoreBandFreq',True);
23	chkUseNewQSOFreqMode.Checked := cqrini.ReadBool('BandMap','UseNewQSOFreqMode',False);	22	chkUseNewQSOFreqMode.Checked := cqrini.ReadBool('BandMap','UseNewQSOFreqMode',False);
		23	chkPlusToBandMap.Checked := cqrini.ReadBool('BandMap','PlusToBandMap',False);
24		24
25	- edtXplanetPath.Text := cqrini.ReadString('xplanet', 'path', '/usr/bin/xplanet');	25	- edtXplanetPath.Text := cqrini.ReadString('xplanet', 'path', '/usr/bin/xplanet');
26	+ edtXplanetPath.Text := cqrini.ReadString('xplanet', 'path', '%%LOCALBASE%%/bin/xplanet');	26	+ edtXplanetPath.Text := cqrini.ReadString('xplanet', 'path', '%%LOCALBASE%%/bin/xplanet');

Line 0 Link Here

(-)./files/patch-src_ssl__openssl__lib.pas (+20 lines)
	1	--- src/ssl_openssl_lib.pas.orig 2015-03-04 15:17:21 UTC
	2	+++ src/ssl_openssl_lib.pas
	3	@@ -86,7 +86,7 @@ uses
	4
	5	{$IFDEF CIL}
	6	const
	7	- {$IFDEF LINUX}
	8	+ {$IFNDEF WIN32}
	9	DLLSSLName = 'libssl.so';
	10	DLLUtilName = 'libcrypto.so';
	11	{$ELSE}
	12	@@ -1704,7 +1704,7 @@ begin
	13	{$ELSE}
	14	SSLLibHandle := LoadLib(DLLSSLName);
	15	SSLUtilHandle := LoadLib(DLLUtilName);
	16	- {$IFNDEF LINUX}
	17	+ {$IFDEF WIN32}
	18	if (SSLLibHandle = 0) then
	19	SSLLibHandle := LoadLib(DLLSSLName2);
	20	{$ENDIF}

Lines 1-20 Link Here

(-)./files/patch-src_ssl_openssl_lib.pas (-20 lines)
1	--- src/ssl_openssl_lib.pas.orig 2014-06-30 22:02:45.000000000 -0700
2	+++ src/ssl_openssl_lib.pas 2014-06-30 22:04:17.000000000 -0700
3	@@ -86,7 +86,7 @@
4
5	{$IFDEF CIL}
6	const
7	- {$IFDEF LINUX}
8	+ {$IFNDEF WIN32}
9	DLLSSLName = 'libssl.so';
10	DLLUtilName = 'libcrypto.so';
11	{$ELSE}
12	@@ -1704,7 +1704,7 @@
13	{$ELSE}
14	SSLLibHandle := LoadLib(DLLSSLName);
15	SSLUtilHandle := LoadLib(DLLUtilName);
16	- {$IFNDEF LINUX}
17	+ {$IFDEF WIN32}
18	if (SSLLibHandle = 0) then
19	SSLLibHandle := LoadLib(DLLSSLName2);
20	{$ENDIF}

Lines 1-6 Link Here

(-)./files/patch-src_synaser.pas (-9 / +9 lines)
1	--- src/synaser.pas.orig 2014-06-30 22:04:41.000000000 -0700	1	--- src/synaser.pas.orig 2015-03-04 15:17:21 UTC
2	+++ src/synaser.pas 2014-06-30 22:21:53.000000000 -0700	2	+++ src/synaser.pas
3	@@ -302,7 +302,7 @@	3	@@ -302,7 +302,7 @@ type
4	procedure DcbToTermios(const dcb: TDCB; var term: termios); virtual;	4	procedure DcbToTermios(const dcb: TDCB; var term: termios); virtual;
5	procedure TermiosToDcb(const term: termios; var dcb: TDCB); virtual;	5	procedure TermiosToDcb(const term: termios; var dcb: TDCB); virtual;
6	{$ENDIF}	6	{$ENDIF}
Lines 9-15 Link Here
9	function ReadLockfile: integer; virtual;	9	function ReadLockfile: integer; virtual;
10	function LockfileName: String; virtual;	10	function LockfileName: String; virtual;
11	procedure CreateLockfile(PidNr: integer); virtual;	11	procedure CreateLockfile(PidNr: integer); virtual;
12	@@ -591,7 +591,7 @@	12	@@ -591,7 +591,7 @@ type
13		13
14	{:Raise Synaser error with ErrNumber code. Usually used by internal routines.}	14	{:Raise Synaser error with ErrNumber code. Usually used by internal routines.}
15	procedure RaiseSynaError(ErrNumber: integer); virtual;	15	procedure RaiseSynaError(ErrNumber: integer); virtual;
Lines 18-24 Link Here
18	function cpomComportAccessible: boolean; virtual;{HGJ}	18	function cpomComportAccessible: boolean; virtual;{HGJ}
19	procedure cpomReleaseComport; virtual; {HGJ}	19	procedure cpomReleaseComport; virtual; {HGJ}
20	{$ENDIF}	20	{$ENDIF}
21	@@ -766,7 +766,7 @@	21	@@ -766,7 +766,7 @@ begin
22	end;	22	end;
23	if InstanceActive then	23	if InstanceActive then
24	begin	24	begin
Lines 27-33 Link Here
27	if FLinuxLock then	27	if FLinuxLock then
28	cpomReleaseComport;	28	cpomReleaseComport;
29	{$ENDIF}	29	{$ENDIF}
30	@@ -917,7 +917,7 @@	30	@@ -917,7 +917,7 @@ begin
31	FHandle := THandle(fpOpen(FDevice, O_RDWR or O_SYNC));	31	FHandle := THandle(fpOpen(FDevice, O_RDWR or O_SYNC));
32	{$ENDIF}	32	{$ENDIF}
33	SerialCheck(integer(FHandle));	33	SerialCheck(integer(FHandle));
Lines 36-42 Link Here
36	if FLastError <> sOK then	36	if FLastError <> sOK then
37	if FLinuxLock then	37	if FLinuxLock then
38	cpomReleaseComport;	38	cpomReleaseComport;
39	@@ -949,7 +949,7 @@	39	@@ -949,7 +949,7 @@ begin
40	begin	40	begin
41	SetSynaError(ErrNoDeviceAnswer);	41	SetSynaError(ErrNoDeviceAnswer);
42	FileClose(integer(FHandle)); {HGJ}	42	FileClose(integer(FHandle)); {HGJ}
Lines 45-51 Link Here
45	if FLinuxLock then	45	if FLinuxLock then
46	cpomReleaseComport; {HGJ}	46	cpomReleaseComport; {HGJ}
47	{$ENDIF} {HGJ}	47	{$ENDIF} {HGJ}
48	@@ -1899,7 +1899,7 @@	48	@@ -1899,7 +1899,7 @@ begin
49	{$IFNDEF FPC}	49	{$IFNDEF FPC}
50	SerialCheck(ioctl(integer(FHandle), TCFLSH, TCIOFLUSH));	50	SerialCheck(ioctl(integer(FHandle), TCFLSH, TCIOFLUSH));
51	{$ELSE}	51	{$ELSE}
Lines 54-60 Link Here
54	//SerialCheck(fpioctl(integer(FHandle), TCFLSH, TCIOFLUSH));	54	//SerialCheck(fpioctl(integer(FHandle), TCFLSH, TCIOFLUSH));
55	{$ENDIF}	55	{$ENDIF}
56	FBuffer := '';	56	FBuffer := '';
57	@@ -2136,7 +2136,7 @@	57	@@ -2136,7 +2136,7 @@ end;
58	Ownership Manager.	58	Ownership Manager.
59	}	59	}
60		60