Index: head/comms/fldigi/Makefile =================================================================== --- head/comms/fldigi/Makefile (revision 398455) +++ head/comms/fldigi/Makefile (revision 398456) @@ -1,80 +1,86 @@ # $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 LICENSE= GPLv3 BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconf \ asciidoc:${PORTSDIR}/textproc/asciidoc\ docbook-xsl>=1.0:${PORTSDIR}/textproc/docbook-xsl\ xsltproc:${PORTSDIR}/textproc/libxslt LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ libsamplerate.so:${PORTSDIR}/audio/libsamplerate\ libboost_system.so:${PORTSDIR}/devel/boost-libs\ libfltk.so:${PORTSDIR}/x11-toolkits/fltk USE_CXXSTD= gnu++0x GNU_CONFIGURE= yes USES= compiler:c++11-lib gmake perl5 pkgconfig shebangfix CONFIGURE_ENV= FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" \ EXTRA_LIBS="-lexecinfo" OPTIONS_DEFINE= NATIVE_OPT FLARQ OSS SNDFILE PORTAUDIO PULSEAUDIO HAMLIB NLS DOCS NATIVE_OPT_DESC= Enable Native Optimizations FLARQ_DESC= Compile flarq OSS_DESC= Support OSS SNDFILE_DESC= Support for libsndfile PORTAUDIO_DESC= PortAudio support PULSEAUDIO_DESC= PulseAudio support HAMLIB_DESC= Support rig control via hamlib OPTIONS_DEFAULT= FLARQ OSS HAMLIB OPTIONS_SUB= yes NATIVE_OPT_CONFIGURE_ON= --enable-optimizations=native NATIVE_OPT_CONFIGURE_OFF= --enable-optimizations=none FLARQ_CONFIGURE_ENABLE= flarq OSS_CONFIGURE_ENABLE= oss SNDFILE_CONFIGURE_WITH= sndfile SNDFILE_LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile PORTAUDIO_CONFIGURE_WITH= portaudio PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio PULSEAUDIO_CONFIGURE_WITH= pulseaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio HAMLIB_CONFIGURE_WITH= hamlib HAMLIB_LIB_DEPENDS= libhamlib.so:${PORTSDIR}/comms/hamlib 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 post-configure: @${REINPLACE_CMD} -e 's|^CPPFLAGS|#CPPFLAGS|' \ ${WRKSRC}/src/Makefile # force rebuild of man pages ${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 Index: head/comms/fldigi/distinfo =================================================================== --- head/comms/fldigi/distinfo (revision 398455) +++ head/comms/fldigi/distinfo (revision 398456) @@ -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 Property changes on: head/comms/fldigi/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/fldigi/files/patch-src_logbook_lookupcall.cxx =================================================================== --- head/comms/fldigi/files/patch-src_logbook_lookupcall.cxx (revision 398455) +++ head/comms/fldigi/files/patch-src_logbook_lookupcall.cxx (nonexistent) @@ -1,11 +0,0 @@ ---- src/logbook/lookupcall.cxx.orig 2015-04-23 11:39:24 UTC -+++ src/logbook/lookupcall.cxx -@@ -1188,7 +1188,7 @@ static void *EQSL_loop(void *args) - return NULL; - - size_t p; -- if (fetch_http(EQSL_url, EQSL_xmlpage, 5.0) == -1) -+ if (fetch_http(EQSL_url, EQSL_xmlpage, 5.0) == false) - LOG_ERROR("%s", "eQSL not available"); - - else if ((p = EQSL_xmlpage.find("Error:")) != std::string::npos) { Property changes on: head/comms/fldigi/files/patch-src_logbook_lookupcall.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/fldigi/files/patch-src_dialogs_fl__digi.cxx =================================================================== --- head/comms/fldigi/files/patch-src_dialogs_fl__digi.cxx (revision 398455) +++ head/comms/fldigi/files/patch-src_dialogs_fl__digi.cxx (revision 398456) @@ -1,10 +1,10 @@ ---- 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 #include +#include #ifdef __WOE32__ # ifdef __CYGWIN__ Property changes on: head/comms/fldigi/files/patch-src_dialogs_fl__digi.cxx ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/fldigi/files/patch-src_dominoex_dominoex.cxx =================================================================== --- head/comms/fldigi/files/patch-src_dominoex_dominoex.cxx (revision 398455) +++ head/comms/fldigi/files/patch-src_dominoex_dominoex.cxx (revision 398456) @@ -1,11 +1,11 @@ ---- 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) strSecXmtText = progdefaults.secText; if (strSecXmtText.length() == 0) - strSecXmtText = "fldigi "PACKAGE_VERSION" "; + strSecXmtText = "fldigi " PACKAGE_VERSION; videoText(); } Property changes on: head/comms/fldigi/files/patch-src_dominoex_dominoex.cxx ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/fldigi/files/patch-src_fsq_fsq.cxx =================================================================== --- head/comms/fldigi/files/patch-src_fsq_fsq.cxx (revision 398455) +++ head/comms/fldigi/files/patch-src_fsq_fsq.cxx (revision 398456) @@ -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(); Property changes on: head/comms/fldigi/files/patch-src_fsq_fsq.cxx ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/fldigi/files/patch-src_ifkp_ifkp.cxx =================================================================== --- head/comms/fldigi/files/patch-src_ifkp_ifkp.cxx (nonexistent) +++ head/comms/fldigi/files/patch-src_ifkp_ifkp.cxx (revision 398456) @@ -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(); + } Property changes on: head/comms/fldigi/files/patch-src_ifkp_ifkp.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/fldigi/files/patch-src_include_data__io.h =================================================================== --- head/comms/fldigi/files/patch-src_include_data__io.h (revision 398455) +++ head/comms/fldigi/files/patch-src_include_data__io.h (revision 398456) @@ -1,11 +1,11 @@ ---- 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 #define fldigi_data_io_h +#include // For time_t + #define DEFAULT_ARQ_IP_ADDRESS "127.0.0.1" #define DEFAULT_ARQ_IP_PORT "7322" Property changes on: head/comms/fldigi/files/patch-src_include_data__io.h ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/fldigi/files/patch-src_include_qrunner.h =================================================================== --- head/comms/fldigi/files/patch-src_include_qrunner.h (revision 398455) +++ head/comms/fldigi/files/patch-src_include_qrunner.h (revision 398456) @@ -1,10 +1,10 @@ ---- 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 #include #include +#include #if HAVE_STD_BIND # include Property changes on: head/comms/fldigi/files/patch-src_include_qrunner.h ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/fldigi/files/patch-src_misc_newinstall.cxx =================================================================== --- head/comms/fldigi/files/patch-src_misc_newinstall.cxx (revision 398455) +++ head/comms/fldigi/files/patch-src_misc_newinstall.cxx (revision 398456) @@ -1,11 +1,11 @@ ---- 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\ Pwr: \n\ Ant: \n\ -OS: Linux\n\ +OS: FreeBSD\n\ Soft: \n\ Web: \n\ Email: "; Property changes on: head/comms/fldigi/files/patch-src_misc_newinstall.cxx ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx =================================================================== --- head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx (revision 398455) +++ head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx (revision 398456) @@ -1,11 +1,11 @@ ---- 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; qr->inprog = true; - size_t n = QRUNNER_READ(fd, rbuf, FIFO_SIZE); + ssize_t n = QRUNNER_READ(fd, rbuf, FIFO_SIZE); switch (n) { case -1: if (!QRUNNER_EAGAIN()) { Property changes on: head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/fldigi/files/patch-src_soundcard_sound.cxx =================================================================== --- head/comms/fldigi/files/patch-src_soundcard_sound.cxx (revision 398455) +++ head/comms/fldigi/files/patch-src_soundcard_sound.cxx (revision 398456) @@ -1,20 +1,20 @@ ---- 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 for (size_t i = 0; i < buffersize; i++) buffer[i] = src_buffer[2*i + - progdefaults.ReverseRxAudio ? 1 : 0]; + (progdefaults.ReverseRxAudio ? 1 : 0)]; #if USE_SNDFILE if (capture) @@ -724,7 +724,7 @@ size_t SoundOSS::Read(float *buffer, siz for (int i = 0; i < numread; i++) buffer[i] = snd_buffer[2*i + - progdefaults.sig_on_right_channel ? 1 : 0]; + (progdefaults.sig_on_right_channel ? 1 : 0)]; return numread; Property changes on: head/comms/fldigi/files/patch-src_soundcard_sound.cxx ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/fldigi/files/patch-src_spot_pskrep.cxx =================================================================== --- head/comms/fldigi/files/patch-src_spot_pskrep.cxx (revision 398455) +++ head/comms/fldigi/files/patch-src_spot_pskrep.cxx (revision 398456) @@ -1,11 +1,11 @@ ---- 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 #include -#if GCC_VER_OK +#if GCC_VER_OK || HAVE_STD_HASH # if HAVE_STD_HASH # define MAP_TYPE std::unordered_map # define HASH_TYPE std::hash Property changes on: head/comms/fldigi/files/patch-src_spot_pskrep.cxx ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/fldigi/files/patch-src_thor_thor.cxx =================================================================== --- head/comms/fldigi/files/patch-src_thor_thor.cxx (revision 398455) +++ head/comms/fldigi/files/patch-src_thor_thor.cxx (revision 398456) @@ -1,11 +1,11 @@ ---- 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(); strSecXmtText = progdefaults.THORsecText; if (strSecXmtText.length() == 0) - strSecXmtText = "fldigi "PACKAGE_VERSION" "; + strSecXmtText = "fldigi " PACKAGE_VERSION " "; cptr = 0; } Property changes on: head/comms/fldigi/files/patch-src_thor_thor.cxx ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/fldigi/files/patch-src_wefax_wefax.cxx =================================================================== --- head/comms/fldigi/files/patch-src_wefax_wefax.cxx (revision 398455) +++ head/comms/fldigi/files/patch-src_wefax_wefax.cxx (revision 398456) @@ -1,11 +1,11 @@ ---- 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) + wf->powerDensity(m_carrier - m_apt_start_freq, bandwidth_apt_start) + wf->powerDensity(m_carrier , bandwidth_apt_start) - + wf->powerDensity(m_carrier + m_apt_start_freq, bandwidth_apt_start); + + wf->powerDensity(m_carrier + m_apt_start_freq, bandwidth_apt_start) + wf->powerDensity(m_carrier + 2 * m_apt_start_freq, bandwidth_apt_start); return decayavg( avg_pwr, pwr, 10 ); Property changes on: head/comms/fldigi/files/patch-src_wefax_wefax.cxx ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/fldigi/files/patch-src_widgets_picture.cxx =================================================================== --- head/comms/fldigi/files/patch-src_widgets_picture.cxx (nonexistent) +++ head/comms/fldigi/files/patch-src_widgets_picture.cxx (revision 398456) @@ -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 + Property changes on: head/comms/fldigi/files/patch-src_widgets_picture.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcBase64.h =================================================================== --- head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcBase64.h (revision 398455) +++ head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcBase64.h (revision 398456) @@ -1,10 +1,10 @@ ---- 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__) #define __BASE64_H_INCLUDED__ 1 +#include #include static Property changes on: head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcBase64.h ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/fldigi/pkg-descr =================================================================== --- head/comms/fldigi/pkg-descr (revision 398455) +++ head/comms/fldigi/pkg-descr (revision 398456) @@ -1,16 +1,16 @@ Digital modem program. Supports the following digital modes: CW, DominoEX 4 DominoEX 5 DominoEX 8 DominoEX 11 DominoEX 16 DominoEX 22, Feld-Hell FSK-Hell FSK-Hell 105, MFSK-8 MFSK-16 MFSK-16 pix , PSK-31 QPSK-31 PSK-63 QPSK-63 PSK-125 QPSK-125, OLIVIA / Contestia various tones and bandwidth, RTTY various Baud Rates, Shifts, Nbr of data bits, etc., Throb-1 Throb-2 Throb-4 ThrobX-1 ThrobX-2 ThrobX-4, WWV Receive only - calibrate your sound card to WWV and 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 Property changes on: head/comms/fldigi/pkg-descr ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property