- Update to latest 3.21.50 / Flarq 4.3.3

- Fix asciidocs use, man pages need asciidocs
- Many changes to UI, Modem, Macros and Internationalisation

6 files changed, 13 insertions, 36 deletions

diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index 96c3ba93d5e0..6a29214dcba4 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fldigi
-PORTVERSION=	3.21.41
-PORTREVISION=	1
+PORTVERSION=	3.21.50
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/downloads/fldigi/\
 		${MASTER_SITE_LOCAL}
@@ -107,13 +106,8 @@ CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 USE_GETTEXT=	yes
 .endif
-.if	!defined(NOPORTDOCS)
+# Always need asciidoc for man pages
 CONFIGURE_ARGS+=--with-asciidoc
-PLIST_SUB	+=ASCIIDOC=""
-.else
-CONFIGURE_ARGS+=--without-asciidoc
-PLIST_SUB+=	ASCIIDOC="@comment "
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|png_infopp_NULL|NULL|' \
diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo
index 3cfc5505c614..d4ffeae5dc3c 100644
--- a/comms/fldigi/distinfo
+++ b/comms/fldigi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fldigi-3.21.41.tar.gz) = 085a9a1328641b0fdb62b5601f59327d5c5eb476feca7721b1882de45da23d3e
-SIZE (fldigi-3.21.41.tar.gz) = 1663238
+SHA256 (fldigi-3.21.50.tar.gz) = 244921f705f70cd48e2ade44f853a7e092775f7a61d3e214f5faaf74853606c5
+SIZE (fldigi-3.21.50.tar.gz) = 1790564
diff --git a/comms/fldigi/files/patch-configure b/comms/fldigi/files/patch-configure
deleted file mode 100644
index d60ce0251026..000000000000
--- a/comms/fldigi/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2011-07-20 20:07:57.000000000 -0700
-+++ configure	2011-07-20 20:08:13.000000000 -0700
-@@ -11761,7 +11761,7 @@
-       if test "x$ASCIIDOC" != "x"; then
-           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for asciidoc >= $asciidoc_min" >&5
- $as_echo_n "checking for asciidoc >= $asciidoc_min... " >&6; }
--          asciidoc_ver=$($ASCIIDOC --version | sed -n '1 { s/.* //; p }')
-+          asciidoc_ver=$($ASCIIDOC --version | sed -n '1 { s/.* //; p; }')
- 
- 
- 
diff --git a/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx b/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx
index f29cd5b2202c..c54b67376ec0 100644
--- a/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx
+++ b/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx
@@ -1,5 +1,5 @@
---- src/dialogs/fl_digi.cxx.orig	2011-12-01 12:03:25.000000000 -0500
-+++ src/dialogs/fl_digi.cxx	2011-12-05 16:02:10.000000000 -0500
+--- src/dialogs/fl_digi.cxx.orig	2012-07-07 09:01:19.000000000 -0500
++++ src/dialogs/fl_digi.cxx	2012-07-21 15:24:09.000000000 -0500
 @@ -26,6 +26,7 @@
  #include <config.h>
  
@@ -8,12 +8,3 @@
  
  #ifdef __WOE32__
  #  ifdef __CYGWIN__
-@@ -1884,7 +1885,7 @@
- 	Fl::repeat_timeout(st, ztimer);
- 
- 	struct tm tm;
--	gmtime_r(&tv.tv_sec, &tm);
-+	gmtime_r((const time_t *)&tv.tv_sec, &tm);
- 	if (!strftime(ztbuf, sizeof(ztbuf), "%Y%m%d %H%M", &tm))
- 		memset(ztbuf, 0, sizeof(ztbuf));
- 	else
diff --git a/comms/fldigi/files/patch-src_soundcard_sound.cxx b/comms/fldigi/files/patch-src_soundcard_sound.cxx
index 8782e1091fd4..085abd99bffd 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	2011-04-05 10:48:40.000000000 -0400
-+++ src/soundcard/sound.cxx	2011-04-16 14:40:29.000000000 -0400
-@@ -380,7 +380,7 @@
+--- 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
diff --git a/comms/fldigi/pkg-plist b/comms/fldigi/pkg-plist
index a9293bde6868..0551e6c4bf42 100644
--- a/comms/fldigi/pkg-plist
+++ b/comms/fldigi/pkg-plist
@@ -6,9 +6,12 @@ share/applications/fldigi.desktop
 %%NLS%%share/locale/es/LC_MESSAGES/fldigi.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/fldigi.mo
 %%NLS%%share/locale/it/LC_MESSAGES/fldigi.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/fldigi.mo
 %%FLARQ%%share/pixmaps/flarq.xpm
+share/fldigi/NAVTEX_Stations.csv
 share/pixmaps/fldigi.xpm
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%ASCIIDOC%%%%DOCSDIR%%/guide.html
+%%PORTDOCS%%%%DOCSDIR%%/guide.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm share/fldigi
 @dirrmtry share/applications