From 1bdad40087c64faa161cd10c33d6dbc9c3ced447 Mon Sep 17 00:00:00 2001
From: db <db@FreeBSD.org>
Date: Tue, 30 Nov 2010 01:58:38 +0000
Subject: - Update to 3.12.5 - package now includes flarq (fast light automatic
 repeat request)   is a file transfer application.

---
 comms/fldigi/Makefile                            |  5 ++---
 comms/fldigi/distinfo                            |  5 ++---
 comms/fldigi/files/patch-src_dialogs_fl_digi.cxx | 10 +++++-----
 comms/fldigi/files/patch-src_soundcard_sound.cxx | 11 +++++++++++
 comms/fldigi/pkg-plist                           |  3 +++
 5 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 comms/fldigi/files/patch-src_soundcard_sound.cxx

(limited to 'comms')

diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index 38c05e15b278..ee7ee8f1b630 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fldigi
-PORTVERSION=	3.11
-PORTREVISION=	7
+PORTVERSION=	3.12.5
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/fldigi-distro/ \
 		${MASTER_SITE_LOCAL}
@@ -28,7 +27,7 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 
-MAN1=		fldigi.1
+MAN1=		fldigi.1 flarq.1
 
 .include <bsd.port.pre.mk>
 .if ${OSVERSION} < 700000
diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo
index c4be31004543..8e00277eb0a3 100644
--- a/comms/fldigi/distinfo
+++ b/comms/fldigi/distinfo
@@ -1,3 +1,2 @@
-MD5 (fldigi-3.11.tar.gz) = a59d54b7c6c7602d092acaa15f2ba921
-SHA256 (fldigi-3.11.tar.gz) = 1fabbf41834b451d45bf77cd81e45e1164aaa2b20e2649bddabd58b2ee315d24
-SIZE (fldigi-3.11.tar.gz) = 1035223
+SHA256 (fldigi-3.12.5.tar.gz) = d7986077a331afe124bf0efb47f82cfa1b4983c6c9da400205a694a6823cf8ed
+SIZE (fldigi-3.12.5.tar.gz) = 1264031
diff --git a/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx b/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx
index 0c0540bb5ab3..0da098ca9c9f 100644
--- a/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx
+++ b/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx
@@ -1,14 +1,14 @@
---- src/dialogs/fl_digi.cxx.orig	2009-08-24 13:16:59.000000000 -0400
-+++ src/dialogs/fl_digi.cxx	2009-08-24 13:17:51.000000000 -0400
+--- src/dialogs/fl_digi.cxx.orig	2009-11-08 15:02:38.000000000 -0500
++++ src/dialogs/fl_digi.cxx	2010-05-27 08:02:45.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <config.h>
  
  #include <sys/types.h>
 +#include <time.h>
  
- #ifdef __CYGWIN__
- #  include <w32api/windows.h>
-@@ -1310,7 +1311,7 @@
+ #ifdef __WOE32__
+ #  ifdef __CYGWIN__
+@@ -1349,7 +1350,7 @@
  	Fl::repeat_timeout(st, ztimer);
  
  	struct tm tm;
diff --git a/comms/fldigi/files/patch-src_soundcard_sound.cxx b/comms/fldigi/files/patch-src_soundcard_sound.cxx
new file mode 100644
index 000000000000..675e0c75503c
--- /dev/null
+++ b/comms/fldigi/files/patch-src_soundcard_sound.cxx
@@ -0,0 +1,11 @@
+--- src/soundcard/sound.cxx.orig	2010-11-27 08:29:59.000000000 -0500
++++ src/soundcard/sound.cxx	2010-11-27 08:36:45.000000000 -0500
+@@ -364,7 +364,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
diff --git a/comms/fldigi/pkg-plist b/comms/fldigi/pkg-plist
index 39b4895412ae..1e655751bb34 100644
--- a/comms/fldigi/pkg-plist
+++ b/comms/fldigi/pkg-plist
@@ -1,7 +1,10 @@
+bin/flarq
 bin/fldigi
+share/applications/flarq.desktop
 share/applications/fldigi.desktop
 share/locale/cs/LC_MESSAGES/fldigi.mo
 share/locale/fr/LC_MESSAGES/fldigi.mo
+share/pixmaps/flarq.xpm
 share/pixmaps/fldigi.xpm
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-- 
cgit