From d361dbd8422d6dfd9d6ed27e50fa0ae580212525 Mon Sep 17 00:00:00 2001 From: gdt Date: Fri, 28 Sep 2012 13:41:30 +0000 Subject: 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 macro to enable/disable/toggle the transmit lock * Added macro to transmit tuning tone for ''nn'' seconds * Added and macros * Added macro to delay macro expansion by ''nn'' seconds * Added , , , 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 macro syntax is now . The older 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.: , , . == 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- 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 --- ham/fldigi/DESCR | 28 ++++++++++--------- ham/fldigi/Makefile | 34 ++++++++++++++++++++---- ham/fldigi/PLIST | 14 +++++++++- ham/fldigi/distinfo | 12 ++++----- ham/fldigi/patches/patch-aa | 18 ------------- ham/fldigi/patches/patch-ab | 24 ----------------- ham/fldigi/patches/patch-ac | 15 ----------- ham/fldigi/patches/patch-src_misc_newinstall.cxx | 15 +++++++++++ 8 files changed, 78 insertions(+), 82 deletions(-) delete mode 100644 ham/fldigi/patches/patch-aa delete mode 100644 ham/fldigi/patches/patch-ab delete mode 100644 ham/fldigi/patches/patch-ac create mode 100644 ham/fldigi/patches/patch-src_misc_newinstall.cxx (limited to 'ham') diff --git a/ham/fldigi/DESCR b/ham/fldigi/DESCR index 6abf1b92cf8..871324ffe92 100644 --- a/ham/fldigi/DESCR +++ b/ham/fldigi/DESCR @@ -1,13 +1,17 @@ -A digital radio modem program with support for the following modes: +Fldigi is a software modem for Amateur Radio use. It is a sound card based +program that is used for both transmitting and receiving data in any of the +following modes: - * CW - * DominoEX - * Feld-Hell - * MFSK-4, MFSK-8, MFSK-16, MFSK-22, MFSK-31, MFSK-32, MFSK-64 - * PSK-31, QPSK-31, PSK-63, QPSK-63, PSK-125, QPSK-125, PSK-250, QPSK-250 - * Olivia various tones and bandwidths - * RTTY various baudrates, shifts and bandwidths - * Thor-4, Thor-5, Thor-8, Thor-11, Thor-16, Thor-22 - * Throb-1, Throb-2, Throb-4, ThrobX-1, ThrobX-2, ThrobX-4 - * WWV, receive only - * Freq. Analysis, receive only +BPSK and QPSK 31, 63, 125, 250 (both), and 63F and 500 (BPSK only) +PSKR 125, 250, and 500 +CW speeds from 5 to 200 wpm +DominoEX 4, 5, 8, 11, 16 and 22; also with FEC +Hellschreiber Feld Hell, Slow Hell, Hell x5/x9, FSKHell(-105) and Hell 80 +MFSK 4, 8, 11, 16, 22, 31, 32 and 64; most with image support +MT63 500, 1000 and 2000 +OLIVIA various tones and bandwidths +RTTY various baud rates, shifts, nbr. of data bits, etc. +THOR 4, 5, 8, 11, 16 and 22 +Throb and ThrobX 1, 2, and 4 +WWV receive only - calibrate your sound card to WWV +Frequency Analysis receive only - measure the frequency of a carrier 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" diff --git a/ham/fldigi/PLIST b/ham/fldigi/PLIST index 208f0f18e5f..8ab959eb499 100644 --- a/ham/fldigi/PLIST +++ b/ham/fldigi/PLIST @@ -1,4 +1,16 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:00:33 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2012/09/28 13:41:30 gdt Exp $ +bin/flarq bin/fldigi +bin/fldigi-shell +man/man1/flarq.1 +man/man1/fldigi-shell.1 +man/man1/fldigi.1 +share/applications/flarq.desktop share/applications/fldigi.desktop +share/fldigi/NAVTEX_Stations.csv +share/locale/es/LC_MESSAGES/fldigi.mo +share/locale/fr/LC_MESSAGES/fldigi.mo +share/locale/it/LC_MESSAGES/fldigi.mo +share/locale/pl/LC_MESSAGES/fldigi.mo +share/pixmaps/flarq.xpm share/pixmaps/fldigi.xpm diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo index 5939e8a9eb3..8bd43eabc06 100644 --- a/ham/fldigi/distinfo +++ b/ham/fldigi/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.3 2010/06/13 22:44:47 wiz Exp $ +$NetBSD: distinfo,v 1.4 2012/09/28 13:41:30 gdt Exp $ -SHA1 (fldigi-3.03.tar.gz) = fcdc0f34fe62b6857c5e02bb8e7a8ecbe6e7050c -RMD160 (fldigi-3.03.tar.gz) = 30fa50eee0b00c2a332f8c48999e0183df88f60a -Size (fldigi-3.03.tar.gz) = 711226 bytes -SHA1 (patch-aa) = 122d936e7f8bda5466dc252ffe17f501c0f341e8 -SHA1 (patch-ab) = 5934eab7879ef2928e23f91a7c71b65484dab7fa -SHA1 (patch-ac) = def1ee6e6c3f60a2febb029560f3ad7f9c5a3364 +SHA1 (fldigi-3.21.52.tar.gz) = 3efb868cc1577f2d3368794c3f76e6fcb3a02dae +RMD160 (fldigi-3.21.52.tar.gz) = 94ae20b7c0cf4bf37d8eb3f4dec4643e5acc9481 +Size (fldigi-3.21.52.tar.gz) = 1794366 bytes +SHA1 (patch-src_misc_newinstall.cxx) = 9cb519bb0bc862b18cfc7fb7bf85c2259e4ff2f0 diff --git a/ham/fldigi/patches/patch-aa b/ham/fldigi/patches/patch-aa deleted file mode 100644 index 196bad0a53d..00000000000 --- a/ham/fldigi/patches/patch-aa +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2008/10/23 08:07:09 wulf Exp $ - ---- src/soundcard/sound.cxx.orig 2008-04-10 22:29:17.000000000 +0930 -+++ src/soundcard/sound.cxx 2008-04-10 22:31:43.000000000 +0930 -@@ -467,9 +467,11 @@ - - bool SoundOSS::wait_till_finished() - { -- if (ioctl(device_fd, SNDCTL_DSP_POST, 1) == -1 ) -+ int arg = 1; -+ if (ioctl(device_fd, SNDCTL_DSP_POST, &arg) == -1 ) - return false; -- if (ioctl(device_fd, SNDCTL_DSP_SYNC, 0) == -1) -+ arg = 0; -+ if (ioctl(device_fd, SNDCTL_DSP_SYNC, &arg) == -1) - return false; /* format (or ioctl()) not supported by device */ - return true; /* all sound has been played */ - } diff --git a/ham/fldigi/patches/patch-ab b/ham/fldigi/patches/patch-ab deleted file mode 100644 index 42395360a10..00000000000 --- a/ham/fldigi/patches/patch-ab +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2010/06/13 22:44:47 wiz Exp $ - ---- src/widgets/picture.cxx.orig 2008-09-14 13:26:15.000000000 +0000 -+++ src/widgets/picture.cxx -@@ -31,8 +31,10 @@ - #include - - #if USE_LIBJPEG -+extern "C" { - # include - # include -+} - #endif - #if USE_LIBPNG - # include -@@ -317,7 +319,7 @@ int picture::save_png(const char* filena - return -1; - } - if ((info = png_create_info_struct(png)) == NULL) { -- png_destroy_write_struct(&png, png_infopp_NULL); -+ png_destroy_write_struct(&png, NULL); - fclose(fp); - return -1; - } diff --git a/ham/fldigi/patches/patch-ac b/ham/fldigi/patches/patch-ac deleted file mode 100644 index afc718e150b..00000000000 --- a/ham/fldigi/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2009/02/15 19:41:10 joerg Exp $ - ---- src/include/threads.h.orig 2009-02-15 19:59:36.000000000 +0100 -+++ src/include/threads.h -@@ -87,8 +87,8 @@ enum { UNKNOWN_TID = -1, TRX_TID, QRZ_TI - #else - extern pthread_key_t thread_id_; - # define CREATE_THREAD_ID() pthread_key_create(&thread_id_, 0); --# define SET_THREAD_ID(x) pthread_setspecific(thread_id_, (void *)(x)) --# define GET_THREAD_ID() (int)pthread_getspecific(thread_id_) -+# define SET_THREAD_ID(x) pthread_setspecific(thread_id_, (const void *)(ssize_t)(x)) -+# define GET_THREAD_ID() (int)(ssize_t)pthread_getspecific(thread_id_) - #endif // USE_TLS - - #include "fl_lock.h" diff --git a/ham/fldigi/patches/patch-src_misc_newinstall.cxx b/ham/fldigi/patches/patch-src_misc_newinstall.cxx new file mode 100644 index 00000000000..5a693965e2b --- /dev/null +++ b/ham/fldigi/patches/patch-src_misc_newinstall.cxx @@ -0,0 +1,15 @@ +$NetBSD: patch-src_misc_newinstall.cxx,v 1.1 2012/09/28 13:41:30 gdt Exp $ + +Brag command show OS:, but it is fixed, See SUBST in Makefile + +--- src/misc/newinstall.cxx.orig 2012-09-25 13:22:44.000000000 +0900 ++++ src/misc/newinstall.cxx 2012-09-25 13:23:42.000000000 +0900 +@@ -83,7 +83,7 @@ + Rig: \n\ + Pwr: \n\ + Ant: \n\ +-OS: Linux\n\ ++OS: @@OS@@\n\ + Soft: \n\ + Web: \n\ + Email: "; -- cgit v1.2.3