svn commit: r372999 - in head/comms/fldigi: . files

[Diane Bruce]

Author: db
Date: Fri Nov 21 15:29:34 2014
New Revision: 372999
URL: https://svnweb.freebsd.org/changeset/ports/372999
QAT: https://qat.redports.org/buildarchive/r372999/

Log:
  - 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

Added:
  head/comms/fldigi/files/patch-doc_Makefile.in   (contents, props changed)
Deleted:
  head/comms/fldigi/files/patch-doc-Makefile.in
  head/comms/fldigi/files/patch-src_include_qrunner.h
Modified:
  head/comms/fldigi/Makefile
  head/comms/fldigi/distinfo
  head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx   (contents, props changed)
  head/comms/fldigi/pkg-plist

Modified: head/comms/fldigi/Makefile
==============================================================================
--- head/comms/fldigi/Makefile	Fri Nov 21 15:12:13 2014	(r372998)
+++ head/comms/fldigi/Makefile	Fri Nov 21 15:29:34 2014	(r372999)
@@ -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}

Modified: head/comms/fldigi/distinfo
==============================================================================
--- head/comms/fldigi/distinfo	Fri Nov 21 15:12:13 2014	(r372998)
+++ head/comms/fldigi/distinfo	Fri Nov 21 15:29:34 2014	(r372999)
@@ -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

Added: head/comms/fldigi/files/patch-doc_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/fldigi/files/patch-doc_Makefile.in	Fri Nov 21 15:29:34 2014	(r372999)
@@ -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.*'.
+- at HAVE_ASCIIDOC_TRUE@ASCIIDOC_ICONS_DIRS := /etc/asciidoc/icons /etc/asciidoc/images /etc/asciidoc/images/icons /etc/asciidoc/images/../icons \
+- at HAVE_ASCIIDOC_TRUE@                       /usr/share/asciidoc/icons /usr/share/asciidoc/images /usr/share/asciidoc/images/icons
++ at HAVE_ASCIIDOC_TRUE@ASCIIDOC_ICONS_DIRS := ${prefix}/etc/asciidoc/icons ${prefix}/etc/asciidoc/images ${prefix}/etc/asciidoc/images/icons ${prefix}/etc/asciidoc/images/../icons \
++ at 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 at ASCIIDOC_ARGS = --unsafe -a toc -a data-uri -a badges -a icons -a iconsdir=$(ASCIIDOC_ICONS_DIR)

Modified: head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx
==============================================================================
--- head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx	Fri Nov 21 15:12:13 2014	(r372998)
+++ head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx	Fri Nov 21 15:29:34 2014	(r372999)
@@ -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()) {

Modified: head/comms/fldigi/pkg-plist
==============================================================================
--- head/comms/fldigi/pkg-plist	Fri Nov 21 15:12:13 2014	(r372998)
+++ head/comms/fldigi/pkg-plist	Fri Nov 21 15:29:34 2014	(r372999)
@@ -19,3 +19,5 @@ share/pixmaps/fldigi.xpm
 %%FLARQ%%share/pixmaps/flarq.xpm
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/guide.html
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+ at dirrmtry %%DATADIR%%