From 85f32f0de7f79586f04db9b6073e9346e83b471a Mon Sep 17 00:00:00 2001 From: mef Date: Sun, 26 Apr 2015 03:04:59 +0000 Subject: (pkgsrc) - Drop patches, upstream seems to fix the problems. - (flxmlrpc is not supported yet, to be added later) (upstream) - Update 3.22.07 to 3.22.08 ------------------------- =Version 3.22.08= 2015-04-23 David Freese 2bda963: Analysis 967e7c5: rx/tx queues b5aa6a3: flxmlrpc 2015-04-16 Dave Freese 28839d7: call focus 2015-04-14 David Freese a4d4faa: 599 update 41beca0: US units 91ab73f: olivia cxx a45006d: fldigi-shell ee19668: Write log 8d4f0ef: Config dialog --- ham/fldigi/Makefile | 5 ++--- ham/fldigi/PLIST | 6 ++---- ham/fldigi/distinfo | 15 +++++---------- ham/fldigi/patches/patch-src_dominoex_dominoex.cxx | 17 ----------------- ham/fldigi/patches/patch-src_include_qrunner.h | 16 ---------------- ham/fldigi/patches/patch-src_misc_configuration.cxx | 17 +++++++++++++---- ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp | 17 ----------------- ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp | 17 ----------------- ham/fldigi/patches/patch-src_xmlrpcpp_base64.h | 16 ---------------- 9 files changed, 22 insertions(+), 104 deletions(-) delete mode 100644 ham/fldigi/patches/patch-src_dominoex_dominoex.cxx delete mode 100644 ham/fldigi/patches/patch-src_include_qrunner.h delete mode 100644 ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp delete mode 100644 ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp delete mode 100644 ham/fldigi/patches/patch-src_xmlrpcpp_base64.h diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile index ca0b24ad08a..057627d016b 100644 --- a/ham/fldigi/Makefile +++ b/ham/fldigi/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.52 2015/04/25 14:23:20 tnn Exp $ +# $NetBSD: Makefile,v 1.53 2015/04/26 03:04:59 mef Exp $ -DISTNAME= fldigi-3.22.07 -PKGREVISION= 1 +DISTNAME= fldigi-3.22.08 CATEGORIES= ham MASTER_SITES= http://www.w1hkj.com/downloads/fldigi/ LICENSE= gnu-gpl-v3 diff --git a/ham/fldigi/PLIST b/ham/fldigi/PLIST index 9fdd031759c..6507c2d724a 100644 --- a/ham/fldigi/PLIST +++ b/ham/fldigi/PLIST @@ -1,9 +1,7 @@ -@comment $NetBSD: PLIST,v 1.7 2014/12/11 22:11:43 joerg Exp $ +@comment $NetBSD: PLIST,v 1.8 2015/04/26 03:04:59 mef Exp $ bin/flarq bin/fldigi -bin/fldigi-shell man/man1/flarq.1 -man/man1/fldigi-shell.1 man/man1/fldigi.1 share/applications/flarq.desktop share/applications/fldigi.desktop @@ -14,8 +12,8 @@ share/fldigi/station_table.txt share/locale/de/LC_MESSAGES/fldigi.mo share/locale/es/LC_MESSAGES/fldigi.mo share/locale/fr/LC_MESSAGES/fldigi.mo -share/locale/nl/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/pixmaps/flarq.xpm share/pixmaps/fldigi.xpm diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo index 71107b615ca..45826515ec2 100644 --- a/ham/fldigi/distinfo +++ b/ham/fldigi/distinfo @@ -1,13 +1,8 @@ -$NetBSD: distinfo,v 1.23 2015/04/03 00:53:35 mef Exp $ +$NetBSD: distinfo,v 1.24 2015/04/26 03:04:59 mef Exp $ -SHA1 (fldigi-3.22.07.tar.gz) = a196c95bb46af0a26b1395d3a0a0d8173f62d87b -RMD160 (fldigi-3.22.07.tar.gz) = 176223a7d374b2940b2c273932d2eee8c6f2b8a1 -Size (fldigi-3.22.07.tar.gz) = 2881125 bytes -SHA1 (patch-src_dominoex_dominoex.cxx) = 39d2d2e75497ec5264148bc4927278df5adaa84d -SHA1 (patch-src_include_qrunner.h) = 5dac7e9fd52f10c66978a854963bd03d39a729d0 -SHA1 (patch-src_misc_configuration.cxx) = 4f1940b0ff9d51418b37d01636c1a45f9a392943 +SHA1 (fldigi-3.22.08.tar.gz) = 862476bc0c68aa54abe60b22bfb84c03c458da2b +RMD160 (fldigi-3.22.08.tar.gz) = ca9eaee2ade1fdf56c594fc613e23cdd655354e5 +Size (fldigi-3.22.08.tar.gz) = 2876959 bytes +SHA1 (patch-src_misc_configuration.cxx) = 4ebf0c46913f73047ad5b858f6d4ae9def82ec60 SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c SHA1 (patch-src_thor_thor.cxx) = 8148f14d6f2a96d5435be871345c24ed2e4cc8b9 -SHA1 (patch-src_xmlrpcpp_XmlRpcClient.cpp) = 1307d540985fa412b445dd4b0734f115602b92b8 -SHA1 (patch-src_xmlrpcpp_XmlRpcServer.cpp) = 6c71614486971e739832ee82c669db0e0a944570 -SHA1 (patch-src_xmlrpcpp_base64.h) = 7423a23e5d2dc4a5780a202d54be76b17cb1d984 diff --git a/ham/fldigi/patches/patch-src_dominoex_dominoex.cxx b/ham/fldigi/patches/patch-src_dominoex_dominoex.cxx deleted file mode 100644 index 232860003fc..00000000000 --- a/ham/fldigi/patches/patch-src_dominoex_dominoex.cxx +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_dominoex_dominoex.cxx,v 1.3 2014/09/05 07:29:28 mef Exp $ - -Avoid implicit conversions to bool for streams. -Require C++11 for Clang and prefer std version over tr1 when in C++11 -mode. - ---- src/dominoex/dominoex.cxx.orig 2013-05-03 14:18:53.000000000 +0000 -+++ src/dominoex/dominoex.cxx -@@ -64,7 +64,7 @@ void dominoex::tx_init(SoundBase *sc) - - strSecXmtText = progdefaults.secText; - if (strSecXmtText.length() == 0) -- strSecXmtText = "fldigi "PACKAGE_VERSION" "; -+ strSecXmtText = "fldigi " PACKAGE_VERSION " "; - - videoText(); - } diff --git a/ham/fldigi/patches/patch-src_include_qrunner.h b/ham/fldigi/patches/patch-src_include_qrunner.h deleted file mode 100644 index a66f6a2e1cf..00000000000 --- a/ham/fldigi/patches/patch-src_include_qrunner.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-src_include_qrunner.h,v 1.3 2014/09/05 07:29:28 mef Exp $ - -Avoid implicit conversions to bool for streams. -Require C++11 for Clang and prefer std version over tr1 when in C++11 -mode. - ---- src/include/qrunner.h.orig 2013-05-03 14:32:45.000000000 +0000 -+++ src/include/qrunner.h -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #if HAVE_STD_BIND - # include diff --git a/ham/fldigi/patches/patch-src_misc_configuration.cxx b/ham/fldigi/patches/patch-src_misc_configuration.cxx index e50dea3e814..42e29e70e56 100644 --- a/ham/fldigi/patches/patch-src_misc_configuration.cxx +++ b/ham/fldigi/patches/patch-src_misc_configuration.cxx @@ -1,4 +1,4 @@ -$NetBSD: patch-src_misc_configuration.cxx,v 1.2 2014/09/05 07:29:28 mef Exp $ +$NetBSD: patch-src_misc_configuration.cxx,v 1.3 2015/04/26 03:04:59 mef Exp $ For DragonFly build to fix following problem: misc/configuration.cxx: In member function 'void configuration::testCommPorts()': @@ -6,9 +6,18 @@ misc/configuration.cxx:934:2: error: 'glob_t' was not declared in this scope misc/configuration.cxx:934:9: error: expected ';' before 'gbuf' gmake[3]: *** [fldigi-configuration.o] Error 1 ---- src/misc/configuration.cxx.orig 2013-04-12 23:24:15.000000000 +0900 -+++ src/misc/configuration.cxx 2013-04-18 21:29:15.000000000 +0900 -@@ -925,7 +925,7 @@ void configuration::testCommPorts() +--- src/misc/configuration.cxx.orig 2015-04-18 22:26:19.000000000 +0900 ++++ src/misc/configuration.cxx 2015-04-26 11:26:35.000000000 +0900 +@@ -863,7 +863,7 @@ + "/dev/ttyACM%u", + "/dev/usb/ttyACM%u", + "/opt/vttyS%u" +-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) + "/dev/tty%2.2u" + #elif defined(__CYGWIN__) + "/dev/ttyS%u" +@@ -877,7 +877,7 @@ #if defined(__WOE32__) # define TTY_MAX 255 diff --git a/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp deleted file mode 100644 index d0bf508eb08..00000000000 --- a/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_xmlrpcpp_XmlRpcClient.cpp,v 1.3 2014/09/05 07:29:28 mef Exp $ - -Avoid implicit conversions to bool for streams. -Require C++11 for Clang and prefer std version over tr1 when in C++11 -mode. - ---- src/xmlrpcpp/XmlRpcClient.cpp.orig 2013-05-03 14:41:57.000000000 +0000 -+++ src/xmlrpcpp/XmlRpcClient.cpp -@@ -319,7 +319,7 @@ XmlRpcClient::generateHeader(std::string - - header += "Content-Type: text/xml\r\nContent-length: "; - -- sprintf(buff,"%"PRIuSZ"\r\n\r\n", body.size()); -+ sprintf(buff,"%" PRIuSZ "\r\n\r\n", body.size()); - - return header + buff; - } diff --git a/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp deleted file mode 100644 index a50b2aa0393..00000000000 --- a/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_xmlrpcpp_XmlRpcServer.cpp,v 1.3 2014/09/05 07:29:28 mef Exp $ - -Avoid implicit conversions to bool for streams. -Require C++11 for Clang and prefer std version over tr1 when in C++11 -mode. - ---- src/xmlrpcpp/XmlRpcServer.cpp.orig 2013-05-03 14:42:36.000000000 +0000 -+++ src/xmlrpcpp/XmlRpcServer.cpp -@@ -481,7 +481,7 @@ XmlRpcServer::generateHeader(std::string - "Content-length: "; - - char buffLen[40]; -- sprintf(buffLen,"%"PRIuSZ"\r\n\r\n", body.size()); -+ sprintf(buffLen,"%" PRIuSZ "\r\n\r\n", body.size()); - - return header + buffLen; - } diff --git a/ham/fldigi/patches/patch-src_xmlrpcpp_base64.h b/ham/fldigi/patches/patch-src_xmlrpcpp_base64.h deleted file mode 100644 index cb084a100a1..00000000000 --- a/ham/fldigi/patches/patch-src_xmlrpcpp_base64.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-src_xmlrpcpp_base64.h,v 1.3 2014/09/05 07:29:28 mef Exp $ - -Avoid implicit conversions to bool for streams. -Require C++11 for Clang and prefer std version over tr1 when in C++11 -mode. - ---- src/xmlrpcpp/base64.h.orig 2013-05-03 14:39:47.000000000 +0000 -+++ src/xmlrpcpp/base64.h -@@ -10,6 +10,7 @@ - #define __BASE64_H_INCLUDED__ 1 - - #include -+#include - - static - int _base64Chars[]= {'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z', -- cgit v1.2.3