- Unbreak build

- See http://www.w1hkj.com/Fldigi.html many fixes and enhancements to macro
  system, internationalisation, UI and modems

Feature safe:	Yes

4 files changed, 27 insertions, 13 deletions

diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index a6a40f8a7ca7..b330c1891f8c 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fldigi
-PORTVERSION=	3.21.12
+PORTVERSION=	3.21.31
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/downloads/fldigi/ \
 		${MASTER_SITE_LOCAL}
@@ -17,17 +17,18 @@ COMMENT=	Digital decoder for psk, cw, psk31, olivia
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk \
-		samplerate:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS=	 samplerate:${PORTSDIR}/audio/libsamplerate
+
 
 BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-		xsltproc:${PORTSDIR}/textproc/libxslt
+		xsltproc:${PORTSDIR}/textproc/libxslt \
+		${LOCALBASE}/lib/fltk11/libfltk.so:${PORTSDIR}/x11-toolkits/fltk11
 
-BROKEN=		does not compile
 
 GNU_CONFIGURE=	yes
 USE_DOS2UNIX=	yes
 USE_GMAKE=	yes
+CONFIGURE_ENV=	FLTK_CONFIG="/usr/local/bin/fltk11/fltk-config"
 
 MAN1=		fldigi.1 
 
@@ -43,6 +44,7 @@ OPTIONS=	NATIVE_OPT	"Enable Native Optimizations"		off \
 
 .include <bsd.port.pre.mk>
 
+
 .if ${ARCH} == "sparc64"
 BROKEN=		Fails to install
 .endif
@@ -117,15 +119,16 @@ PLIST_SUB+=	ASCIIDOC="@comment "
 post-patch:
 	@${REINPLACE_CMD} -e 's|png_infopp_NULL|NULL|' \
 		 ${WRKSRC}/src/widgets/picture.cxx
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+		${WRKSRC}/Makefile.in
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' \
 		-e 's|^CPPFLAGS|#CPPFLAGS|' \
 		${WRKSRC}/src/Makefile
+# force rebuild of man pages
+	rm ${WRKSRC}/doc/*.1
 
-do-build:
-# It will not build the man pages without the rm
-	(cd ${WRKSRC}/doc/;rm *.1;gmake;cd ${WRKSRC}/src;gmake)
 
 post-install:
 .if	!defined(NOPORTDOCS)
diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo
index 56506c141f78..914e442cffe0 100644
--- a/comms/fldigi/distinfo
+++ b/comms/fldigi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fldigi-3.21.12.tar.gz) = 6d54fbf776822c15b6ff8b38675be761972e767979091eaeae5e4ac34e4f9afc
-SIZE (fldigi-3.21.12.tar.gz) = 1608635
+SHA256 (fldigi-3.21.31.tar.gz) = a6e54ebdcae20ea99eb8fe46ff5f25316c371af31c6c963d33272f405c20d6af
+SIZE (fldigi-3.21.31.tar.gz) = 1638671
diff --git a/comms/fldigi/files/patch-Makefile.in b/comms/fldigi/files/patch-Makefile.in
new file mode 100644
index 000000000000..14c2a6694376
--- /dev/null
+++ b/comms/fldigi/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- 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 @@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
++CPPFLAGS = "-I%%LOCALBASE%%/include/portaudio2 @CPPFLAGS@"
+ CXX = @CXX@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
diff --git a/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx b/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx
index 228abef10425..f29cd5b2202c 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-05-28 14:08:32.000000000 -0400
-+++ src/dialogs/fl_digi.cxx	2011-05-29 18:51:27.000000000 -0400
+--- 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
 @@ -26,6 +26,7 @@
  #include <config.h>
  
@@ -8,7 +8,7 @@
  
  #ifdef __WOE32__
  #  ifdef __CYGWIN__
-@@ -1866,7 +1867,7 @@
+@@ -1884,7 +1885,7 @@
  	Fl::repeat_timeout(st, ztimer);
  
  	struct tm tm;