- Update to 3.21.8

- Contestia mode added, macro improvements, language translations,
  about window changes
- See http://www.w1hkj.com/Fldigi.html for details

7 files changed, 39 insertions, 17 deletions

diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index ee7ee8f1b630..6c39ac9f680b 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	fldigi
-PORTVERSION=	3.12.5
+PORTVERSION=	3.21.8
 CATEGORIES=	comms hamradio
-MASTER_SITES=	http://www.w1hkj.com/fldigi-distro/ \
+MASTER_SITES=	http://www.w1hkj.com/downloads/fldigi/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	db
 
@@ -22,10 +22,11 @@ LIB_DEPENDS=	hamlib:${PORTSDIR}/comms/hamlib \
 		pulse:${PORTSDIR}/audio/pulseaudio \
 		fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/portaudio2/include
 USE_DOS2UNIX=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
 
 MAN1=		fldigi.1 flarq.1
 
@@ -46,6 +47,9 @@ post-configure:
 		-e 's|^CPPFLAGS|#CPPFLAGS|' \
 		${WRKSRC}/src/Makefile
 
+do-build:
+	(cd ${WRKSRC}/src;gmake)
+
 post-install:
 .if	!defined(NOPORTDOCS)
 	@${ECHO} ""
diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo
index 8e00277eb0a3..5e9dbf14eaf7 100644
--- a/comms/fldigi/distinfo
+++ b/comms/fldigi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fldigi-3.12.5.tar.gz) = d7986077a331afe124bf0efb47f82cfa1b4983c6c9da400205a694a6823cf8ed
-SIZE (fldigi-3.12.5.tar.gz) = 1264031
+SHA256 (fldigi-3.21.8.tar.gz) = f32f6ad9bff6cfe812051b83a2c54e9a1a0238c6225778515e2ed7a68efa0dae
+SIZE (fldigi-3.21.8.tar.gz) = 1611309
diff --git a/comms/fldigi/files/patch-misc_newinstall.cxx b/comms/fldigi/files/patch-misc_newinstall.cxx
new file mode 100644
index 000000000000..bc60389a52fc
--- /dev/null
+++ b/comms/fldigi/files/patch-misc_newinstall.cxx
@@ -0,0 +1,20 @@
+--- src/misc/newinstall.cxx.orig	2011-04-22 08:25:20.000000000 -0400
++++ src/misc/newinstall.cxx	2011-04-22 08:25:51.000000000 -0400
+@@ -66,7 +66,7 @@
+ 
+ label[4] = "SK @||";
+ text[4] = "\n\
+-tnx fer QSO <NAME>, 73, God bless.\n\
++tnx fer QSO <NAME>, 73.\n\
+ <ZDT> <CALL> de <MYCALL> sk\n\
+ <RX>";
+ 
+@@ -83,7 +83,7 @@
+ Rig:   \n\
+ Pwr:   \n\
+ Ant:   \n\
+-OS:    Linux\n\
++OS:    FreeBSD\n\
+ Soft:  <VER>\n\
+ Web:   \n\
+ Email: ";
diff --git a/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx b/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx
index 0da098ca9c9f..ec9aab205db1 100644
--- a/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx
+++ b/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/dialogs/fl_digi.cxx.orig	2011-04-05 10:48:40.000000000 -0400
++++ src/dialogs/fl_digi.cxx	2011-04-16 14:41:04.000000000 -0400
+@@ -26,6 +26,7 @@
  #include <config.h>
  
  #include <sys/types.h>
@@ -8,7 +8,7 @@
  
  #ifdef __WOE32__
  #  ifdef __CYGWIN__
-@@ -1349,7 +1350,7 @@
+@@ -1846,7 +1847,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
index 675e0c75503c..8782e1091fd4 100644
--- a/comms/fldigi/files/patch-src_soundcard_sound.cxx
+++ b/comms/fldigi/files/patch-src_soundcard_sound.cxx
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/soundcard/sound.cxx.orig	2011-04-05 10:48:40.000000000 -0400
++++ src/soundcard/sound.cxx	2011-04-16 14:40:29.000000000 -0400
+@@ -380,7 +380,7 @@
  {
  	int sndparam;
  // Try to get ~100ms worth of samples per fragment
diff --git a/comms/fldigi/pkg-descr b/comms/fldigi/pkg-descr
index 56b38b323282..16838609de63 100644
--- a/comms/fldigi/pkg-descr
+++ b/comms/fldigi/pkg-descr
@@ -6,7 +6,7 @@ DominoEX 4  DominoEX 5  DominoEX 8  DominoEX 11  DominoEX 16  DominoEX 22,
 Feld-Hell  FSK-Hell  FSK-Hell 105,
 MFSK-8  MFSK-16  MFSK-16 pix ,
 PSK-31  QPSK-31  PSK-63  QPSK-63  PSK-125  QPSK-125,
-OLIVIA  various tones and bandwidth,
+OLIVIA / Contestia  various tones and bandwidth,
 RTTY  various Baud Rates, Shifts, Nbr of data bits, etc.,
 Throb-1  Throb-2  Throb-4  ThrobX-1  ThrobX-2  ThrobX-4,
 WWV  Receive only - calibrate your sound card to WWV and
@@ -14,6 +14,3 @@ Freq Analysis  Receive only - be ready for the (next)
 ARRL FMT (freq meas test).
 
 WWW: http://www.w1hkj.com/Fldigi.html
-
-- Diane VA3DB
-db@db.net
diff --git a/comms/fldigi/pkg-plist b/comms/fldigi/pkg-plist
index 1e655751bb34..9ed7e9239145 100644
--- a/comms/fldigi/pkg-plist
+++ b/comms/fldigi/pkg-plist
@@ -2,8 +2,9 @@ bin/flarq
 bin/fldigi
 share/applications/flarq.desktop
 share/applications/fldigi.desktop
-share/locale/cs/LC_MESSAGES/fldigi.mo
+share/locale/es/LC_MESSAGES/fldigi.mo
 share/locale/fr/LC_MESSAGES/fldigi.mo
+share/locale/it/LC_MESSAGES/fldigi.mo
 share/pixmaps/flarq.xpm
 share/pixmaps/fldigi.xpm
 %%PORTDOCS%%%%DOCSDIR%%/README