diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile index d34390654737..76c90ee26ff9 100644 --- a/comms/fldigi/Makefile +++ b/comms/fldigi/Makefile @@ -1,69 +1,68 @@ PORTNAME= fldigi -DISTVERSION= 4.1.23 -PORTREVISION= 4 +DISTVERSION= 4.2.00 CATEGORIES= comms hamradio MASTER_SITES= http://www.w1hkj.com/files/fldigi/ MAINTAINER= hamradio@FreeBSD.org COMMENT= Digital decoder for psk, cw, psk31, olivia WWW= http://www.w1hkj.com LICENSE= GPLv3 BUILD_DEPENDS= asciidoc:textproc/asciidoc\ docbook-xsl>=1.0:textproc/docbook-xsl\ xsltproc:textproc/libxslt LIB_DEPENDS= libboost_system.so:devel/boost-libs\ libpng.so:graphics/png \ libfltk.so:x11-toolkits/fltk \ libfontconfig.so:x11-fonts/fontconfig \ libportaudio.so:audio/portaudio \ libsndfile.so:audio/libsndfile \ libsamplerate.so:audio/libsamplerate USES= autoreconf compiler:c++11-lib jpeg gmake perl5 pkgconfig \ shebangfix xorg USE_CXXSTD= gnu++0x GNU_CONFIGURE= yes USE_XORG= x11 xft xext xfixes xcursor xinerama xrender CONFIGURE_ENV= FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" \ EXTRA_LIBS="-lexecinfo" OPTIONS_DEFINE= FLARQ OSS PULSEAUDIO HAMLIB NLS DOCS NATIVE_OPT_DESC= Enable Native Optimizations FLARQ_DESC= Compile flarq OSS_DESC= Support OSS 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 PULSEAUDIO_CONFIGURE_WITH= pulseaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio HAMLIB_CONFIGURE_WITH= hamlib HAMLIB_LIB_DEPENDS= libhamlib.so:comms/hamlib NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext # Always need asciidoc for man pages CONFIGURE_ARGS+=--with-asciidoc # Always need soundfile CONFIGURE_ARGS+=--with-sndfile post-configure: # force rebuild of man pages ${RM} ${WRKSRC}/doc/*.1 post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${STAGEDIR}${DOCSDIR} .include diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo index e740c80b713a..906a53b49834 100644 --- a/comms/fldigi/distinfo +++ b/comms/fldigi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659707535 -SHA256 (fldigi-4.1.23.tar.gz) = e366e1fc9fc343f57d39128a6603a696f872351ed48dba8f3c3d168bda1fca8d -SIZE (fldigi-4.1.23.tar.gz) = 4933875 +TIMESTAMP = 1694820666 +SHA256 (fldigi-4.2.00.tar.gz) = 174f42e91de6120615852eff32a1011737ea18a6f2ac07a6e7ff900e5c08fbd9 +SIZE (fldigi-4.2.00.tar.gz) = 4973115 diff --git a/comms/fldigi/files/patch-Makefile.am b/comms/fldigi/files/patch-Makefile.am new file mode 100644 index 000000000000..9ae65494e960 --- /dev/null +++ b/comms/fldigi/files/patch-Makefile.am @@ -0,0 +1,8 @@ +--- Makefile.am.orig 2023-09-18 17:53:58 UTC ++++ Makefile.am +@@ -1,4 +1,4 @@ +-ACLOCAL_AMFLAGS = -I m4 -I m4/intl ++ACLOCAL_AMFLAGS = -I m4 + # AC_CONFIG_MACRO_DIR([m4]) + + SUBDIRS = po doc src diff --git a/comms/fldigi/files/patch-src_cw__rtty_fsk.cxx b/comms/fldigi/files/patch-src_cw__rtty_fsk.cxx deleted file mode 100644 index 641c408461e7..000000000000 --- a/comms/fldigi/files/patch-src_cw__rtty_fsk.cxx +++ /dev/null @@ -1,34 +0,0 @@ ---- src/cw_rtty/fsk.cxx.orig 2022-05-04 22:44:19 UTC -+++ src/cw_rtty/fsk.cxx -@@ -39,7 +39,9 @@ - #include - #include - --//#include -+#ifdef __FreeBSD__ -+#include -+#else - #if !HAVE_CLOCK_GETTIME - # ifdef __APPLE__ - # include -@@ -50,10 +52,12 @@ - # include - # endif - #endif -+#endif - - #include - #include - -+#ifndef __FreeBSD__ - #ifdef __WIN32__ - # include - //# include -@@ -67,6 +71,7 @@ - //# include - # include - # endif -+#endif - #endif - - #include "threads.h" diff --git a/comms/fldigi/files/patch-src_dialogs_confdialog.cxx b/comms/fldigi/files/patch-src_dialogs_confdialog.cxx index d486c7c99b63..2dea6c6b2339 100644 --- a/comms/fldigi/files/patch-src_dialogs_confdialog.cxx +++ b/comms/fldigi/files/patch-src_dialogs_confdialog.cxx @@ -1,29 +1,29 @@ ---- src/dialogs/confdialog.cxx.orig 2022-03-20 23:28:57 UTC +--- src/dialogs/confdialog.cxx.orig 2023-08-31 22:56:35 UTC +++ src/dialogs/confdialog.cxx -@@ -7689,7 +7689,7 @@ progdefaults.cmedia_ptt = false; +@@ -7790,7 +7790,7 @@ progdefaults.cmedia_ptt = false; btn_init_cmedia_PTT->redraw(); } else { progdefaults.cmedia_ptt = false; -close_cmedia(); +//close_cmedia(); } progdefaults.changed = true; } -@@ -7697,7 +7697,7 @@ static void cb_inp_cmedia_dev(Fl_ComboBox* o, void*) { +@@ -7798,7 +7798,7 @@ static void cb_inp_cmedia_dev(Fl_ComboBox* o, void*) { Fl_ComboBox *inp_cmedia_dev=(Fl_ComboBox *)0; static void cb_inp_cmedia_dev(Fl_ComboBox* o, void*) { - close_cmedia(); +// close_cmedia(); progdefaults.cmedia_device = o->value(); btn_init_cmedia_PTT->labelcolor(FL_RED); btn_init_cmedia_PTT->redraw(); -@@ -7721,7 +7721,7 @@ static void cb_btn_test_cmedia(Fl_Button*, void*) { +@@ -7822,7 +7822,7 @@ static void cb_btn_test_cmedia(Fl_Button*, void*) { Fl_Button *btn_test_cmedia=(Fl_Button *)0; static void cb_btn_test_cmedia(Fl_Button*, void*) { - test_hid_ptt(); +// test_hid_ptt(); } Fl_File_Input *inp_wav_fname_regex=(Fl_File_Input *)0; diff --git a/comms/fldigi/files/patch-src_main.cxx b/comms/fldigi/files/patch-src_main.cxx index a5c4f14a3903..e0bd90a1d528 100644 --- a/comms/fldigi/files/patch-src_main.cxx +++ b/comms/fldigi/files/patch-src_main.cxx @@ -1,11 +1,11 @@ ---- src/main.cxx.orig 2022-03-18 02:06:06 UTC +--- src/main.cxx.orig 2023-08-24 15:22:40 UTC +++ src/main.cxx -@@ -1174,7 +1174,7 @@ int main (int argc, char *argv[]) +@@ -1182,7 +1182,7 @@ int main (int argc, char *argv[]) setTabColors(); progdefaults.testCommPorts(); - init_hids(); + //init_hids(); #if USE_HAMLIB xcvr = new Rig(); diff --git a/comms/fldigi/files/patch-src_rigcontrol_ptt.cxx b/comms/fldigi/files/patch-src_rigcontrol_ptt.cxx index 344013ca5b84..027e74f580ff 100644 --- a/comms/fldigi/files/patch-src_rigcontrol_ptt.cxx +++ b/comms/fldigi/files/patch-src_rigcontrol_ptt.cxx @@ -1,39 +1,39 @@ ---- src/rigcontrol/ptt.cxx.orig 2022-03-18 02:06:06 UTC +--- src/rigcontrol/ptt.cxx.orig 2023-08-31 22:56:35 UTC +++ src/rigcontrol/ptt.cxx @@ -69,7 +69,7 @@ #include "n3fjp_logger.h" -#include "cmedia.h" +//#include "cmedia.h" LOG_FILE_SOURCE(debug::LOG_RIGCONTROL); @@ -114,9 +114,11 @@ void PTT::reset(ptt_t dev) case PTT_TTY: open_tty(); break; +#if 0 case PTT_CMEDIA: cmedia_fd = open_cmedia(progdefaults.cmedia_device); break; +#endif default: break; // nothing to open } -@@ -175,6 +177,7 @@ void PTT::set(bool ptt) +@@ -178,6 +180,7 @@ void PTT::set(bool ptt) set_uhrouter(ptt); break; #endif +#if 0 case PTT_CMEDIA: if (cmedia_fd != -1) { int bitnbr = 2; -@@ -185,6 +188,7 @@ void PTT::set(bool ptt) +@@ -188,6 +191,7 @@ void PTT::set(bool ptt) set_cmedia(bitnbr, ptt); } break; +#endif default: - { - nano_PTT(ptt); + break; + } diff --git a/comms/fldigi/files/patch-src_rtty_fsk.cxx b/comms/fldigi/files/patch-src_rtty_fsk.cxx new file mode 100644 index 000000000000..0abccff9a2ff --- /dev/null +++ b/comms/fldigi/files/patch-src_rtty_fsk.cxx @@ -0,0 +1,22 @@ +--- src/rtty/fsk.cxx.orig 2023-08-04 01:13:40 UTC ++++ src/rtty/fsk.cxx +@@ -50,10 +50,10 @@ + # include + # endif + #endif +- + #include + #include + ++#ifndef __FreeBSD__ + #ifdef __WIN32__ + # include + //# include +@@ -67,6 +67,7 @@ + //# include + # include + # endif ++#endif + #endif + + #include "threads.h"