(pkgsrc)

  - Drop two patches,
   they are now included (but not exactly the same as our patches).
(upstream)
  - Update 3.23.07 to 3.23.08
-------------------------
=Version 3.23.08=

2016-02-21  Rik van Riel  <riel@surriel.com>

        bbbeed4: NAVTEX update

2016-02-16  David Freese  <iam_w1hkj@w1hkj.com>

        5b2edad: Save Logbook
        1c8e0e9: Analysis mode
        0f650e9: flrig PTT
        106e3e2: flrig waiting
        71fa224: COM port close
        dd1165a: fsq repeat last
        fb0fd4c: Mac Logger

2016-02-04  Jonathan Wakely  <redi@users.sf.net>

        813b58a: GCC 6 build

2016-02-01  David Freese  <iam_w1hkj@w1hkj.com>

        d808977: CALL capture
        bea9cfe: Scope View
        8bcc9e8: RigCAT modifications

4 files changed, 7 insertions, 85 deletions

diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile
index 1b80b07c09a..cc380271c3b 100644
--- a/ham/fldigi/Makefile
+++ b/ham/fldigi/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2016/03/05 11:28:41 jperkin Exp $
+# $NetBSD: Makefile,v 1.70 2016/03/15 14:40:03 mef Exp $
 
-DISTNAME=	fldigi-3.23.07
-PKGREVISION=	1
+DISTNAME=	fldigi-3.23.08
 CATEGORIES=	ham
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fldigi/}
 
diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo
index 2e82f32475a..8718c3ceea7 100644
--- a/ham/fldigi/distinfo
+++ b/ham/fldigi/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.42 2016/01/23 14:19:08 mef Exp $
+$NetBSD: distinfo,v 1.43 2016/03/15 14:40:03 mef Exp $
 
-SHA1 (fldigi-3.23.07.tar.gz) = 7ab69ec0c92912fd7dbb127f6d48e0bac4d9ee11
-RMD160 (fldigi-3.23.07.tar.gz) = 8dd57ead8c514025c940c58b2005a7115b134348
-SHA512 (fldigi-3.23.07.tar.gz) = e307dca63d2900087f355b342cd02fda62c80b03a2f3e4a20561174b3fc39b423181305d15b30d3445b3cd3613894402ce6b8727b8c0220268566612c1296441
-Size (fldigi-3.23.07.tar.gz) = 2976157 bytes
+SHA1 (fldigi-3.23.08.tar.gz) = 1c179b520c45497e13ea483f56fba2d8d92a9062
+RMD160 (fldigi-3.23.08.tar.gz) = e1fa34ab16323072869d0973aa58c254fae90300
+SHA512 (fldigi-3.23.08.tar.gz) = 31e38f7f8b80dc348bb2e81b499fb800a2289153b2d2987755c49f933b939b0a0c9c68c68636d73f3595f83a12529d5a1bdbb24935e92482f424607c8c95d68f
+Size (fldigi-3.23.08.tar.gz) = 2990508 bytes
 SHA1 (patch-src_dominoex_dominoex.cxx) = 4c9a36896ee18562c2dee044f61301abde4f9a30
-SHA1 (patch-src_fsq_fsq.cxx) = 6c9aa1b7c28bbc8218b471794e5a670005cfc795
-SHA1 (patch-src_ifkp_ifkp.cxx) = 22ce623ca24491a6ea9efb063851b1f04b7a7317
 SHA1 (patch-src_include_qrunner.h) = c395684f676bcd06e0d0f8a95a9c22dc92667879
 SHA1 (patch-src_misc_configuration.cxx) = 4ebf0c46913f73047ad5b858f6d4ae9def82ec60
 SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c
diff --git a/ham/fldigi/patches/patch-src_fsq_fsq.cxx b/ham/fldigi/patches/patch-src_fsq_fsq.cxx
deleted file mode 100644
index 148dc0185f2..00000000000
--- a/ham/fldigi/patches/patch-src_fsq_fsq.cxx
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-src_fsq_fsq.cxx,v 1.4 2015/11/20 14:29:17 joerg Exp $
-
-Resolve conflict between std::next and the local variable of the same name.
-std::complex::imag() and std::complex::real() are not lvalues.
-
---- src/fsq/fsq.cxx.orig	2015-09-28 18:24:41.000000000 +0000
-+++ src/fsq/fsq.cxx
-@@ -1195,9 +1195,12 @@ int fsq::rx_process(const double *buf, i
- 						&rx_stream[SHIFT_SIZE],				// from
- 						BLOCK_SIZE*sizeof(*rx_stream));	// # bytes
- 				memset(fft_data, 0, sizeof(fft_data));
--				for (int i = 0; i < BLOCK_SIZE; i++)
--					fft_data[i].real() = fft_data[i].imag() =
--						rx_stream[i] * a_blackman[i];
-+				for (int i = 0; i < BLOCK_SIZE; i++) {
-+					double r = rx_stream[i] * a_blackman[i];
-+					fft_data[i].real(r);
-+					fft_data[i].imag(r);
-+				}
-+						
- 				fft->ComplexFFT(fft_data);
- 				process_tones();
- 			}
-@@ -1426,7 +1429,7 @@ static string tx_text_queue = "";
- 
- static vector<string> commands;
- #define NUMCOMMANDS 10
--static size_t next = 0;
-+static size_t nextidx = 0;
- 
- void  clear_xmt_arrays()
- {
-@@ -1450,9 +1453,9 @@ double fsq_xmtdelay() // in seconds
- void fsq_repeat_last_command()
- {
- 	fsq_tx_text->clear();
--	fsq_tx_text->addstr(sz2utf8(commands[next].c_str()));
--	next++;
--	if (next == commands.size()) next = 0;
-+	fsq_tx_text->addstr(sz2utf8(commands[nextidx].c_str()));
-+	nextidx++;
-+	if (nextidx == commands.size()) nextidx = 0;
- }
- 
- int get_fsq_tx_char(void)
-@@ -1494,7 +1497,7 @@ void try_transmit(void *)
- 	if (active_modem != fsq_modem) return;
- 
- 	if (!active_modem->fsq_squelch_open() && trx_state == STATE_RX) {
--		next = 0;
-+		nextidx = 0;
- 		fsq_que_clear();
- //LOG_WARN("%s", "start_tx()");
- 		start_tx();
diff --git a/ham/fldigi/patches/patch-src_ifkp_ifkp.cxx b/ham/fldigi/patches/patch-src_ifkp_ifkp.cxx
deleted file mode 100644
index 87693bd8f1f..00000000000
--- a/ham/fldigi/patches/patch-src_ifkp_ifkp.cxx
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_ifkp_ifkp.cxx,v 1.1 2015/11/03 19:03:27 joerg Exp $
-
-std::complex::imag() and std::complex::real() are not lvalues.
-
---- src/ifkp/ifkp.cxx.orig	2015-10-25 14:22:27.000000000 +0000
-+++ src/ifkp/ifkp.cxx
-@@ -580,9 +580,11 @@ int ifkp::rx_process(const double *buf, 
- 						&rx_stream[IFKP_SHIFT_SIZE],			// from
- 						IFKP_BLOCK_SIZE*sizeof(*rx_stream));	// # bytes
- 				memset(fft_data, 0, sizeof(fft_data));
--				for (int i = 0; i < IFKP_BLOCK_SIZE; i++)
--					fft_data[i].real() = fft_data[i].imag() =
--						rx_stream[i] * a_blackman[i];
-+				for (int i = 0; i < IFKP_BLOCK_SIZE; i++) {
-+					double r = rx_stream[i] * a_blackman[i];
-+					fft_data[i].real(r);
-+					fft_data[i].imag(r);
-+				}
- 				fft->ComplexFFT(fft_data);
- 				process_tones();
- 			}