diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile index 0ffd10c29068..b658f88a8485 100644 --- a/comms/fldigi/Makefile +++ b/comms/fldigi/Makefile @@ -1,75 +1,69 @@ # $FreeBSD$ PORTNAME= fldigi -PORTVERSION= 3.23.21 +PORTVERSION= 4.0.1 CATEGORIES= comms hamradio MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= hamradio@FreeBSD.org COMMENT= Digital decoder for psk, cw, psk31, olivia 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\ libpng16.so:graphics/png \ libfltk.so:x11-toolkits/fltk \ libfontconfig.so:x11-fonts/fontconfig \ libsamplerate.so:audio/libsamplerate USE_CXXSTD= gnu++0x GNU_CONFIGURE= yes -USES= compiler:c++11-lib execinfo jpeg gmake perl5 pkgconfig shebangfix +USES= autoreconf compiler:c++11-lib execinfo jpeg gmake perl5 pkgconfig shebangfix USE_XORG= x11 xft xext xfixes xcursor xinerama 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:audio/libsndfile PORTAUDIO_CONFIGURE_WITH= portaudio PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio 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 -post-patch: - @${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-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 1cb9787a93e7..5ad6748cadc7 100644 --- a/comms/fldigi/distinfo +++ b/comms/fldigi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1490552971 -SHA256 (fldigi-3.23.21.tar.gz) = a70914876a415eba5eec112f752330a1cecbf55aa442f5d9dd466fb75ea11a3b -SIZE (fldigi-3.23.21.tar.gz) = 3217867 +TIMESTAMP = 1490880647 +SHA256 (fldigi-4.0.1.tar.gz) = ea68b7fe6de4eba8b99956a10c51c3c8d1e45cb8a6c6aa58594d8510a36d1bc5 +SIZE (fldigi-4.0.1.tar.gz) = 3346237 diff --git a/comms/fldigi/files/patch-src_include_main.h b/comms/fldigi/files/patch-src_include_main.h deleted file mode 100644 index ebb34dc581d5..000000000000 --- a/comms/fldigi/files/patch-src_include_main.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/include/main.h.orig 2017-01-29 13:26:25 UTC -+++ src/include/main.h -@@ -22,6 +22,8 @@ - #define MAIN_H_ - - #include -+// FreeBSD needs this -+#include - - #include - diff --git a/comms/fldigi/files/patch-src_logbook_adif__io.cxx b/comms/fldigi/files/patch-src_logbook_adif__io.cxx deleted file mode 100644 index 0b0b5113fcfc..000000000000 --- a/comms/fldigi/files/patch-src_logbook_adif__io.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- src/logbook/adif_io.cxx.orig 2017-01-29 13:26:25 UTC -+++ src/logbook/adif_io.cxx -@@ -316,7 +316,7 @@ void cAdifIO::do_readfile(const char *fn - } else { - ptr2 = ptr + 1; - } -- if ((ptr2) > 0 && (unsigned)(ptr2 - ptr) <= p) -+ if ((unsigned long)(ptr2) > 0 && (unsigned long)(ptr2 - ptr) <= p) - ptr = strchr(ptr2,'<'); - else - break; // corrupt record diff --git a/comms/fldigi/files/patch-src_widgets_picture.cxx b/comms/fldigi/files/patch-src_widgets_picture.cxx deleted file mode 100644 index fed30c020f18..000000000000 --- a/comms/fldigi/files/patch-src_widgets_picture.cxx +++ /dev/null @@ -1,10 +0,0 @@ ---- src/widgets/picture.cxx.orig 2017-01-29 13:26:25 UTC -+++ src/widgets/picture.cxx -@@ -40,6 +40,7 @@ - #include - - #include -+#include - #include - #include - diff --git a/comms/fldigi/pkg-plist b/comms/fldigi/pkg-plist index 27c25abcbcfb..a485ab1f0fb8 100644 --- a/comms/fldigi/pkg-plist +++ b/comms/fldigi/pkg-plist @@ -1,20 +1,21 @@ %%FLARQ%%bin/flarq bin/fldigi %%FLARQ%%man/man1/flarq.1.gz man/man1/fldigi.1.gz %%FLARQ%%share/applications/flarq.desktop share/applications/fldigi.desktop %%NLS%%share/locale/de/LC_MESSAGES/fldigi.mo %%NLS%%share/locale/es/LC_MESSAGES/fldigi.mo %%NLS%%share/locale/fr/LC_MESSAGES/fldigi.mo %%NLS%%share/locale/it/LC_MESSAGES/fldigi.mo %%NLS%%share/locale/pl/LC_MESSAGES/fldigi.mo %%NLS%%share/locale/nl/LC_MESSAGES/fldigi.mo +%%NLS%%share/locale/ru/LC_MESSAGES/fldigi.mo share/pixmaps/fldigi.xpm %%DATADIR%%/NAVTEX_Stations.csv %%DATADIR%%/ToR-Stats-SHIP.csv %%DATADIR%%/nsd_bbsss.txt %%DATADIR%%/station_table.txt %%FLARQ%%share/pixmaps/flarq.xpm %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/guide.html