diff -ruN /usr/ports/comms/cqrlog/Makefile ./Makefile --- /usr/ports/comms/cqrlog/Makefile 2015-05-14 19:15:04.000000000 +0900 +++ ./Makefile 2015-05-15 17:32:50.000000000 +0900 @@ -2,11 +2,10 @@ # $FreeBSD: head/comms/cqrlog/Makefile 386312 2015-05-14 10:15:04Z mat $ PORTNAME= cqrlog -PORTVERSION= 1.8.2 -PORTREVISION= 1 +PORTVERSION= 1.9.0 +#PORTREVISION= 0 CATEGORIES= comms hamradio -MASTER_SITES= http://www.cqrlog.com/files/cqrlog_${PORTVERSION}/ \ - LOCAL/shurd +MASTER_SITES= https://github.com/ok2cqr/cqrlog/archive/ DISTNAME= ${PORTNAME}_${PORTVERSION}.src MAINTAINER= hamradio@FreeBSD.org @@ -22,8 +21,8 @@ WANT_GNOME= yes ALL_TARGET= ${PORTNAME} -LAZARUS_VER= 1.2.6 -LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} +LAZARUS_VER= 1.2.6 +LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} OPTIONS_SINGLE= LCL OPTIONS_SINGLE_LCL= GTK2 QT4 @@ -44,6 +43,13 @@ 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 \ diff -ruN /usr/ports/comms/cqrlog/distinfo ./distinfo --- /usr/ports/comms/cqrlog/distinfo 2014-12-21 13:10:59.000000000 +0900 +++ ./distinfo 2015-05-15 17:26:59.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (cqrlog_1.8.2.src.tar.gz) = 2d4b76949bcad5bed2683fce928524c683c6d69999d45526959a3d2f7e16516e -SIZE (cqrlog_1.8.2.src.tar.gz) = 7949130 +SHA256 (cqrlog_1.9.0.src.tar.gz) = 2f5beef08e109648812e98449ad093a9d6555e3abc72881be2f977e9a1a23850 +SIZE (cqrlog_1.9.0.src.tar.gz) = 7896794 diff -ruN /usr/ports/comms/cqrlog/files/patch-Makefile ./files/patch-Makefile --- /usr/ports/comms/cqrlog/files/patch-Makefile 2015-01-11 12:22:51.000000000 +0900 +++ ./files/patch-Makefile 2015-05-13 17:12:23.000000000 +0900 @@ -1,5 +1,5 @@ ---- Makefile 2014-10-03 14:37:57.000000000 -0500 -+++ Makefile 2015-01-10 21:44:03.000000000 -0500 +--- Makefile.orig 2015-03-04 15:17:21 UTC ++++ Makefile @@ -1,11 +1,12 @@ -CC=lazbuild +CC=lazbuild -d @@ -18,7 +18,7 @@ $(ST) src/cqrlog gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz -@@ -29,7 +30,7 @@ +@@ -29,7 +30,7 @@ install: install -d -v $(sharedir)/pixmaps/cqrlog install -d -v $(sharedir)/icons install -d -v $(sharedir)/applications @@ -27,7 +27,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/ -@@ -46,7 +47,7 @@ +@@ -46,7 +47,7 @@ install: install -v -m 0644 images/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png install -v -m 0644 images/cqrlog.png $(sharedir)/icons/cqrlog.png install -v -m 0644 src/changelog.html $(datadir)/changelog.html diff -ruN /usr/ports/comms/cqrlog/files/patch-src_dData.lfm ./files/patch-src_dData.lfm --- /usr/ports/comms/cqrlog/files/patch-src_dData.lfm 2014-12-21 13:10:59.000000000 +0900 +++ ./files/patch-src_dData.lfm 2015-05-13 17:12:23.000000000 +0900 @@ -1,6 +1,6 @@ ---- src/dData.lfm.orig 2014-12-20 19:39:40.000000000 -0800 -+++ src/dData.lfm 2014-12-20 19:40:02.000000000 -0800 -@@ -113,7 +113,7 @@ +--- src/dData.lfm.orig 2015-03-04 15:17:21 UTC ++++ src/dData.lfm +@@ -113,7 +113,7 @@ object dmData: TdmData ' cont VARCHAR(6) NOT NULL,' ' utc VARCHAR(12)NOT NULL,' ' lat VARCHAR(10) NOT NULL,' diff -ruN /usr/ports/comms/cqrlog/files/patch-src_dData.lrs ./files/patch-src_dData.lrs --- /usr/ports/comms/cqrlog/files/patch-src_dData.lrs 2014-12-21 13:10:59.000000000 +0900 +++ ./files/patch-src_dData.lrs 2015-05-13 17:12:23.000000000 +0900 @@ -1,6 +1,6 @@ ---- src/dData.lrs.orig 2014-10-03 12:37:57.000000000 -0700 -+++ src/dData.lrs 2014-12-20 19:41:40.000000000 -0800 -@@ -38,7 +38,7 @@ +--- src/dData.lrs.orig 2015-03-04 15:17:21 UTC ++++ src/dData.lrs +@@ -38,7 +38,7 @@ LazarusResources.Add('TdmData','FORMDATA +'ARY KEY,'#6'& pref VARCHAR(20) NOT NULL,'#6''' name V' +'ARCHAR(100) NOT NULL,'#6'% cont VARCHAR(6) NOT NULL,'#6'$ ' +' utc VARCHAR(12)NOT NULL,'#6'% lat VARCHAR(10) NOT NULL,'#6 diff -ruN /usr/ports/comms/cqrlog/files/patch-src_dData.pas ./files/patch-src_dData.pas --- /usr/ports/comms/cqrlog/files/patch-src_dData.pas 2014-07-08 03:43:59.000000000 +0900 +++ ./files/patch-src_dData.pas 2015-05-13 17:12:23.000000000 +0900 @@ -1,6 +1,6 @@ ---- src/dData.pas.orig 2014-04-13 05:14:38.000000000 -0700 -+++ src/dData.pas 2014-07-01 00:20:19.000000000 -0700 -@@ -850,22 +850,22 @@ +--- 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 @@ -27,7 +27,7 @@ PathDelim); if not DirectoryExistsUTF8(fHomeDir + 'lotw') then -@@ -888,7 +888,7 @@ +@@ -949,7 +949,7 @@ procedure TdmData.PrepareCtyData; var s,d : String; begin @@ -36,7 +36,7 @@ d := fHomeDir+'ctyfiles'+PathDelim; if not FileExistsUTF8(fHomeDir+'ctyfiles'+PathDelim+'AreaOK1RR.tbl') then -@@ -952,7 +952,7 @@ +@@ -1013,7 +1013,7 @@ procedure TdmData.PrepareXplanetDir; var s,d : String; begin @@ -45,7 +45,7 @@ d := fHomeDir+'xplanet'+PathDelim; if not FileExistsUTF8(d+'geoconfig') then CopyFile(s+'geoconfig',d+'geoconfig') -@@ -962,7 +962,7 @@ +@@ -1023,7 +1023,7 @@ procedure TdmData.PrepareVoice_keyerDir; var s,d : String; begin @@ -54,7 +54,7 @@ d := fHomeDir+'voice_keyer'+PathDelim; if not FileExistsUTF8(d+'voice_keyer.sh') then CopyFile(s+'voice_keyer.sh',d+'voice_keyer.sh') -@@ -1061,7 +1061,7 @@ +@@ -1122,7 +1122,7 @@ begin if lib <> '' then fDLLUtilName := lib; diff -ruN /usr/ports/comms/cqrlog/files/patch-src_dUtils.pas ./files/patch-src_dUtils.pas --- /usr/ports/comms/cqrlog/files/patch-src_dUtils.pas 2014-12-21 13:10:59.000000000 +0900 +++ ./files/patch-src_dUtils.pas 2015-05-13 17:12:23.000000000 +0900 @@ -1,6 +1,6 @@ ---- src/dUtils.pas.orig 2014-10-03 12:37:57.000000000 -0700 -+++ src/dUtils.pas 2014-12-20 18:13:35.000000000 -0800 -@@ -2380,7 +2380,7 @@ +--- src/dUtils.pas.orig 2015-03-04 15:17:21 UTC ++++ src/dUtils.pas +@@ -2381,7 +2381,7 @@ var proj: string = ''; begin Result := ''; @@ -9,7 +9,7 @@ myloc := cqrini.ReadString('Station', 'LOC', ''); if not FileExists(Result) then begin -@@ -2670,7 +2670,7 @@ +@@ -2671,7 +2671,7 @@ begin if Device = '' then exit; diff -ruN /usr/ports/comms/cqrlog/files/patch-src_fGrayline.pas ./files/patch-src_fGrayline.pas --- /usr/ports/comms/cqrlog/files/patch-src_fGrayline.pas 2014-07-08 03:43:59.000000000 +0900 +++ ./files/patch-src_fGrayline.pas 2015-05-13 17:12:23.000000000 +0900 @@ -1,6 +1,6 @@ ---- src/fGrayline.pas.orig 2014-07-01 00:36:18.000000000 -0700 -+++ src/fGrayline.pas 2014-07-01 00:36:48.000000000 -0700 -@@ -385,7 +385,7 @@ +--- src/fGrayline.pas.orig 2015-03-04 15:17:21 UTC ++++ src/fGrayline.pas +@@ -383,7 +383,7 @@ begin RBNSpotList[i].band := ''; ImageFile := dmData.HomeDir+'images'+PathDelim+'grayline.bmp'; if not FileExists(ImageFile) then diff -ruN /usr/ports/comms/cqrlog/files/patch-src_fLoTWExport.pas ./files/patch-src_fLoTWExport.pas --- /usr/ports/comms/cqrlog/files/patch-src_fLoTWExport.pas 2014-07-08 03:43:59.000000000 +0900 +++ ./files/patch-src_fLoTWExport.pas 2015-05-13 17:12:23.000000000 +0900 @@ -1,6 +1,6 @@ ---- src/fLoTWExport.pas.orig 2014-06-30 23:38:20.000000000 -0700 -+++ src/fLoTWExport.pas 2014-06-30 23:38:53.000000000 -0700 -@@ -232,7 +232,7 @@ +--- src/fLoTWExport.pas.orig 2015-03-04 15:17:21 UTC ++++ src/fLoTWExport.pas +@@ -235,7 +235,7 @@ begin else begin WindowState := wsMaximized end; diff -ruN /usr/ports/comms/cqrlog/files/patch-src_fPreferences.pas ./files/patch-src_fPreferences.pas --- /usr/ports/comms/cqrlog/files/patch-src_fPreferences.pas 2014-07-08 03:43:59.000000000 +0900 +++ ./files/patch-src_fPreferences.pas 2015-05-13 17:12:23.000000000 +0900 @@ -1,6 +1,6 @@ ---- src/fPreferences.pas.orig 2014-06-30 23:39:36.000000000 -0700 -+++ src/fPreferences.pas 2014-06-30 23:39:52.000000000 -0700 -@@ -2471,7 +2471,7 @@ +--- 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); @@ -9,7 +9,7 @@ edtR1Device.Text := cqrini.ReadString('TRX1', 'device', ''); edtRigID1.Text := cqrini.ReadString('TRX1', 'model', ''); -@@ -2508,7 +2508,7 @@ +@@ -2619,7 +2619,7 @@ begin cmbDTRR2.ItemIndex := cqrini.ReadInteger('TRX2', 'DTR', 0); cmbRTSR2.ItemIndex := cqrini.ReadInteger('TRX2', 'RTS', 0); @@ -18,9 +18,9 @@ edtRot1Device.Text := cqrini.ReadString('ROT1', 'device', ''); edtRot1ID.Text := cqrini.ReadString('ROT1', 'model', ''); -@@ -2725,7 +2725,7 @@ - chkIgnoreBandFreq.Checked := cqrini.ReadBool('BandMap','IgnoreBandFreq',True); +@@ -2844,7 +2844,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'); diff -ruN /usr/ports/comms/cqrlog/files/patch-src_fRotControl.pas ./files/patch-src_fRotControl.pas --- /usr/ports/comms/cqrlog/files/patch-src_fRotControl.pas 2014-07-08 03:43:59.000000000 +0900 +++ ./files/patch-src_fRotControl.pas 2015-05-13 17:12:23.000000000 +0900 @@ -1,6 +1,6 @@ ---- src/fRotControl.pas.orig 2014-06-30 23:40:26.000000000 -0700 -+++ src/fRotControl.pas 2014-06-30 23:40:33.000000000 -0700 -@@ -130,7 +130,7 @@ +--- src/fRotControl.pas.orig 2015-03-04 15:17:21 UTC ++++ src/fRotControl.pas +@@ -137,7 +137,7 @@ begin rotor.RotId := 1 else rotor.RotId := id; diff -ruN /usr/ports/comms/cqrlog/files/patch-src_fTRXControl.pas ./files/patch-src_fTRXControl.pas --- /usr/ports/comms/cqrlog/files/patch-src_fTRXControl.pas 2014-07-08 03:43:59.000000000 +0900 +++ ./files/patch-src_fTRXControl.pas 2015-05-13 17:12:23.000000000 +0900 @@ -1,6 +1,6 @@ ---- src/fTRXControl.pas.orig 2014-06-30 23:40:59.000000000 -0700 -+++ src/fTRXControl.pas 2014-06-30 23:41:05.000000000 -0700 -@@ -658,7 +658,7 @@ +--- src/fTRXControl.pas.orig 2015-03-04 15:17:21 UTC ++++ src/fTRXControl.pas +@@ -660,7 +660,7 @@ begin else radio.RigId := id; //Writeln('huu4'); diff -ruN /usr/ports/comms/cqrlog/files/patch-src_ssl__openssl__lib.pas ./files/patch-src_ssl__openssl__lib.pas --- /usr/ports/comms/cqrlog/files/patch-src_ssl__openssl__lib.pas 1970-01-01 09:00:00.000000000 +0900 +++ ./files/patch-src_ssl__openssl__lib.pas 2015-05-13 17:12:23.000000000 +0900 @@ -0,0 +1,20 @@ +--- 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} diff -ruN /usr/ports/comms/cqrlog/files/patch-src_ssl_openssl_lib.pas ./files/patch-src_ssl_openssl_lib.pas --- /usr/ports/comms/cqrlog/files/patch-src_ssl_openssl_lib.pas 2014-07-08 03:43:59.000000000 +0900 +++ ./files/patch-src_ssl_openssl_lib.pas 1970-01-01 09:00:00.000000000 +0900 @@ -1,20 +0,0 @@ ---- 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} diff -ruN /usr/ports/comms/cqrlog/files/patch-src_synaser.pas ./files/patch-src_synaser.pas --- /usr/ports/comms/cqrlog/files/patch-src_synaser.pas 2014-07-08 03:43:59.000000000 +0900 +++ ./files/patch-src_synaser.pas 2015-05-13 17:12:23.000000000 +0900 @@ -1,6 +1,6 @@ ---- src/synaser.pas.orig 2014-06-30 22:04:41.000000000 -0700 -+++ src/synaser.pas 2014-06-30 22:21:53.000000000 -0700 -@@ -302,7 +302,7 @@ +--- 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} @@ -9,7 +9,7 @@ function ReadLockfile: integer; virtual; function LockfileName: String; virtual; procedure CreateLockfile(PidNr: integer); virtual; -@@ -591,7 +591,7 @@ +@@ -591,7 +591,7 @@ type {:Raise Synaser error with ErrNumber code. Usually used by internal routines.} procedure RaiseSynaError(ErrNumber: integer); virtual; @@ -18,7 +18,7 @@ function cpomComportAccessible: boolean; virtual;{HGJ} procedure cpomReleaseComport; virtual; {HGJ} {$ENDIF} -@@ -766,7 +766,7 @@ +@@ -766,7 +766,7 @@ begin end; if InstanceActive then begin @@ -27,7 +27,7 @@ if FLinuxLock then cpomReleaseComport; {$ENDIF} -@@ -917,7 +917,7 @@ +@@ -917,7 +917,7 @@ begin FHandle := THandle(fpOpen(FDevice, O_RDWR or O_SYNC)); {$ENDIF} SerialCheck(integer(FHandle)); @@ -36,7 +36,7 @@ if FLastError <> sOK then if FLinuxLock then cpomReleaseComport; -@@ -949,7 +949,7 @@ +@@ -949,7 +949,7 @@ begin begin SetSynaError(ErrNoDeviceAnswer); FileClose(integer(FHandle)); {HGJ} @@ -45,7 +45,7 @@ if FLinuxLock then cpomReleaseComport; {HGJ} {$ENDIF} {HGJ} -@@ -1899,7 +1899,7 @@ +@@ -1899,7 +1899,7 @@ begin {$IFNDEF FPC} SerialCheck(ioctl(integer(FHandle), TCFLSH, TCIOFLUSH)); {$ELSE} @@ -54,7 +54,7 @@ //SerialCheck(fpioctl(integer(FHandle), TCFLSH, TCIOFLUSH)); {$ENDIF} FBuffer := ''; -@@ -2136,7 +2136,7 @@ +@@ -2136,7 +2136,7 @@ end; Ownership Manager. }