Update to 3.21.52 from 3.03, prepared in pkgsrc-wip by Makoto

Fujiwara, JA1XMS.  Committed during freeze to resolve build failures
of the old version, ok wiz@.

Upstream's NEWS covers only some versions, but:

= Fldigi 3.21 release notes =

== Modems ==

  * Weather Fax receive and transmit
  * RSID can be configured to open the decoder squelch
  * Added several new RSID modem codes
  * Video ID improvements
  * Added browser support for the PSK63F and PSK-nnn-R types
  * Improved CW prosign handling
  * Improved signal detection in PSK multiple decoder
  * The MT-63 modem can now receive and transmit on any frequency
  * Added support for multiple RTTY decoders

== Macros ==

  * Added REPEAT macro
  * Added LNW macro
  * Added CLEARLOG macro
  * Added QSY macro
  * Added RIGMOD and FILWID macros

== User interface ==

  * Added Italian and Spanish translations
  * Translations now also work on win32
  * Added second (optional) macro bar
  * Improved PSK/RTTY browser widget

== Other changes ==

  * RigCAT can use RTS and DTR PTT simultaneously
  * Added interface to Logbook server
  * Added support for ADIF 2.2.3 QSO_DATE_OFF field
  * Added support for CALLOOK (http://callook.info)

== Bug fixes ==

  * Yes


= Fldigi 3.20 release notes =

== Modems ==

 * Added new PSK-500 mode
 * Added "robust PSK" modes: PSK-125R, PSK-250R, PSK-500R
 * Added PSK63F mode, compatible with MultiPsk PSK63FEC
 * Added Contestia support
 * Added SSB "modem" to simplify logging of SSB QSOs
 * Added MT63 modem preamble tones to aid signal acquisition
 * Added selectable filter widths for Hellschreiber modes
 * Added AGC and S/N detector for FM-HELL modes
 * Added Olivia noise estimator

 * Improved THOR and DominoEX squelch responsiveness
 * Improved Olivia squelch detection
 * Improved Feldhell AGC and S/N detector
 * Improved RTTY decoder

 * Removed THOR soft decoding
 * RSID now works at the same time as modem decoding
 * The HELL-80 tone spacing was changed to 300 Hz

== Macros ==

 * Added <LOCK:on|off|t> macro to enable/disable/toggle the transmit lock
 * Added <TUNE:nn> macro to transmit tuning tone for ''nn'' seconds
 * Added <RXRSID:on|off|t> and <TXRSID:on|off|t> macros
 * Added <WAIT:nn> macro to delay macro expansion by ''nn'' seconds
 * Added <SRCHUP>, <SRCHDN>, <GOHOME>, <GOFREQ:nnnn> macros to search for a
   signal up and down in frequency, go to the "sweet spot frequency", and
   set the current modem frequency to ''nnnn''
 * The <MODEM> macro syntax is now <MODEM:str>. The older <MODEM>str syntax is
   still supported.  Modem parameters may be specified when using the new
   syntax; currently for RTTY (shift, baud, bits), Olivia (bw, tones) and
   Contestia (bw, tones), e.g.: <MODEM:RTTY:170:45.45:5>, <MODEM:OLIVIA:500:16>,
   <MODEM:CTSTIA:250:8>.

== User interface ==

 * The main window's QSO and waterfall toolbar are now much more configurable
 * The QSO toolbar can now be set to Contest mode, Minimal mode, Full mode,
   and some combinations thereof
 * The docked digiscope can be hidden and shown without a restart
 * It is now possible to select the modes for which to transmit RSID, VideoID
   and CWID
 * The Op Modes menu can now be customised
 * Removed the floating rig control window
 * Removed various Alt-<key> shortcuts
 * Added a simple "wizard" for first-time users
 * Added a waterfall-only mode; enabled with --wfall-only
 * Removed option to use check buttons for AFC and SQL toggles

== Other changes ==

 * The XML-RPC server now supports HTTP/1.1 keep-alive connections
 * Added several new XML-RPC methods
 * Renamed various main.set_rig_NNN XML-RPC methods to rig.set_NNN
 * Removed obsolete command line switches: --twoscopes, --experimental
 * Improved support for PulseAudio, now also the default backend on Linux
 * The ^R string is no longer treated like ^r; it is now ignored unless at the
   end of the text to be transmitted
 * The Portaudio playback stream is no longer kept open in receive mode; this
   fixes a problem with certain rig interfaces that generate a PTT signal even
   when the audio is complete silence
 * Improved win32 serial port support

== Bug fixes ==

 * The MT63 transmit buffer is now correctly initialized
 * Fixed random exceptions-related crashes on win32
 * Stabilized AFC for all PSK baud rates
 * Improved sensitivity of RSID implementation

 Many more small (and a couple not so small) bug fixes all over the tree

1 files changed, 29 insertions, 5 deletions

diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile
index b434d5ed5b2..d2120358dfc 100644
--- a/ham/fldigi/Makefile
+++ b/ham/fldigi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2012/09/28 03:25:41 dholland Exp $
+# $NetBSD: Makefile,v 1.17 2012/09/28 13:41:30 gdt Exp $
 #
 
-DISTNAME=	fldigi-3.03
-PKGREVISION=	6
+DISTNAME=	fldigi-3.21.52
 CATEGORIES=	ham
 MASTER_SITES=	http://www.w1hkj.com/downloads/fldigi/
 LICENSE=	gnu-gpl-v3
@@ -18,9 +17,33 @@ USE_TOOLS+=	gmake pkg-config
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS+=	--with-xmlrpc=no
+# NetBSD 5.1 fails to find strip - install: exec of strip failed:
 CONFIGURE_ENV+=		STRIP=${STRIP}
 
+BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
+
+SUBST_CLASSES+=		perl
+SUBST_STAGE.perl=	post-configure
+SUBST_FILES.perl=	scripts/fldigi-shell
+SUBST_MESSAGE.perl=	Replacing Perl PATH
+SUBST_SED.perl=		-e s\|/usr/bin/perl\|${PERL5:Q}\|g
+
+SUBST_CLASSES+=		asciidoc
+SUBST_STAGE.asciidoc=	post-configure
+SUBST_FILES.asciidoc=	doc/Makefile.am doc/Makefile.in doc/Makefile
+SUBST_MESSAGE.asciidoc=	Replacing asciidoc PATH
+SUBST_SED.asciidoc=	-e s\|/usr/share\|${PREFIX}/share\|g
+
+SUBST_CLASSES+=		brag-os
+SUBST_STAGE.brag-os=	post-patch
+SUBST_FILES.brag-os=	src/misc/newinstall.cxx
+SUBST_MESSAGE.brag-os=	Show OS name correctly with Brag button
+SUBST_SED.brag-os=	-e s/@@OS@@/${OPSYS}/
+
+# Following binary contains configure parameter, which is OK.
+CHECK_WRKREF_SKIP+=	bin/flarq
+CHECK_WRKREF_SKIP+=	bin/fldigi
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${LOWER_OPSYS} == "netbsd"
@@ -30,10 +53,11 @@ CONFIGURE_ENV+=		ac_cv_header_execinfo_h=no
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/portaudio-devel/buildlink3.mk"
+.include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../ham/hamlib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
+.include "../../textproc/xmlrpc-c/buildlink3.mk"
 .include "../../x11/fltk/buildlink3.mk"
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"