From owner-svn-ports-head@freebsd.org Sat Oct 3 00:47:22 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84D29A0E7A4; Sat, 3 Oct 2015 00:47:22 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6A15D1C25; Sat, 3 Oct 2015 00:47:22 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t930lMW4091467; Sat, 3 Oct 2015 00:47:22 GMT (envelope-from db@FreeBSD.org) Received: (from db@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t930lHlu091448; Sat, 3 Oct 2015 00:47:17 GMT (envelope-from db@FreeBSD.org) Message-Id: <201510030047.t930lHlu091448@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: db set sender to db@FreeBSD.org using -f From: Diane Bruce Date: Sat, 3 Oct 2015 00:47:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398456 - in head/comms/fldigi: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Oct 2015 00:47:22 -0000 Author: db Date: Sat Oct 3 00:47:16 2015 New Revision: 398456 URL: https://svnweb.freebsd.org/changeset/ports/398456 Log: Upgrade fldigi =Version 3.23.03= FSQ and fixes for FSQ bugs. Various fixes for Olivia/Contestia, macro bug, WEFAX hang on INFO Added ifkp modem Added: head/comms/fldigi/files/patch-src_ifkp_ifkp.cxx (contents, props changed) head/comms/fldigi/files/patch-src_widgets_picture.cxx (contents, props changed) Deleted: head/comms/fldigi/files/patch-src_logbook_lookupcall.cxx Modified: head/comms/fldigi/Makefile head/comms/fldigi/distinfo (contents, props changed) head/comms/fldigi/files/patch-src_dialogs_fl__digi.cxx (contents, props changed) head/comms/fldigi/files/patch-src_dominoex_dominoex.cxx (contents, props changed) head/comms/fldigi/files/patch-src_fsq_fsq.cxx (contents, props changed) head/comms/fldigi/files/patch-src_include_data__io.h (contents, props changed) head/comms/fldigi/files/patch-src_include_qrunner.h (contents, props changed) head/comms/fldigi/files/patch-src_misc_newinstall.cxx (contents, props changed) head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx (contents, props changed) head/comms/fldigi/files/patch-src_soundcard_sound.cxx (contents, props changed) head/comms/fldigi/files/patch-src_spot_pskrep.cxx (contents, props changed) head/comms/fldigi/files/patch-src_thor_thor.cxx (contents, props changed) head/comms/fldigi/files/patch-src_wefax_wefax.cxx (contents, props changed) head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcBase64.h (contents, props changed) head/comms/fldigi/pkg-descr (contents, props changed) Modified: head/comms/fldigi/Makefile ============================================================================== --- head/comms/fldigi/Makefile Fri Oct 2 23:55:42 2015 (r398455) +++ head/comms/fldigi/Makefile Sat Oct 3 00:47:16 2015 (r398456) @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= fldigi -PORTVERSION= 3.22.13 +PORTVERSION= 3.23.03 CATEGORIES= comms hamradio MASTER_SITES= http://www.w1hkj.com/downloads/fldigi/\ - LOCAL/shurd + LOCAL/db MAINTAINER= hamradio@FreeBSD.org COMMENT= Digital decoder for psk, cw, psk31, olivia @@ -54,15 +54,19 @@ HAMLIB_LIB_DEPENDS= libhamlib.so:${PORT NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext -BROKEN_sparc64= Fails to install +.include +.if ${ARCH} == "sparc64" +BROKEN= Fails to install +.endif +.if ${PORT_OPTIONS:MFLARQ} +MAN1+= flarq.1 +.endif PLIST_SUB+= XMLRPC="" # Always need asciidoc for man pages CONFIGURE_ARGS+=--with-asciidoc post-patch: - @${REINPLACE_CMD} -e 's|png_infopp_NULL|NULL|' \ - ${WRKSRC}/src/widgets/picture.cxx @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/Makefile.in @@ -73,8 +77,10 @@ post-configure: ${RM} ${WRKSRC}/doc/*.1 post-install: +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${STAGEDIR}${DOCSDIR} +.endif -.include +.include Modified: head/comms/fldigi/distinfo ============================================================================== --- head/comms/fldigi/distinfo Fri Oct 2 23:55:42 2015 (r398455) +++ head/comms/fldigi/distinfo Sat Oct 3 00:47:16 2015 (r398456) @@ -1,2 +1,2 @@ -SHA256 (fldigi-3.22.13.tar.gz) = f055b607dd28bde847541bd4518e5ceac49e0eccf4bda97c4c589d598c4a3baf -SIZE (fldigi-3.22.13.tar.gz) = 2909523 +SHA256 (fldigi-3.23.03.tar.gz) = b308ceb0581e7668eedf83042baf6f9ae4af938648436cd1857655cad8fe978e +SIZE (fldigi-3.23.03.tar.gz) = 2951727 Modified: head/comms/fldigi/files/patch-src_dialogs_fl__digi.cxx ============================================================================== --- head/comms/fldigi/files/patch-src_dialogs_fl__digi.cxx Fri Oct 2 23:55:42 2015 (r398455) +++ head/comms/fldigi/files/patch-src_dialogs_fl__digi.cxx Sat Oct 3 00:47:16 2015 (r398456) @@ -1,4 +1,4 @@ ---- src/dialogs/fl_digi.cxx.orig 2015-04-23 11:39:24 UTC +--- src/dialogs/fl_digi.cxx.orig 2015-09-29 12:58:57 UTC +++ src/dialogs/fl_digi.cxx @@ -26,6 +26,7 @@ #include Modified: head/comms/fldigi/files/patch-src_dominoex_dominoex.cxx ============================================================================== --- head/comms/fldigi/files/patch-src_dominoex_dominoex.cxx Fri Oct 2 23:55:42 2015 (r398455) +++ head/comms/fldigi/files/patch-src_dominoex_dominoex.cxx Sat Oct 3 00:47:16 2015 (r398456) @@ -1,4 +1,4 @@ ---- src/dominoex/dominoex.cxx.orig 2015-04-22 15:17:06 UTC +--- src/dominoex/dominoex.cxx.orig 2015-08-12 20:42:39 UTC +++ src/dominoex/dominoex.cxx @@ -63,7 +63,7 @@ void dominoex::tx_init(SoundBase *sc) Modified: head/comms/fldigi/files/patch-src_fsq_fsq.cxx ============================================================================== --- head/comms/fldigi/files/patch-src_fsq_fsq.cxx Fri Oct 2 23:55:42 2015 (r398455) +++ head/comms/fldigi/files/patch-src_fsq_fsq.cxx Sat Oct 3 00:47:16 2015 (r398456) @@ -1,14 +1,49 @@ ---- src/fsq/fsq.cxx.orig 2015-08-15 03:43:43 UTC +--- src/fsq/fsq.cxx.orig 2015-09-28 18:24:41 UTC +++ src/fsq/fsq.cxx -@@ -1198,8 +1198,9 @@ int fsq::rx_process(const double *buf, i +@@ -1193,9 +1193,12 @@ int fsq::rx_process(const double *buf, i + &rx_stream[SHIFT_SIZE], // from BLOCK_SIZE*sizeof(*rx_stream)); // # bytes memset(fft_data, 0, sizeof(fft_data)); - for (int i = 0; i < BLOCK_SIZE; i++) +- for (int i = 0; i < BLOCK_SIZE; i++) - fft_data[i].real() = fft_data[i].imag() = - rx_stream[i] * a_blackman[i]; -+ fft_data[i] = complex -+ (rx_stream[i] * a_blackman[i], ++ for (int i = 0; i < BLOCK_SIZE; i++) { ++ fft_data[i].real( + rx_stream[i] * a_blackman[i]); ++ fft_data[i].imag( ++ rx_stream[i] * a_blackman[i]); ++ } fft->ComplexFFT(fft_data); process_tones(); } +@@ -1423,7 +1426,7 @@ static string tx_text_queue = ""; + + static vector commands; + #define NUMCOMMANDS 10 +-static size_t next = 0; ++static size_t nexti = 0; + + double fsq_xmtdelay() // in seconds + { +@@ -1440,9 +1443,9 @@ double fsq_xmtdelay() // in seconds + void fsq_repeat_last_command() + { + fsq_tx_text->clear(); +- fsq_tx_text->addstr(sz2utf8(commands[next].c_str())); +- next++; +- if (next == commands.size()) next = 0; ++ fsq_tx_text->addstr(sz2utf8(commands[nexti].c_str())); ++ nexti++; ++ if (nexti == commands.size()) nexti = 0; + } + + int get_fsq_tx_char(void) +@@ -1484,7 +1487,7 @@ void try_transmit(void *) + if (active_modem != fsq_modem) return; + + if (!active_modem->fsq_squelch_open() && trx_state == STATE_RX) { +- next = 0; ++ nexti = 0; + fsq_que_clear(); + //LOG_WARN("%s", "start_tx()"); + start_tx(); Added: head/comms/fldigi/files/patch-src_ifkp_ifkp.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_ifkp_ifkp.cxx Sat Oct 3 00:47:16 2015 (r398456) @@ -0,0 +1,18 @@ +--- src/ifkp/ifkp.cxx.orig 2015-10-02 23:20:08 UTC ++++ src/ifkp/ifkp.cxx +@@ -580,9 +580,12 @@ int ifkp::rx_process(const double *buf, + &rx_stream[IFKP_SHIFT_SIZE], // from + IFKP_BLOCK_SIZE*sizeof(*rx_stream)); // # bytes + memset(fft_data, 0, sizeof(fft_data)); +- for (int i = 0; i < IFKP_BLOCK_SIZE; i++) +- fft_data[i].real() = fft_data[i].imag() = +- rx_stream[i] * a_blackman[i]; ++ for (int i = 0; i < IFKP_BLOCK_SIZE; i++) { ++ fft_data[i].real( ++ rx_stream[i] * a_blackman[i]); ++ fft_data[i].imag( ++ rx_stream[i] * a_blackman[i]); ++ } + fft->ComplexFFT(fft_data); + process_tones(); + } Modified: head/comms/fldigi/files/patch-src_include_data__io.h ============================================================================== --- head/comms/fldigi/files/patch-src_include_data__io.h Fri Oct 2 23:55:42 2015 (r398455) +++ head/comms/fldigi/files/patch-src_include_data__io.h Sat Oct 3 00:47:16 2015 (r398456) @@ -1,4 +1,4 @@ ---- src/include/data_io.h.orig 2015-04-18 13:26:19 UTC +--- src/include/data_io.h.orig 2015-08-12 20:42:40 UTC +++ src/include/data_io.h @@ -27,6 +27,8 @@ #ifndef fldigi_data_io_h Modified: head/comms/fldigi/files/patch-src_include_qrunner.h ============================================================================== --- head/comms/fldigi/files/patch-src_include_qrunner.h Fri Oct 2 23:55:42 2015 (r398455) +++ head/comms/fldigi/files/patch-src_include_qrunner.h Sat Oct 3 00:47:16 2015 (r398456) @@ -1,4 +1,4 @@ ---- src/include/qrunner.h.orig 2015-03-21 00:29:03 UTC +--- src/include/qrunner.h.orig 2015-08-12 20:42:40 UTC +++ src/include/qrunner.h @@ -32,6 +32,7 @@ #include Modified: head/comms/fldigi/files/patch-src_misc_newinstall.cxx ============================================================================== --- head/comms/fldigi/files/patch-src_misc_newinstall.cxx Fri Oct 2 23:55:42 2015 (r398455) +++ head/comms/fldigi/files/patch-src_misc_newinstall.cxx Sat Oct 3 00:47:16 2015 (r398456) @@ -1,4 +1,4 @@ ---- src/misc/newinstall.cxx.orig 2015-03-21 00:29:03 UTC +--- src/misc/newinstall.cxx.orig 2015-08-12 20:42:32 UTC +++ src/misc/newinstall.cxx @@ -84,7 +84,7 @@ Age: \n\ Rig: \n\ Modified: head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx ============================================================================== --- head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx Fri Oct 2 23:55:42 2015 (r398455) +++ head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx Sat Oct 3 00:47:16 2015 (r398456) @@ -1,4 +1,4 @@ ---- src/qrunner/qrunner.cxx.orig 2015-03-21 00:29:04 UTC +--- src/qrunner/qrunner.cxx.orig 2015-08-12 20:42:38 UTC +++ src/qrunner/qrunner.cxx @@ -103,7 +103,7 @@ void qrunner::execute(int fd, void *arg) return; Modified: head/comms/fldigi/files/patch-src_soundcard_sound.cxx ============================================================================== --- head/comms/fldigi/files/patch-src_soundcard_sound.cxx Fri Oct 2 23:55:42 2015 (r398455) +++ head/comms/fldigi/files/patch-src_soundcard_sound.cxx Sat Oct 3 00:47:16 2015 (r398456) @@ -1,4 +1,4 @@ ---- src/soundcard/sound.cxx.orig 2015-05-11 09:19:59 UTC +--- src/soundcard/sound.cxx.orig 2015-08-12 20:42:32 UTC +++ src/soundcard/sound.cxx @@ -689,7 +689,7 @@ size_t SoundOSS::Read(float *buffer, siz Modified: head/comms/fldigi/files/patch-src_spot_pskrep.cxx ============================================================================== --- head/comms/fldigi/files/patch-src_spot_pskrep.cxx Fri Oct 2 23:55:42 2015 (r398455) +++ head/comms/fldigi/files/patch-src_spot_pskrep.cxx Sat Oct 3 00:47:16 2015 (r398456) @@ -1,4 +1,4 @@ ---- src/spot/pskrep.cxx.orig 2015-03-21 00:29:04 UTC +--- src/spot/pskrep.cxx.orig 2015-09-15 14:09:37 UTC +++ src/spot/pskrep.cxx @@ -50,7 +50,7 @@ #include Modified: head/comms/fldigi/files/patch-src_thor_thor.cxx ============================================================================== --- head/comms/fldigi/files/patch-src_thor_thor.cxx Fri Oct 2 23:55:42 2015 (r398455) +++ head/comms/fldigi/files/patch-src_thor_thor.cxx Sat Oct 3 00:47:16 2015 (r398456) @@ -1,4 +1,4 @@ ---- src/thor/thor.cxx.orig 2015-04-22 15:17:06 UTC +--- src/thor/thor.cxx.orig 2015-09-30 11:23:49 UTC +++ src/thor/thor.cxx @@ -63,7 +63,7 @@ void thor::tx_init(SoundBase *sc) videoText(); Modified: head/comms/fldigi/files/patch-src_wefax_wefax.cxx ============================================================================== --- head/comms/fldigi/files/patch-src_wefax_wefax.cxx Fri Oct 2 23:55:42 2015 (r398455) +++ head/comms/fldigi/files/patch-src_wefax_wefax.cxx Sat Oct 3 00:47:16 2015 (r398456) @@ -1,4 +1,4 @@ ---- src/wefax/wefax.cxx.orig 2015-04-22 15:17:06 UTC +--- src/wefax/wefax.cxx.orig 2015-09-12 20:02:06 UTC +++ src/wefax/wefax.cxx @@ -556,7 +556,7 @@ private: = wf->powerDensity(m_carrier - 2 * m_apt_start_freq, bandwidth_apt_start) Added: head/comms/fldigi/files/patch-src_widgets_picture.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_widgets_picture.cxx Sat Oct 3 00:47:16 2015 (r398456) @@ -0,0 +1,10 @@ +--- src/widgets/picture.cxx.orig 2015-09-12 20:02:06 UTC ++++ src/widgets/picture.cxx +@@ -40,6 +40,7 @@ + #include + + #include ++#include + #include + #include + Modified: head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcBase64.h ============================================================================== --- head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcBase64.h Fri Oct 2 23:55:42 2015 (r398455) +++ head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcBase64.h Sat Oct 3 00:47:16 2015 (r398456) @@ -1,4 +1,4 @@ ---- src/xmlrpcpp/XmlRpcBase64.h.orig 2015-04-23 11:39:24 UTC +--- src/xmlrpcpp/XmlRpcBase64.h.orig 2015-08-12 20:42:40 UTC +++ src/xmlrpcpp/XmlRpcBase64.h @@ -18,6 +18,7 @@ #if !defined(__BASE64_H_INCLUDED__) Modified: head/comms/fldigi/pkg-descr ============================================================================== --- head/comms/fldigi/pkg-descr Fri Oct 2 23:55:42 2015 (r398455) +++ head/comms/fldigi/pkg-descr Sat Oct 3 00:47:16 2015 (r398456) @@ -13,4 +13,4 @@ WWV Receive only - calibrate your sound Freq Analysis Receive only - be ready for the (next) ARRL FMT (freq meas test). -WWW: http://www.w1hkj.com/Fldigi.html +WWW: http://www.w1hkj.com