- Fix build docbook-xsl is needed along with asciidoc + xsltproc

- upgrade to fldigi-3.21.68 small fixes including RTTY filters
- log2 is now in libm no need to kludge it

Approved by:	portmgr (miwi)

6 files changed, 16 insertions, 28 deletions

diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index c5f843564489..a45d2d395739 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	fldigi
-PORTVERSION=	3.21.59
-PORTREVISION=	1
+PORTVERSION=	3.21.68
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/downloads/fldigi/\
 		${MASTER_SITE_LOCAL}
@@ -14,12 +13,12 @@ COMMENT=	Digital decoder for psk, cw, psk31, olivia
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc\
+		docbook-xsl>=1.0:${PORTSDIR}/textproc/docbook-xsl\
 		xsltproc:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate\
 		fltk:${PORTSDIR}/x11-toolkits/fltk
 
 GNU_CONFIGURE=	yes
-USE_DOS2UNIX=	yes
 USE_GMAKE=	yes
 USE_PKGCONFIG=	build
 CONFIGURE_ENV=	FLTK_CONFIG="${LOCALBASE}/bin/fltk-config"
diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo
index 95303c354e83..bc3e61f25c20 100644
--- a/comms/fldigi/distinfo
+++ b/comms/fldigi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fldigi-3.21.59.tar.gz) = 0b87722b2931ba9ee60a002459f320e1cdbb80a1fec6b1242bb2bb8ef415d212
-SIZE (fldigi-3.21.59.tar.gz) = 2105081
+SHA256 (fldigi-3.21.68.tar.gz) = 3f0b647d3bd5470aad5a518189837c56056f822bb94ba20a5422b23183a625a6
+SIZE (fldigi-3.21.68.tar.gz) = 2139376
diff --git a/comms/fldigi/files/patch-Makefile.in b/comms/fldigi/files/patch-Makefile.in
index 14c2a6694376..ff41f45c062e 100644
--- a/comms/fldigi/files/patch-Makefile.in
+++ b/comms/fldigi/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2011-12-01 12:09:41.000000000 -0500
-+++ Makefile.in	2011-12-07 14:54:15.000000000 -0500
-@@ -141,7 +141,7 @@
+--- Makefile.in.orig	2013-02-08 22:19:37.000000000 -0500
++++ Makefile.in	2013-03-31 19:02:18.000000000 -0500
+@@ -145,7 +145,7 @@
  CCDEPMODE = @CCDEPMODE@
  CFLAGS = @CFLAGS@
  CPP = @CPP@
diff --git a/comms/fldigi/files/patch-doc-Makefile.in b/comms/fldigi/files/patch-doc-Makefile.in
index b13e6f2d9124..034f3f50e0ff 100644
--- a/comms/fldigi/files/patch-doc-Makefile.in
+++ b/comms/fldigi/files/patch-doc-Makefile.in
@@ -1,11 +1,11 @@
---- doc/Makefile.in.orig	2011-07-20 20:20:26.000000000 -0700
-+++ doc/Makefile.in	2011-07-20 20:21:37.000000000 -0700
-@@ -559,7 +559,7 @@
+--- doc/Makefile.in.orig	2013-02-08 22:19:36.000000000 -0500
++++ doc/Makefile.in	2013-03-31 19:16:17.000000000 -0500
+@@ -568,7 +568,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@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-src_misc_configuration.cxx b/comms/fldigi/files/patch-src_misc_configuration.cxx
index 7844fdb65720..271ce118303a 100644
--- a/comms/fldigi/files/patch-src_misc_configuration.cxx
+++ b/comms/fldigi/files/patch-src_misc_configuration.cxx
@@ -1,6 +1,6 @@
---- src/misc/configuration.cxx.orig	2013-03-28 08:57:53.000000000 -0500
-+++ src/misc/configuration.cxx	2013-03-28 08:59:54.000000000 -0500
-@@ -901,8 +901,6 @@
+--- src/misc/configuration.cxx.orig	2013-02-08 21:00:53.000000000 -0500
++++ src/misc/configuration.cxx	2013-04-01 08:06:29.000000000 -0500
+@@ -891,8 +891,6 @@
  
  void configuration::testCommPorts()
  {
@@ -9,7 +9,7 @@
  	inpTTYdev->clear();
  	inpRIGdev->clear();
  	inpXmlRigDevice->clear();
-@@ -919,6 +917,7 @@
+@@ -909,6 +907,7 @@
  #endif
  
  #ifdef __linux__
@@ -17,7 +17,7 @@
  	bool ret = false;
  	DIR* sys = NULL;
  	char cwd[PATH_MAX] = { '.', '\0' };
-@@ -965,9 +964,7 @@
+@@ -955,9 +954,7 @@
  		"/dev/ttyS%u",
  		"/dev/ttyUSB%u",
  		"/dev/usb/ttyUSB%u"
diff --git a/comms/fldigi/files/patch-src_soundcard_sound.cxx b/comms/fldigi/files/patch-src_soundcard_sound.cxx
deleted file mode 100644
index 085abd99bffd..000000000000
--- a/comms/fldigi/files/patch-src_soundcard_sound.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/soundcard/sound.cxx.orig	2012-08-04 11:24:05.000000000 -0500
-+++ src/soundcard/sound.cxx	2012-08-08 19:14:41.000000000 -0500
-@@ -389,7 +389,7 @@
- {
- 	int sndparam;
- // Try to get ~100ms worth of samples per fragment
--	sndparam = (int)log2(sample_frequency * 0.1);
-+	sndparam = (int)log(sample_frequency * 0.1)/log(2.0);
- // double since we are using 16 bit samples
- 	sndparam += 1;
- // Unlimited amount of buffers for RX, four for TX