Update to latest version.

Note, fldigi-shell has been removed upstream.

7 files changed, 13 insertions, 44 deletions

diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index 8b4867c2b96a..6ffb00495dda 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	fldigi
-PORTVERSION=	3.22.05
+PORTVERSION=	3.22.08
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/downloads/fldigi/\
 		${MASTER_SITE_LOCAL}
@@ -26,7 +26,6 @@ GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig compiler:c++11-lib perl5 shebangfix
 CONFIGURE_ENV=	FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" \
 		    EXTRA_LIBS="-lexecinfo"
-SHEBANG_FILES=	scripts/fldigi-shell
 
 OPTIONS_DEFINE=	NATIVE_OPT FLARQ OSS SNDFILE PORTAUDIO PULSEAUDIO HAMLIB NLS DOCS
 
diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo
index 5c74cc0b363d..6812707b5cd7 100644
--- a/comms/fldigi/distinfo
+++ b/comms/fldigi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fldigi-3.22.05.tar.gz) = 8c88a06f5c9753704458aeebfbb73166ace08e9d22ce43e01ce7d347b4147496
-SIZE (fldigi-3.22.05.tar.gz) = 2822375
+SHA256 (fldigi-3.22.08.tar.gz) = ce7d31db9d85865c9d481866667dd0f7c9cfdd848c55cf2ea0d7c59772e3b887
+SIZE (fldigi-3.22.08.tar.gz) = 2876959
diff --git a/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcClient.cpp b/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcClient.cpp
deleted file mode 100644
index 9b4a68a24626..000000000000
--- a/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcClient.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/xmlrpcpp/XmlRpcClient.cpp.orig	2014-03-21 11:25:57.000000000 -0500
-+++ src/xmlrpcpp/XmlRpcClient.cpp	2014-03-21 18:21:01.000000000 -0500
-@@ -22,6 +22,7 @@
- // ----------------------------------------------------------------------------
- 
- #include <config.h>
-+#include <ios>
- 
- #include "XmlRpcClient.h"
- 
-@@ -338,7 +339,7 @@
- 
-   header += "Content-Type: text/xml\r\nContent-length: ";
- 
--  sprintf(buff,"%"PRIuSZ"\r\n\r\n", body.size());
-+  sprintf(buff,"%" PRIuSZ "\r\n\r\n", body.size());
- 
-   return header + buff;
- }
diff --git a/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp b/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp
deleted file mode 100644
index 07867a71da82..000000000000
--- a/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/xmlrpcpp/XmlRpcServer.cpp.orig	2014-03-21 11:25:57.000000000 -0500
-+++ src/xmlrpcpp/XmlRpcServer.cpp	2014-03-21 18:21:06.000000000 -0500
-@@ -500,7 +500,7 @@
-     "Content-length: ";
- 
-   char buffLen[40];
--  sprintf(buffLen,"%"PRIuSZ"\r\n\r\n", body.size());
-+  sprintf(buffLen,"%" PRIuSZ "\r\n\r\n", body.size());
- 
-   return header + buffLen;
- }
diff --git a/comms/fldigi/files/patch-src_xmlrpcpp_base64.h b/comms/fldigi/files/patch-src_xmlrpcpp_base64.h
deleted file mode 100644
index a8061844a7c9..000000000000
--- a/comms/fldigi/files/patch-src_xmlrpcpp_base64.h
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/xmlrpcpp/base64.h.orig	2014-03-21 11:25:57.000000000 -0500
-+++ src/xmlrpcpp/base64.h	2014-03-21 18:21:09.000000000 -0500
-@@ -1,4 +1,4 @@
--//  base64.hpp 
-+#include <ios>
- //  Autor Konstantin Pilipchuk
- //  mailto:lostd@ukr.net
- // ----------------------------------------------------------------------------
diff --git a/comms/fldigi/files/patch-src_xmrpcpp_XmlRpcBase64.h b/comms/fldigi/files/patch-src_xmrpcpp_XmlRpcBase64.h
new file mode 100644
index 000000000000..65967a34206b
--- /dev/null
+++ b/comms/fldigi/files/patch-src_xmrpcpp_XmlRpcBase64.h
@@ -0,0 +1,10 @@
+--- src/xmlrpcpp/XmlRpcBase64.h.orig	2015-04-27 22:16:11.000000000 -0700
++++ src/xmlrpcpp/XmlRpcBase64.h	2015-04-27 22:16:22.000000000 -0700
+@@ -18,6 +18,7 @@
+ #if !defined(__BASE64_H_INCLUDED__)
+ #define __BASE64_H_INCLUDED__ 1
+ 
++#include <ios>
+ #include <iterator>
+ 
+ static
diff --git a/comms/fldigi/pkg-plist b/comms/fldigi/pkg-plist
index 1e6f090fc10c..27c25abcbcfb 100644
--- a/comms/fldigi/pkg-plist
+++ b/comms/fldigi/pkg-plist
@@ -1,9 +1,7 @@
 %%FLARQ%%bin/flarq
 bin/fldigi
 %%FLARQ%%man/man1/flarq.1.gz
-man/man1/fldigi-shell.1.gz
 man/man1/fldigi.1.gz
-bin/fldigi-shell
 %%FLARQ%%share/applications/flarq.desktop
 share/applications/fldigi.desktop
 %%NLS%%share/locale/de/LC_MESSAGES/fldigi.mo