(1) Bump version 3.21.58 to 3.21.65

(2) patch-src_misc_newinstall.cxx (Correct typo)
(3) patch-src_throb_throb.cxx     (Add comment from commit log, thanks joerg)
(4) patches/patch-configure	  (Removed, upstream now includes them
    patches/patch-xmlrpc.m4 	   for gcc-4.7)

=Version 3.21.65=
	High Speed / Multi-Carrier Modems
=Version 3.21.64=
	NetBSD compile error

	Dup Cty lookup
	Get RX buffer
	Capture Alt-F4

=Version 3.21.63=
	Macros LOG LNW EXEC
	ARQ Socket
	Default char set
	NBEMS.DIR
	RTTY CR-CR-LF
	Control-V/Z

=Version 3.21.62=
	Pause-break
	WF-only-escape
	REPEAT Macro
	MT63 Long

=Version 3.21.61=
	ARQ server
	DistCheck cleanup

=Version 3.21.60=
	FLTK-1.1.x
	Libtiniconv
	Allow xmit of EOT character

=Version 3.21.59=
	UTF-8 overhaul
	Thumbdrive

6 files changed, 13 insertions, 50 deletions

diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile
index c27251fd2ee..a34aa9b1ca5 100644
--- a/ham/fldigi/Makefile
+++ b/ham/fldigi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2012/12/16 01:52:17 obache Exp $
+# $NetBSD: Makefile,v 1.27 2013/01/16 02:54:54 mef Exp $
 #
 
-DISTNAME=	fldigi-3.21.58
-PKGREVISION=	2
+DISTNAME=	fldigi-3.21.65
 CATEGORIES=	ham
 MASTER_SITES=	http://www.w1hkj.com/downloads/fldigi/
 LICENSE=	gnu-gpl-v3
diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo
index b1a2ec64d9b..9b3996d72bc 100644
--- a/ham/fldigi/distinfo
+++ b/ham/fldigi/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.10 2012/12/26 06:50:27 mef Exp $
+$NetBSD: distinfo,v 1.11 2013/01/16 02:54:54 mef Exp $
 
-SHA1 (fldigi-3.21.58.tar.gz) = 8ec7ec70cfcc0591fcfd0e3bcb34f9d5a24cab7a
-RMD160 (fldigi-3.21.58.tar.gz) = 32f3dd51c99285cc3addf3a402365b4db7af0a5b
-Size (fldigi-3.21.58.tar.gz) = 1794407 bytes
-SHA1 (patch-configure) = 7688007c234124257aae8628d237120182765e1f
-SHA1 (patch-src_misc_newinstall.cxx) = 9cb519bb0bc862b18cfc7fb7bf85c2259e4ff2f0
-SHA1 (patch-src_throb_throb.cxx) = 4515fdfe67aec3273ebe2d9a348f8e13ef596c71
-SHA1 (patch-xmlrpc.m4) = c5fa6105663b534a18f2dc3a4860f76297337bb1
+SHA1 (fldigi-3.21.65.tar.gz) = 02b5a63e5895e39a3727bc717b5fe6ffefc602de
+RMD160 (fldigi-3.21.65.tar.gz) = 7cca0f4e066d02ca8141e8a8097ee721666888f2
+Size (fldigi-3.21.65.tar.gz) = 2134500 bytes
+SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c
+SHA1 (patch-src_throb_throb.cxx) = a5dc3edc64058076d046ee99e76dfc84663f756e
diff --git a/ham/fldigi/patches/patch-configure b/ham/fldigi/patches/patch-configure
deleted file mode 100644
index 3e89266d750..00000000000
--- a/ham/fldigi/patches/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2012/12/26 06:50:28 mef Exp $
-
-The original sed script eats space chars around '-lpthread',
-getting g++: unrecognized option '-pthread-lrt'.
-Thus work arround:
-
---- configure.orig	2012-10-21 05:31:25.000000000 +0900
-+++ configure	2012-12-25 20:10:40.816648000 +0900
-@@ -9938,8 +9938,8 @@
-           ac_cv_xmlrpc=yes
- 
-           test "x$XMLRPC_CFLAGS" = "x" && XMLRPC_CFLAGS=`$XMLRPC_C_CONFIG c++2 abyss-server --cflags`
-           if test "x$XMLRPC_LIBS" = "x"; then
--              XMLRPC_LIBS=`$XMLRPC_C_CONFIG c++2 abyss-server --ldadd | sed s/.-lpthread.//`
-+              XMLRPC_LIBS=`$XMLRPC_C_CONFIG c++2 abyss-server --ldadd | sed 's/.-lpthread./ /'`
-               test "$ac_cv_static" = "yes" && XMLRPC_LIBS="-Wl,-Bstatic $XMLRPC_LIBS -Wl,-Bdynamic"
-           fi
-       fi
-
diff --git a/ham/fldigi/patches/patch-src_misc_newinstall.cxx b/ham/fldigi/patches/patch-src_misc_newinstall.cxx
index 5a693965e2b..cd19beee0f5 100644
--- a/ham/fldigi/patches/patch-src_misc_newinstall.cxx
+++ b/ham/fldigi/patches/patch-src_misc_newinstall.cxx
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_misc_newinstall.cxx,v 1.1 2012/09/28 13:41:30 gdt Exp $
+$NetBSD: patch-src_misc_newinstall.cxx,v 1.2 2013/01/16 02:54:55 mef Exp $
 
-Brag command show OS:, but it is fixed, See SUBST in Makefile
+Brag command shows OS:, but it is fixed, see SUBST in Makefile
 
 --- src/misc/newinstall.cxx.orig	2012-09-25 13:22:44.000000000 +0900
 +++ src/misc/newinstall.cxx	2012-09-25 13:23:42.000000000 +0900
diff --git a/ham/fldigi/patches/patch-src_throb_throb.cxx b/ham/fldigi/patches/patch-src_throb_throb.cxx
index de0afcfb96e..de00ba416a5 100644
--- a/ham/fldigi/patches/patch-src_throb_throb.cxx
+++ b/ham/fldigi/patches/patch-src_throb_throb.cxx
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_throb_throb.cxx,v 1.1 2012/11/19 23:23:39 joerg Exp $
+$NetBSD: patch-src_throb_throb.cxx,v 1.2 2013/01/16 02:54:55 mef Exp $
+
+Don't use variable length arrays of non-POD types
 
 --- src/throb/throb.cxx.orig	2012-11-19 16:10:27.000000000 +0000
 +++ src/throb/throb.cxx
diff --git a/ham/fldigi/patches/patch-xmlrpc.m4 b/ham/fldigi/patches/patch-xmlrpc.m4
deleted file mode 100644
index cdaab7d5e38..00000000000
--- a/ham/fldigi/patches/patch-xmlrpc.m4
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-xmlrpc.m4,v 1.1 2012/12/26 06:50:28 mef Exp $
-
-The original sed script eats space chars around '-lpthread',
-getting g++: unrecognized option '-pthread-lrt'.
-Thus work arround:
-
---- m4/xmlrpc.m4.orig	2012-12-25 08:59:11.337607000 +0900
-+++ m4/xmlrpc.m4	2012-12-25 09:20:27.797219000 +0900
-@@ -12,7 +12,7 @@
- 
-           test "x$XMLRPC_CFLAGS" = "x" && XMLRPC_CFLAGS=`$XMLRPC_C_CONFIG c++2 abyss-server --cflags`
-           if test "x$XMLRPC_LIBS" = "x"; then
--              XMLRPC_LIBS=`$XMLRPC_C_CONFIG c++2 abyss-server --ldadd | sed s/.-lpthread.//`
-+              XMLRPC_LIBS=`$XMLRPC_C_CONFIG c++2 abyss-server --ldadd | sed 's/.-lpthread./ /'`
-               test "$ac_cv_static" = "yes" && XMLRPC_LIBS="-Wl,-Bstatic $XMLRPC_LIBS -Wl,-Bdynamic"
-           fi
-       fi