Updated ham/fldigi 4.0.16 to 4.1.01

- (pkgsrc) drop  patch-src_rigcontrol_hamlib.cxx, it is now included)
- (upstream) below

=Version 4.1.01=

2019-02-18  David Freese  <w1hkj@bellsouth.net>

	1d4798c: CW h/w ptt
	ca3e777: nanoIO
	a943ae3: NAVTEX abort
	ce586b8: dup-check
	57cc6ea: ADIF submode
	96e1f05: WF only bug fix
	06c56b3: LotW
	c5af7e0: Pedantic warnings
	892336b: SD counties
	044dd29: QRZ.com
	aeed471: SV1GRB test report


=Version 4.1.0=

	39a76e8: po update
	79c67d3: WWV doc
	04e53b5: Winkeyer FSK
	b8ca88e: Contests
	b197c75: arq-override
	8572f35: flmsg-dir
	02c66eb: contest-docs
	9d85169: fldigi_def.xml
	20e2c02: socket_mods
	e1c2d80: Fltk 1.4 mod
	5ffd6f5: wefax
	fb1fd67: nanoIO
	7d604b8: CW SOM table
	4eec8f2: flrig: macro
	99b0a01: Audio adjust docs
	146bd7e: feldhell
	6b5c93a: C-11 fixes
	ccbd52f: nano FSK
	ed6a7db: Mint-19/Mate
	e9c0f2d: Signal Browser documentation
	fbb0654: flrig seg fault


=Version 4.0.18=

	2fef9cb: CPS testing
	aa757af: ipv6 addressing
	c62662c: MT63 centering
	9460c00: fsq mods
	5a7377f: IFKP/THOR greyscale image
	51e2829: Hamlib bug fix
	58c6362: Tooltip
	47d2c6c: nanoIO
	a253603: THROB adif
	f46cb9b: RigCAT dialog


=Version 4.0.17=

	a2b9172: flarq idtimer
	d58b0b7: Greek language update
	4c3ca8f: tmpfile
	87cb7e1: xmlrpc cat string
	4f72635: Modem start frequency
	dc68d02: Serial port discovery
	55aa627: Log entries
	2fea354: flarq appdir
	c480982: rx/tx
	56553fa: RTTY Quick pick
	79aa5d6: quick pick rtty baud
	d1f91ea: Documentation Update
	e4a5cec: CW/FSK I/O on start
	a9df13f: WinKey PTT
	6de7360: Navigator
	fa8e53e: nanoIO
	202ad12: Default Lighted Button
	dfd1b0b: ST/PR macro tags
	490f683: K2/K3/KX3 data modes
	c39a88b: Logbook read
	6cb1e5a: 8pskF
	89ff7c8: fsq/ifkp audit logs
	cd7e502: RTTY browser decode

4 files changed, 14 insertions, 37 deletions

diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile
index 0123c4dd37f..0ccafed14fe 100644
--- a/ham/fldigi/Makefile
+++ b/ham/fldigi/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.107 2018/12/13 19:52:02 adam Exp $
+# $NetBSD: Makefile,v 1.108 2019/02/23 11:30:03 mef Exp $
 
-DISTNAME=	fldigi-4.0.16
-PKGREVISION=	6
+DISTNAME=	fldigi-4.1.01
 CATEGORIES=	ham
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fldigi/}
 
diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo
index 41acc607c30..aec29981cf3 100644
--- a/ham/fldigi/distinfo
+++ b/ham/fldigi/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.65 2018/07/13 04:14:48 dbj Exp $
+$NetBSD: distinfo,v 1.66 2019/02/23 11:30:03 mef Exp $
 
-SHA1 (fldigi-4.0.16.tar.gz) = 0933d28cafd6a4c0121a27946c877e88cca69130
-RMD160 (fldigi-4.0.16.tar.gz) = d8152033e7bd4aa3d5f507be8d443af87ec278b7
-SHA512 (fldigi-4.0.16.tar.gz) = cb8eb7eb64be755bcf2021ff27fd8d6982b2fde44f3d49f46478a60c7dfb4120e1d929666c1f0cc42ae91d480be9871aa4705bf613ec78adf4c3d20ecfc9df42
-Size (fldigi-4.0.16.tar.gz) = 3727379 bytes
-SHA1 (patch-src_misc_configuration.cxx) = 4ebf0c46913f73047ad5b858f6d4ae9def82ec60
+SHA1 (fldigi-4.1.01.tar.gz) = 79bd6fbd28d7dd63de450e63de993dd230fabae2
+RMD160 (fldigi-4.1.01.tar.gz) = 598158a8367a821265893812cec496f0d1fdefaa
+SHA512 (fldigi-4.1.01.tar.gz) = f0fa33714b56d396dea59511083546765a34c645aa03875d0c6bb38af89ff79ecad6b5556895a6615d18b6340d50d94beb69e92c4a488fed346863fa1e378633
+Size (fldigi-4.1.01.tar.gz) = 3916445 bytes
+SHA1 (patch-src_misc_configuration.cxx) = 6eb188f479f2586d5aee9f919832703a9d6fa86a
 SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c
-SHA1 (patch-src_rigcontrol_hamlib.cxx) = 69c56c1acb756f2fd2d97d4022e714fad451233c
diff --git a/ham/fldigi/patches/patch-src_misc_configuration.cxx b/ham/fldigi/patches/patch-src_misc_configuration.cxx
index 42e29e70e56..aab594b12e4 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.3 2015/04/26 03:04:59 mef Exp $
+$NetBSD: patch-src_misc_configuration.cxx,v 1.4 2019/02/23 11:30:03 mef Exp $
 
 For DragonFly build to fix following problem:
 misc/configuration.cxx: In member function 'void configuration::testCommPorts()':
@@ -6,18 +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	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",
+--- src/misc/configuration.cxx.orig	2019-02-18 23:47:43.000000000 +0900
++++ src/misc/configuration.cxx	2019-02-23 18:33:27.726856173 +0900
+@@ -906,7 +906,7 @@
  		"/dev/usb/ttyACM%u",
+ 		"/dev/rfcomm%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 @@
+@@ -920,7 +920,7 @@
  
  #if defined(__WOE32__)
  #  define TTY_MAX 255
diff --git a/ham/fldigi/patches/patch-src_rigcontrol_hamlib.cxx b/ham/fldigi/patches/patch-src_rigcontrol_hamlib.cxx
deleted file mode 100644
index 1d10362e3ab..00000000000
--- a/ham/fldigi/patches/patch-src_rigcontrol_hamlib.cxx
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_rigcontrol_hamlib.cxx,v 1.1 2018/07/13 04:14:48 dbj Exp $
-
-The C++ std::sort requires the comparator return false when items are equal
-
---- src/rigcontrol/hamlib.cxx.orig	2017-11-08 12:41:13.000000000 +0000
-+++ src/rigcontrol/hamlib.cxx
-@@ -582,10 +582,10 @@ static bool rig_cmp(const struct rig_cap
- 	if (ret < 0) return true;
- 	ret = strcasecmp(rig1->model_name, rig2->model_name);
- 	if (ret > 0) return false;
--	if (ret <= 0) return true;
--	if (rig1->rig_model > rig2->rig_model)
--		return false;
--	return true;
-+	if (ret < 0) return true;
-+	if (rig1->rig_model < rig2->rig_model)
-+		return true;
-+	return false;
- }
- 
- void hamlib_get_rigs(void)