- Update to latest 3.22.01

- Many updates added new modems, new macros, UI and bug fixes
- See http://www.w1hkj.com/downloads/fldigi/fldigi_changes.txt

7 files changed, 22 insertions, 34 deletions

diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index ad29663a26cf..e14efc8e0771 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	fldigi
-PORTVERSION=	3.21.83
-PORTREVISION=	1
+PORTVERSION=	3.22.01
 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 06010416d6d8..ad8fc5b5a0ed 100644
--- a/comms/fldigi/distinfo
+++ b/comms/fldigi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fldigi-3.21.83.tar.gz) = 2980d32bea57336bd8461fdaaaf97a9a822039309ac39c8130abdb6e5833cfbb
-SIZE (fldigi-3.21.83.tar.gz) = 2654359
+SHA256 (fldigi-3.22.01.tar.gz) = 267b438ec61fa9eff8970d4a292e7ee148a571aeb7040e4c751d80e30cc6583b
+SIZE (fldigi-3.22.01.tar.gz) = 2704273
diff --git a/comms/fldigi/files/patch-doc-Makefile.in b/comms/fldigi/files/patch-doc-Makefile.in
deleted file mode 100644
index b933194d745f..000000000000
--- a/comms/fldigi/files/patch-doc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	2014-06-26 15:34:58.000000000 -0400
-+++ doc/Makefile.in	2014-06-28 09:44:31.000000000 -0400
-@@ -564,7 +564,7 @@
- 
- # The rest of the Makefile is enabled only if we have asciidoc
- 
--@HAVE_ASCIIDOC_TRUE@ASCIIDOC_ICONS_DIR ?= /usr/share/asciidoc/images/icons
-+@HAVE_ASCIIDOC_TRUE@ASCIIDOC_ICONS_DIR ?= ${prefix}/etc/asciidoc/images/icons
- 
- @HAVE_ASCIIDOC_TRUE@%.html: $$*.txt $(ASCIIDOC_CONF)
- @HAVE_ASCIIDOC_TRUE@	@if ! test -d $(ASCIIDOC_ICONS_DIR); then \
diff --git a/comms/fldigi/files/patch-doc_Makefile.in b/comms/fldigi/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..b054c04cc08b
--- /dev/null
+++ b/comms/fldigi/files/patch-doc_Makefile.in
@@ -0,0 +1,13 @@
+--- 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-src_include_qrunner.h b/comms/fldigi/files/patch-src_include_qrunner.h
deleted file mode 100644
index ee7d23ea19f2..000000000000
--- a/comms/fldigi/files/patch-src_include_qrunner.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/include/qrunner.h.orig	2013-11-17 20:26:40.966731568 -0500
-+++ src/include/qrunner.h	2013-11-18 18:52:20.902610641 -0500
-@@ -64,9 +64,10 @@
-         qexception(const char *msg_) : msg(msg_) { }
-         qexception(int e) : msg(strerror(e)) { }
-         ~qexception() throw() { }
--        const char *what(void) const throw() { return msg.c_str(); }
-+        const char *what(void) const throw() { return msg; }
- private:
--        std::string msg;
-+//        std::string msg;
-+	const char *msg;
- };
- 
- struct fsignal
diff --git a/comms/fldigi/files/patch-src_qrunner_qrunner.cxx b/comms/fldigi/files/patch-src_qrunner_qrunner.cxx
index 8a561264bc61..e519b41b0210 100644
--- a/comms/fldigi/files/patch-src_qrunner_qrunner.cxx
+++ b/comms/fldigi/files/patch-src_qrunner_qrunner.cxx
@@ -1,6 +1,6 @@
---- src/qrunner/qrunner.cxx.orig	2013-11-19 10:58:52.118170777 -0500
-+++ src/qrunner/qrunner.cxx	2013-11-19 11:00:04.670568086 -0500
-@@ -94,7 +94,7 @@
+--- src/qrunner/qrunner.cxx.orig	2014-10-14 21:19:37.000000000 -0400
++++ src/qrunner/qrunner.cxx	2014-10-24 14:39:00.000000000 -0400
+@@ -103,7 +103,7 @@
  		return;
  	qr->inprog = true;
  
@@ -8,4 +8,4 @@
 +	ssize_t n = QRUNNER_READ(fd, rbuf, FIFO_SIZE);
  	switch (n) {
  	case -1:
- 		if (!QRUNNER_EAGAIN())
+ 		if (!QRUNNER_EAGAIN()) {
diff --git a/comms/fldigi/pkg-plist b/comms/fldigi/pkg-plist
index bdd334268063..8083be0f7c59 100644
--- a/comms/fldigi/pkg-plist
+++ b/comms/fldigi/pkg-plist
@@ -19,3 +19,5 @@ share/pixmaps/fldigi.xpm
 %%FLARQ%%share/pixmaps/flarq.xpm
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/guide.html
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrmtry %%DATADIR%%