summaryrefslogtreecommitdiff
path: root/ham
diff options
context:
space:
mode:
Diffstat (limited to 'ham')
-rw-r--r--ham/fldigi/Makefile5
-rw-r--r--ham/fldigi/PLIST5
-rw-r--r--ham/fldigi/distinfo34
-rw-r--r--ham/fldigi/patches/patch-src_dominoex_dominoex.cxx6
-rw-r--r--ham/fldigi/patches/patch-src_include_qrunner.h6
-rw-r--r--ham/fldigi/patches/patch-src_logbook_logsupport.cxx6
-rw-r--r--ham/fldigi/patches/patch-src_misc_configuration.cxx19
-rw-r--r--ham/fldigi/patches/patch-src_misc_dxcc.cxx6
-rw-r--r--ham/fldigi/patches/patch-src_misc_newinstall.cxx2
-rw-r--r--ham/fldigi/patches/patch-src_misc_re.cxx6
-rw-r--r--ham/fldigi/patches/patch-src_navtex_navtex.cxx19
-rw-r--r--ham/fldigi/patches/patch-src_spot_notify.cxx16
-rw-r--r--ham/fldigi/patches/patch-src_spot_pskrep.cxx6
-rw-r--r--ham/fldigi/patches/patch-src_spot_spot.cxx6
-rw-r--r--ham/fldigi/patches/patch-src_thor_thor.cxx6
-rw-r--r--ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp6
-rw-r--r--ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp6
-rw-r--r--ham/fldigi/patches/patch-src_xmlrpcpp_base64.h6
18 files changed, 108 insertions, 58 deletions
diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile
index 5c0f1664f5d..29e90e2fbda 100644
--- a/ham/fldigi/Makefile
+++ b/ham/fldigi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2013/09/12 18:58:07 adam Exp $
+# $NetBSD: Makefile,v 1.36 2013/09/13 06:35:55 mef Exp $
#
-DISTNAME= fldigi-3.21.70
-PKGREVISION= 3
+DISTNAME= fldigi-3.21.76
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 8ab959eb499..ba73a49c0bf 100644
--- a/ham/fldigi/PLIST
+++ b/ham/fldigi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/09/28 13:41:30 gdt Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/09/13 06:35:55 mef Exp $
bin/flarq
bin/fldigi
bin/fldigi-shell
@@ -8,6 +8,9 @@ man/man1/fldigi.1
share/applications/flarq.desktop
share/applications/fldigi.desktop
share/fldigi/NAVTEX_Stations.csv
+share/fldigi/ToR-Stats-SHIP.csv
+share/fldigi/nsd_bbsss.txt
+share/fldigi/station_table.txt
share/locale/es/LC_MESSAGES/fldigi.mo
share/locale/fr/LC_MESSAGES/fldigi.mo
share/locale/it/LC_MESSAGES/fldigi.mo
diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo
index 5816b47fb56..21dd4001226 100644
--- a/ham/fldigi/distinfo
+++ b/ham/fldigi/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.14 2013/07/05 21:34:12 joerg Exp $
+$NetBSD: distinfo,v 1.15 2013/09/13 06:35:55 mef Exp $
-SHA1 (fldigi-3.21.70.tar.gz) = 670700583404205990c7b7229eb6e75909698e63
-RMD160 (fldigi-3.21.70.tar.gz) = bcbb75218cc79d4662bf4bd07ed206823d9c953e
-Size (fldigi-3.21.70.tar.gz) = 2145803 bytes
-SHA1 (patch-src_dominoex_dominoex.cxx) = f1f94bb21856f1911c75ee0a138170fba17432b4
-SHA1 (patch-src_include_qrunner.h) = 575a142fa935be760e6d440de5b6d965c6259388
-SHA1 (patch-src_logbook_logsupport.cxx) = f5540103677064d8a6da61db8f445b792729305c
-SHA1 (patch-src_misc_dxcc.cxx) = 05fe507377334dd2787a76395dec21afeacf499a
+SHA1 (fldigi-3.21.76.tar.gz) = c5affcedd19410d02e176e38914787278a21ec44
+RMD160 (fldigi-3.21.76.tar.gz) = b9261eb62b75c238dc3ad790b66e35f52255d29b
+Size (fldigi-3.21.76.tar.gz) = 2537663 bytes
+SHA1 (patch-src_dominoex_dominoex.cxx) = 39d2d2e75497ec5264148bc4927278df5adaa84d
+SHA1 (patch-src_include_qrunner.h) = 5dac7e9fd52f10c66978a854963bd03d39a729d0
+SHA1 (patch-src_logbook_logsupport.cxx) = bffff9fe6ee6f07596fa1e65208377d17b822263
+SHA1 (patch-src_misc_configuration.cxx) = 4f1940b0ff9d51418b37d01636c1a45f9a392943
+SHA1 (patch-src_misc_dxcc.cxx) = 23533d5062d731b56c7f7b2e9e4cac0b2b4f7194
SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c
-SHA1 (patch-src_misc_re.cxx) = 9daf70fa7844546e6ad761b5bdf924b6de74843c
-SHA1 (patch-src_navtex_navtex.cxx) = 689581bfedf83416baf876ef1c51769ce673b9d8
-SHA1 (patch-src_spot_notify.cxx) = e0f2889f1ae2405326b2883f13f618c3d9bfd412
-SHA1 (patch-src_spot_pskrep.cxx) = 1ea5838d80224b06fe940802f4f6ee7ac4207a72
-SHA1 (patch-src_spot_spot.cxx) = e69b10e9f9e884d3ef3cf5bb18d882cb1a5db5a7
-SHA1 (patch-src_thor_thor.cxx) = 7df1c77f79f9746e243440740bb35994a09ac66e
-SHA1 (patch-src_xmlrpcpp_XmlRpcClient.cpp) = 5d7aab9e194cd51ca0bd56430e751db1491dd1f7
-SHA1 (patch-src_xmlrpcpp_XmlRpcServer.cpp) = 30da72b30c6f66ecaa1e05ac1b53450db9a1c2cc
-SHA1 (patch-src_xmlrpcpp_base64.h) = 1f1b27e010c5e4ce0f9d5b0bf4a729eefc7535ac
+SHA1 (patch-src_misc_re.cxx) = 3efef73457f404ede4a44416e6132f61ab74cf93
+SHA1 (patch-src_spot_notify.cxx) = c7ac90d1c6337061c5aa52eaab5a47a01a88ca7b
+SHA1 (patch-src_spot_pskrep.cxx) = 26b2777af505cf40a8d9d9f1dd21d7f21ca3e161
+SHA1 (patch-src_spot_spot.cxx) = b43db1a5d69f492e9ec47b211b285bdf7d5bab5e
+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
index b8a3650c909..982b8ac75a6 100644
--- a/ham/fldigi/patches/patch-src_dominoex_dominoex.cxx
+++ b/ham/fldigi/patches/patch-src_dominoex_dominoex.cxx
@@ -1,4 +1,8 @@
-$NetBSD: patch-src_dominoex_dominoex.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $
+$NetBSD: patch-src_dominoex_dominoex.cxx,v 1.2 2013/09/13 06:35:55 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
diff --git a/ham/fldigi/patches/patch-src_include_qrunner.h b/ham/fldigi/patches/patch-src_include_qrunner.h
index cb02aed5479..6176fb34b7a 100644
--- a/ham/fldigi/patches/patch-src_include_qrunner.h
+++ b/ham/fldigi/patches/patch-src_include_qrunner.h
@@ -1,4 +1,8 @@
-$NetBSD: patch-src_include_qrunner.h,v 1.1 2013/05/06 14:49:32 joerg Exp $
+$NetBSD: patch-src_include_qrunner.h,v 1.2 2013/09/13 06:35:55 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
diff --git a/ham/fldigi/patches/patch-src_logbook_logsupport.cxx b/ham/fldigi/patches/patch-src_logbook_logsupport.cxx
index 503cc37266c..07253cd2903 100644
--- a/ham/fldigi/patches/patch-src_logbook_logsupport.cxx
+++ b/ham/fldigi/patches/patch-src_logbook_logsupport.cxx
@@ -1,4 +1,8 @@
-$NetBSD: patch-src_logbook_logsupport.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $
+$NetBSD: patch-src_logbook_logsupport.cxx,v 1.2 2013/09/13 06:35:55 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/logbook/logsupport.cxx.orig 2013-05-03 14:19:39.000000000 +0000
+++ src/logbook/logsupport.cxx
diff --git a/ham/fldigi/patches/patch-src_misc_configuration.cxx b/ham/fldigi/patches/patch-src_misc_configuration.cxx
new file mode 100644
index 00000000000..e5fed1b3c0b
--- /dev/null
+++ b/ham/fldigi/patches/patch-src_misc_configuration.cxx
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_misc_configuration.cxx,v 1.1 2013/09/13 06:35:55 mef Exp $
+
+For DragonFly build to fix following problem:
+misc/configuration.cxx: In member function 'void configuration::testCommPorts()':
+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()
+
+ #if defined(__WOE32__)
+ # define TTY_MAX 255
+-#elif defined(__OpenBSD__) || defined(__NetBSD__)
++#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ # define TTY_MAX 4
+ #else
+ # define TTY_MAX 8
diff --git a/ham/fldigi/patches/patch-src_misc_dxcc.cxx b/ham/fldigi/patches/patch-src_misc_dxcc.cxx
index e9bf8ad8d39..24a82426046 100644
--- a/ham/fldigi/patches/patch-src_misc_dxcc.cxx
+++ b/ham/fldigi/patches/patch-src_misc_dxcc.cxx
@@ -1,4 +1,8 @@
-$NetBSD: patch-src_misc_dxcc.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $
+$NetBSD: patch-src_misc_dxcc.cxx,v 1.2 2013/09/13 06:35:55 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/misc/dxcc.cxx.orig 2013-05-03 14:21:04.000000000 +0000
+++ src/misc/dxcc.cxx
diff --git a/ham/fldigi/patches/patch-src_misc_newinstall.cxx b/ham/fldigi/patches/patch-src_misc_newinstall.cxx
index cd19beee0f5..dc14aced97f 100644
--- a/ham/fldigi/patches/patch-src_misc_newinstall.cxx
+++ b/ham/fldigi/patches/patch-src_misc_newinstall.cxx
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_misc_newinstall.cxx,v 1.2 2013/01/16 02:54:55 mef Exp $
+$NetBSD: patch-src_misc_newinstall.cxx,v 1.3 2013/09/13 06:35:55 mef Exp $
Brag command shows OS:, but it is fixed, see SUBST in Makefile
diff --git a/ham/fldigi/patches/patch-src_misc_re.cxx b/ham/fldigi/patches/patch-src_misc_re.cxx
index 36af7643080..7c06d28ab74 100644
--- a/ham/fldigi/patches/patch-src_misc_re.cxx
+++ b/ham/fldigi/patches/patch-src_misc_re.cxx
@@ -1,4 +1,8 @@
-$NetBSD: patch-src_misc_re.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $
+$NetBSD: patch-src_misc_re.cxx,v 1.2 2013/09/13 06:35:55 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/misc/re.cxx.orig 2013-05-03 14:24:52.000000000 +0000
+++ src/misc/re.cxx
diff --git a/ham/fldigi/patches/patch-src_navtex_navtex.cxx b/ham/fldigi/patches/patch-src_navtex_navtex.cxx
deleted file mode 100644
index c36e044c7a7..00000000000
--- a/ham/fldigi/patches/patch-src_navtex_navtex.cxx
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_navtex_navtex.cxx,v 1.2 2013/07/05 21:34:12 joerg Exp $
-
---- src/navtex/navtex.cxx.orig 2013-05-03 14:31:34.000000000 +0000
-+++ src/navtex/navtex.cxx
-@@ -177,12 +177,12 @@ bool read_until_delim( std::istream & is
- if( ! std::getline( istrm, parsed_str, delim ) ) return false ;
- std::stringstream sstrm( parsed_str );
- sstrm >> ref ;
-- return sstrm ;
-+ return !sstrm.bad();
- }
-
- static bool read_until_delim( std::istream & istrm, std::string & ref )
- {
-- return std::getline( istrm, ref, delim );
-+ return !std::getline( istrm, ref, delim ).bad();
- }
-
- class NavtexRecord
diff --git a/ham/fldigi/patches/patch-src_spot_notify.cxx b/ham/fldigi/patches/patch-src_spot_notify.cxx
index b76d266da47..48721db9627 100644
--- a/ham/fldigi/patches/patch-src_spot_notify.cxx
+++ b/ham/fldigi/patches/patch-src_spot_notify.cxx
@@ -1,10 +1,14 @@
-$NetBSD: patch-src_spot_notify.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $
+$NetBSD: patch-src_spot_notify.cxx,v 1.2 2013/09/13 06:35:55 mef Exp $
---- src/spot/notify.cxx.orig 2013-05-03 14:35:28.000000000 +0000
-+++ src/spot/notify.cxx
-@@ -33,7 +33,10 @@
- #include <cctype>
- #include <cstdlib>
+Avoid implicit conversions to bool for streams.
+Require C++11 for Clang and prefer std version over tr1 when in C++11
+mode.
+
+--- src/spot/notify.cxx.orig 2013-07-06 20:54:45.000000000 +0900
++++ src/spot/notify.cxx 2013-07-07 15:25:39.000000000 +0900
+@@ -35,7 +35,10 @@
+
+ #include "timeops.h"
-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
+#if __cplusplus >= 201103L
diff --git a/ham/fldigi/patches/patch-src_spot_pskrep.cxx b/ham/fldigi/patches/patch-src_spot_pskrep.cxx
index 4fdd04a4596..1a499d83777 100644
--- a/ham/fldigi/patches/patch-src_spot_pskrep.cxx
+++ b/ham/fldigi/patches/patch-src_spot_pskrep.cxx
@@ -1,4 +1,8 @@
-$NetBSD: patch-src_spot_pskrep.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $
+$NetBSD: patch-src_spot_pskrep.cxx,v 1.2 2013/09/13 06:35:55 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/spot/pskrep.cxx.orig 2013-05-03 14:36:37.000000000 +0000
+++ src/spot/pskrep.cxx
diff --git a/ham/fldigi/patches/patch-src_spot_spot.cxx b/ham/fldigi/patches/patch-src_spot_spot.cxx
index 68164ebf36c..e6896bc58a3 100644
--- a/ham/fldigi/patches/patch-src_spot_spot.cxx
+++ b/ham/fldigi/patches/patch-src_spot_spot.cxx
@@ -1,4 +1,8 @@
-$NetBSD: patch-src_spot_spot.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $
+$NetBSD: patch-src_spot_spot.cxx,v 1.2 2013/09/13 06:35:55 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/spot/spot.cxx.orig 2013-05-03 14:37:33.000000000 +0000
+++ src/spot/spot.cxx
diff --git a/ham/fldigi/patches/patch-src_thor_thor.cxx b/ham/fldigi/patches/patch-src_thor_thor.cxx
index 04997092c88..c2a83e59f47 100644
--- a/ham/fldigi/patches/patch-src_thor_thor.cxx
+++ b/ham/fldigi/patches/patch-src_thor_thor.cxx
@@ -1,4 +1,8 @@
-$NetBSD: patch-src_thor_thor.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $
+$NetBSD: patch-src_thor_thor.cxx,v 1.2 2013/09/13 06:35:55 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/thor/thor.cxx.orig 2013-05-03 14:19:08.000000000 +0000
+++ src/thor/thor.cxx
diff --git a/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp
index 6d9452ca4a7..7ffc39d4101 100644
--- a/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp
+++ b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp
@@ -1,4 +1,8 @@
-$NetBSD: patch-src_xmlrpcpp_XmlRpcClient.cpp,v 1.1 2013/05/06 14:49:32 joerg Exp $
+$NetBSD: patch-src_xmlrpcpp_XmlRpcClient.cpp,v 1.2 2013/09/13 06:35:55 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
diff --git a/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp
index fee4cd7db20..952ee3f3336 100644
--- a/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp
+++ b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp
@@ -1,4 +1,8 @@
-$NetBSD: patch-src_xmlrpcpp_XmlRpcServer.cpp,v 1.1 2013/05/06 14:49:32 joerg Exp $
+$NetBSD: patch-src_xmlrpcpp_XmlRpcServer.cpp,v 1.2 2013/09/13 06:35:55 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
diff --git a/ham/fldigi/patches/patch-src_xmlrpcpp_base64.h b/ham/fldigi/patches/patch-src_xmlrpcpp_base64.h
index 478ee4e6f05..a3146b3b8d6 100644
--- a/ham/fldigi/patches/patch-src_xmlrpcpp_base64.h
+++ b/ham/fldigi/patches/patch-src_xmlrpcpp_base64.h
@@ -1,4 +1,8 @@
-$NetBSD: patch-src_xmlrpcpp_base64.h,v 1.1 2013/05/06 14:49:32 joerg Exp $
+$NetBSD: patch-src_xmlrpcpp_base64.h,v 1.2 2013/09/13 06:35:55 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 14:18:55 +0000