Update to 3.22.05

- Remove unnecessary patches.
- Fix space placement errors in:
    files/patch-src_thor_thor.cxx
    files/patch-src_xmlrpcpp_XmlRpcServer.cpp

7 files changed, 5 insertions, 38 deletions

diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index 46f412833a97..7b0c1731dbcd 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	fldigi
-PORTVERSION=	3.22.04
+PORTVERSION=	3.22.05
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/downloads/fldigi/\
 		${MASTER_SITE_LOCAL}
diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo
index c71abd692a15..5c74cc0b363d 100644
--- a/comms/fldigi/distinfo
+++ b/comms/fldigi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fldigi-3.22.04.tar.gz) = 936b2702dd3d3ab3630eac018c2ab043069dd9129858f2b6e11e1db30ae4a6d8
-SIZE (fldigi-3.22.04.tar.gz) = 2822732
+SHA256 (fldigi-3.22.05.tar.gz) = 8c88a06f5c9753704458aeebfbb73166ace08e9d22ce43e01ce7d347b4147496
+SIZE (fldigi-3.22.05.tar.gz) = 2822375
diff --git a/comms/fldigi/files/patch-doc_Makefile.in b/comms/fldigi/files/patch-doc_Makefile.in
deleted file mode 100644
index b054c04cc08b..000000000000
--- a/comms/fldigi/files/patch-doc_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- doc/Makefile.in.orig	2014-11-02 21:46:25.000000000 -0500
-+++ doc/Makefile.in	2014-11-02 21:48:13.000000000 -0500
-@@ -312,8 +312,8 @@
- # The rest of the Makefile is enabled only if we have asciidoc
- # Try to discover the correct iconsdir.  Use the first one that
- # contains an entry matching `tip.*'.
--@HAVE_ASCIIDOC_TRUE@ASCIIDOC_ICONS_DIRS := /etc/asciidoc/icons /etc/asciidoc/images /etc/asciidoc/images/icons /etc/asciidoc/images/../icons \
--@HAVE_ASCIIDOC_TRUE@                       /usr/share/asciidoc/icons /usr/share/asciidoc/images /usr/share/asciidoc/images/icons
-+@HAVE_ASCIIDOC_TRUE@ASCIIDOC_ICONS_DIRS := ${prefix}/etc/asciidoc/icons ${prefix}/etc/asciidoc/images ${prefix}/etc/asciidoc/images/icons ${prefix}/etc/asciidoc/images/../icons \
-+@HAVE_ASCIIDOC_TRUE@                       ${prefix}/share/asciidoc/icons ${prefix}/share/asciidoc/images ${prefix}/share/asciidoc/images/icons
- 
- # Additional attributes are defined in guide.conf
- @HAVE_ASCIIDOC_TRUE@ASCIIDOC_ARGS = --unsafe -a toc -a data-uri -a badges -a icons -a iconsdir=$(ASCIIDOC_ICONS_DIR)
diff --git a/comms/fldigi/files/patch-misc_newinstall.cxx b/comms/fldigi/files/patch-misc_newinstall.cxx
index 53c3ad085485..7e02aa1883c6 100644
--- a/comms/fldigi/files/patch-misc_newinstall.cxx
+++ b/comms/fldigi/files/patch-misc_newinstall.cxx
@@ -1,14 +1,5 @@
 --- src/misc/newinstall.cxx.orig	2014-03-21 11:25:57.000000000 -0500
 +++ src/misc/newinstall.cxx	2014-03-21 18:19:24.000000000 -0500
-@@ -67,7 +67,7 @@
- 
- label[4] = "SK @||";
- text[4] = "\n\
--tnx fer QSO <NAME>, 73, God bless.\n\
-+tnx fer QSO <NAME>, 73.\n\
- <ZDT> <CALL> de <MYCALL> sk\n\
- <RX>";
- 
 @@ -84,7 +84,7 @@
  Rig:   \n\
  Pwr:   \n\
diff --git a/comms/fldigi/files/patch-src_thor_thor.cxx b/comms/fldigi/files/patch-src_thor_thor.cxx
index cc4e39951f40..878c00c8fe3b 100644
--- a/comms/fldigi/files/patch-src_thor_thor.cxx
+++ b/comms/fldigi/files/patch-src_thor_thor.cxx
@@ -5,7 +5,7 @@
  	strSecXmtText = progdefaults.THORsecText;
  	if (strSecXmtText.length() == 0)
 -		strSecXmtText = "fldigi "PACKAGE_VERSION" ";
-+		strSecXmtText = "fldigi " PACKAGE_VERSION;
++		strSecXmtText = "fldigi " PACKAGE_VERSION " ";
  	cptr = 0;
  }
  
diff --git a/comms/fldigi/files/patch-src_widgets_flmisc.cxx b/comms/fldigi/files/patch-src_widgets_flmisc.cxx
deleted file mode 100644
index 1c41c9e88938..000000000000
--- a/comms/fldigi/files/patch-src_widgets_flmisc.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/widgets/flmisc.cxx.orig	2013-11-19 20:07:27.667902073 -0500
-+++ src/widgets/flmisc.cxx	2013-11-19 20:07:49.467902518 -0500
-@@ -104,7 +104,7 @@
- 	bg1r = 255 - bg1r; bg1g = 255 - bg1g; bg1b = 255 - bg1b;
- 	Fl_Color adj = fl_rgb_color(bg1r, bg1g, bg1b);
- 	if (fl_contrast(adj, bg2) != adj)
--		Fl::get_color((def >= 0 ? def : adj), bg1r, bg1g, bg1b);
-+		Fl::get_color((def != 0 ? def : adj), bg1r, bg1g, bg1b);
- }
- 
- #if !defined(__APPLE__) && !defined(__WOE32__) && USE_X
diff --git a/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp b/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp
index fd3030bcc938..07867a71da82 100644
--- a/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp
+++ b/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp
@@ -5,7 +5,7 @@
  
    char buffLen[40];
 -  sprintf(buffLen,"%"PRIuSZ"\r\n\r\n", body.size());
-+  sprintf(buffLen,"%" PRIuSZ" \r\n\r\n", body.size());
++  sprintf(buffLen,"%" PRIuSZ "\r\n\r\n", body.size());
  
    return header + buffLen;
  }