(pkgsrc)

 - Add comments to patches picked from cvs log
 - Update HOMEPAGE and MASTER_SITES (to SF)
 - (move LICENSE= line to the second paragraph)

(upstream)
 - Update 3.22.13 to 3.23.03
----------------------------
=Version 3.23.03=
2015-09-28  David Freese  <iam_w1hkj@w1hkj.com>
	c3b610b: FSQ trigger bug

=Version 3.23.02=
	0424764: fsq cqcqcq
	198c5a0: fsq sounder/heard-aging
	dbb169b: FSQ directive
	d47b1e3: rigcat delayed startup
	e6ebe70: OS-X serial

2015-09-23  Kamal Mostafa  <kamal@whence.com>
	f75b92a: asciidoc timezone

=Version 3.23.01=
2015-09-22  David Freese  <iam_w1hkj@w1hkj.com>
	8ad0a8b: WX configure
	0caa5ea: PA debug
	838e112: WFALL-ONLY
	f472a17: Logbook read
	7cb4c66: ifkp avatar depth
	ea18942: IFKP image slant

=Version 3.23.00=
	f78aa38: Clear Tx Panel
	cbff7c3: Olivia/Contestia start stop tones
	37175e2: macro bug
	3d6e0b9: FSQ updates
	ed3b09d: ifkp modem
	c82de8e: MXE update
	7b42e01: Macros
	0606d1a: Doxygen help
	d4b6308: QSO rec
	2df24b8: MS Read logbook
	30ad2a9: WEFAX hang on INFO
	6704797: Nu opBW combos
	db69617: LSB modes

6 files changed, 32 insertions, 18 deletions

diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile
index e21b6b87283..e4caec80cd7 100644
--- a/ham/fldigi/Makefile
+++ b/ham/fldigi/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.57 2015/07/23 12:11:29 mef Exp $
+# $NetBSD: Makefile,v 1.58 2015/10/11 03:59:56 mef Exp $
 
-DISTNAME=	fldigi-3.22.13
+DISTNAME=	fldigi-3.23.03
 CATEGORIES=	ham
-MASTER_SITES=	http://www.w1hkj.com/downloads/fldigi/
-LICENSE=	gnu-gpl-v3
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fldigi/}
 
 MAINTAINER=	makoto@ki.nu
-HOMEPAGE=	http://www.w1hkj.com/Fldigi.html
-#HOMEPAGE=	http://lists.berlios.de/mailman/listinfo/fldigi-devel
+HOMEPAGE=	http://www.w1hkj.com/
 COMMENT=	Digital radio modem
+LICENSE=	gnu-gpl-v3
 
 USE_TOOLS+=	gmake pkg-config
 USE_LANGUAGES=	c c++
diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo
index 895503af78b..1f100fa74fe 100644
--- a/ham/fldigi/distinfo
+++ b/ham/fldigi/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.29 2015/08/10 19:26:43 joerg Exp $
+$NetBSD: distinfo,v 1.30 2015/10/11 03:59:56 mef Exp $
 
-SHA1 (fldigi-3.22.13.tar.gz) = d998aea45f03ec7fd6eccd09ab30f05be6f609e2
-RMD160 (fldigi-3.22.13.tar.gz) = dca6a9ed3c70f616455dbcbc3bc853fd740dc250
-Size (fldigi-3.22.13.tar.gz) = 2909523 bytes
-SHA1 (patch-src_dominoex_dominoex.cxx) = d59360b3649b879080f57d583000fd88861623dd
-SHA1 (patch-src_fsq_fsq.cxx) = 4d38df763b69438a0e3a1bd55dd90aaeae45cc83
-SHA1 (patch-src_include_qrunner.h) = 8ee58ce3ce8a05cd9007fb947dc32e5783216d5a
+SHA1 (fldigi-3.23.03.tar.gz) = c4b3120880ee0fc4b095d87e002005fccbd2c007
+RMD160 (fldigi-3.23.03.tar.gz) = d6c4feece665771ee59be7ab3634ef5c79c5bd68
+Size (fldigi-3.23.03.tar.gz) = 2951727 bytes
+SHA1 (patch-src_dominoex_dominoex.cxx) = 4c9a36896ee18562c2dee044f61301abde4f9a30
+SHA1 (patch-src_fsq_fsq.cxx) = 08dd9f2bc8d46dd5740e90944fe30cf2cc7e23b6
+SHA1 (patch-src_include_qrunner.h) = c395684f676bcd06e0d0f8a95a9c22dc92667879
 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_XmlRpcBase64.h) = 2fedf94f19b58494287c970abbe0ee8ddaaba5d9
+SHA1 (patch-src_xmlrpcpp_XmlRpcBase64.h) = d8101efeb16e45af0a9814466b8405d9610c0700
diff --git a/ham/fldigi/patches/patch-src_dominoex_dominoex.cxx b/ham/fldigi/patches/patch-src_dominoex_dominoex.cxx
index 18db6cfb36b..f88e884e684 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.5 2015/04/27 23:51:52 joerg Exp $
+$NetBSD: patch-src_dominoex_dominoex.cxx,v 1.6 2015/10/11 03:59:56 mef Exp $
+
+(cvs log says)
+date: 2015-04-28 08:51:52 +0900;  author: joerg;  state: Exp;  lines: +3 -7;  commitid: 2iTQbBPEdUwBShjy;
+Deal with C++11 user defined string literals. Add missing includes.
 
 --- src/dominoex/dominoex.cxx.orig	2015-04-27 23:30:32.000000000 +0000
 +++ src/dominoex/dominoex.cxx
diff --git a/ham/fldigi/patches/patch-src_fsq_fsq.cxx b/ham/fldigi/patches/patch-src_fsq_fsq.cxx
index b9d04188673..e49179b2d6b 100644
--- a/ham/fldigi/patches/patch-src_fsq_fsq.cxx
+++ b/ham/fldigi/patches/patch-src_fsq_fsq.cxx
@@ -1,4 +1,7 @@
-$NetBSD: patch-src_fsq_fsq.cxx,v 1.1 2015/08/10 19:26:43 joerg Exp $
+$NetBSD: patch-src_fsq_fsq.cxx,v 1.2 2015/10/11 03:59:56 mef Exp $
+
+date: 2015-08-11 04:26:43 +0900;  author: joerg;  state: Exp;  commitid: PzvH77JwGWkn2Lwy;
+std::complex::imag() and std::complex::real() are not lvalues.
 
 --- src/fsq/fsq.cxx.orig	2015-07-21 14:54:32.000000000 +0000
 +++ src/fsq/fsq.cxx
diff --git a/ham/fldigi/patches/patch-src_include_qrunner.h b/ham/fldigi/patches/patch-src_include_qrunner.h
index a4ab5079f85..5c5699b82df 100644
--- a/ham/fldigi/patches/patch-src_include_qrunner.h
+++ b/ham/fldigi/patches/patch-src_include_qrunner.h
@@ -1,4 +1,9 @@
-$NetBSD: patch-src_include_qrunner.h,v 1.5 2015/04/27 23:51:52 joerg Exp $
+$NetBSD: patch-src_include_qrunner.h,v 1.6 2015/10/11 03:59:56 mef Exp $
+
+date: 2015-04-28 08:51:52 +0900;  author: joerg;  state: Exp;  lines: +2 -6;  commitid: 2iTQbBPEdUwBShjy;
+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	2015-04-27 23:31:20.000000000 +0000
 +++ src/include/qrunner.h
diff --git a/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcBase64.h b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcBase64.h
index 547d5296740..eeefc07afbb 100644
--- a/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcBase64.h
+++ b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcBase64.h
@@ -1,4 +1,7 @@
-$NetBSD: patch-src_xmlrpcpp_XmlRpcBase64.h,v 1.1 2015/04/27 23:51:52 joerg Exp $
+$NetBSD: patch-src_xmlrpcpp_XmlRpcBase64.h,v 1.2 2015/10/11 03:59:56 mef Exp $
+
+date: 2015-04-28 08:51:52 +0900;  author: joerg;  state: Exp;  commitid: 2iTQbBPEdUwBShjy;
+Deal with C++11 user defined string literals. Add missing includes.
 
 --- src/xmlrpcpp/XmlRpcBase64.h.orig	2015-04-27 23:29:49.000000000 +0000
 +++ src/xmlrpcpp/XmlRpcBase64.h