diff options
-rw-r--r-- | ham/fldigi/Makefile | 6 | ||||
-rw-r--r-- | ham/fldigi/PLIST | 3 | ||||
-rw-r--r-- | ham/fldigi/distinfo | 11 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_logbook_adif__io.cxx | 15 |
4 files changed, 10 insertions, 25 deletions
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 |