From e7fcf551db87ce7f1ce2ad546f9edc6803fe6802 Mon Sep 17 00:00:00 2001 From: mef Date: Fri, 5 May 2017 00:11:15 +0000 Subject: Updated ham/fldigi 3.23.21 to 4.0.3 --------------------------- =Version 4.0.3= 2017-04-30 David Freese c9b9bb9: OS X Wizard a8a6e09: cw decoder 7e552c4: CW wait =Version 4.0.2= 2017-04-14 keith bellairs 7432793: Lotw Match 2017-04-13 David Freese ed5850e: flrigi bw synch 9723972: Clang 8.1.0 97024a9: Sound card 1549193: Revert "wefax" c85b75e: IFKP image processing ef39743: Macro Save 4396c43: CW end-of-transmit 2f1d709: Font Initialization a1d4122: OS X socket connect 835d823: Winkeyer exit process =Version 4.0.1= f40e79d: Socket connect =Version 4.0.0= 7efc9b2: OS X 10.12 build ffd6f09: STATION_CALLSIGN f0f3763: Free BSD mods b163605: Logbook mods 167f064: ru-po-update 5354812: Default Tx Audio fac5963: remove sprintf a9db866: Documentation update b522581: n3fjp logger search c565b03: fopen -> fl_fopen abd9554: 48 bar macro 5f5776c: CW decoder 9c0f906: DX cluster 016799a: Logbook support b4e227b: WinKeyer 1fe26c1: fsq ifkp s/n computation d576fd8: fltk version update 2a1a8c3: Macro Date Time Formats 2017-02-24 Keith Bellairs 627eb31: lotw addition 2017-02-23 David Freese 0507110: THOR/IFKP Image transfers 2017-02-23 Giuseppe Ciaccio 95b51b6: OSS bug fix 2017-02-21 David Freese f462dd7: ifkp s/n update 376f7f5: PSKMAIL PTT fault protection bcec5aa: Logbook File Handling cbdea29: n3fjp contest update fccb4eb: fsq s/n update 1786a5e: README update 67bc122: Russian UTF-8 translation 9decf04: Tooltips 2017-01-30 Jae Stutzman fef4e93: Hamlib/RigCAT/XMLRPC Interface (pkgsrc changes) - Drop patch, upstream fixed it (slightly different from ours) our patch if ( ptr2 && (unsigned)(ptr2 - ptr) <= p) upstream if ((ptr2 != NULL) && (unsigned)(ptr2 - ptr) <= p) - +.include "ham/flxmlrpc/buildlink3.mk" --- ham/fldigi/Makefile | 6 +++--- ham/fldigi/PLIST | 3 ++- ham/fldigi/distinfo | 11 +++++------ ham/fldigi/patches/patch-src_logbook_adif__io.cxx | 15 --------------- 4 files changed, 10 insertions(+), 25 deletions(-) delete mode 100644 ham/fldigi/patches/patch-src_logbook_adif__io.cxx (limited to 'ham/fldigi') diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile index 9dfca2471a2..9cfa480e27c 100644 --- a/ham/fldigi/Makefile +++ b/ham/fldigi/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.87 2017/05/03 08:38:43 jperkin Exp $ +# $NetBSD: Makefile,v 1.88 2017/05/05 00:11:15 mef Exp $ -DISTNAME= fldigi-3.23.21 -PKGREVISION= 1 +DISTNAME= fldigi-4.0.3 CATEGORIES= ham MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fldigi/} @@ -54,6 +53,7 @@ CXXFLAGS+= -Wno-error=c++11-narrowing .include "../../audio/pulseaudio/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../ham/hamlib/buildlink3.mk" +.include "../../ham/flxmlrpc/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../textproc/xmlrpc-c/buildlink3.mk" #include "../../textproc/json-c/buildlink3.mk" diff --git a/ham/fldigi/PLIST b/ham/fldigi/PLIST index 6507c2d724a..bb5fa98188a 100644 --- a/ham/fldigi/PLIST +++ b/ham/fldigi/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2015/04/26 03:04:59 mef Exp $ +@comment $NetBSD: PLIST,v 1.9 2017/05/05 00:11:15 mef Exp $ bin/flarq bin/fldigi man/man1/flarq.1 @@ -15,5 +15,6 @@ share/locale/fr/LC_MESSAGES/fldigi.mo share/locale/it/LC_MESSAGES/fldigi.mo share/locale/nl/LC_MESSAGES/fldigi.mo share/locale/pl/LC_MESSAGES/fldigi.mo +share/locale/ru/LC_MESSAGES/fldigi.mo share/pixmaps/flarq.xpm share/pixmaps/fldigi.xpm diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo index 122780df494..bbac303934f 100644 --- a/ham/fldigi/distinfo +++ b/ham/fldigi/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.55 2017/01/31 13:39:44 mef Exp $ +$NetBSD: distinfo,v 1.56 2017/05/05 00:11:15 mef Exp $ -SHA1 (fldigi-3.23.21.tar.gz) = 689f97ce71cc4fabfaeee5fa965d6229eb245c46 -RMD160 (fldigi-3.23.21.tar.gz) = a461d7d93c02157514e221b10122d5bcc73377e3 -SHA512 (fldigi-3.23.21.tar.gz) = 95c3ad1c5558af965ec4ef9d6756ed706785c8547a638b729c71a2bed10a2a69b70c2ea554c4b74a6cbd0912d2f0172b9604e866e026c260712d76483b98ea3c -Size (fldigi-3.23.21.tar.gz) = 3217867 bytes -SHA1 (patch-src_logbook_adif__io.cxx) = 8f887056a5783f9624b1af818f01abd49316938d +SHA1 (fldigi-4.0.3.tar.gz) = cfb723506af097c0f846244dc09d05ca25d86cb9 +RMD160 (fldigi-4.0.3.tar.gz) = 4c21901c93f1ca3611de855ba64432e25c25e936 +SHA512 (fldigi-4.0.3.tar.gz) = b007e6e03bda64f981003f33a61c2a6b114341c24a897f506857c46db2b7d538a83c25d10cd2d67f53d74cabfdef236d7427b129688d994f9d34245a6538c2d6 +Size (fldigi-4.0.3.tar.gz) = 3345780 bytes SHA1 (patch-src_misc_configuration.cxx) = 4ebf0c46913f73047ad5b858f6d4ae9def82ec60 SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c diff --git a/ham/fldigi/patches/patch-src_logbook_adif__io.cxx b/ham/fldigi/patches/patch-src_logbook_adif__io.cxx deleted file mode 100644 index bfba7a210bb..00000000000 --- a/ham/fldigi/patches/patch-src_logbook_adif__io.cxx +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_logbook_adif__io.cxx,v 1.2 2017/01/01 07:27:33 mef Exp $ - -Pointers don't have a sign. - ---- src/logbook/adif_io.cxx.orig 2016-12-21 10:22:23.131474254 +0000 -+++ src/logbook/adif_io.cxx -@@ -311,7 +311,7 @@ void cAdifIO::do_readfile(const char *fn - } else { - ptr2 = ptr + 1; - } -- if ((ptr2) > 0 && (unsigned)(ptr2 - ptr) <= p) -+ if (ptr2 && (unsigned)(ptr2 - ptr) <= p) - ptr = strchr(ptr2,'<'); - else - break; // corrupt record -- cgit v1.2.3