Index: head/comms/fldigi/Makefile =================================================================== --- head/comms/fldigi/Makefile (revision 436979) +++ head/comms/fldigi/Makefile (revision 436980) @@ -1,72 +1,75 @@ # $FreeBSD$ PORTNAME= fldigi -PORTVERSION= 3.23.20 +PORTVERSION= 3.23.21 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= libsamplerate.so:audio/libsamplerate\ - libboost_system.so:devel/boost-libs\ - libfltk.so:x11-toolkits/fltk +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 gmake perl5 pkgconfig shebangfix +USES= 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 Index: head/comms/fldigi/distinfo =================================================================== --- head/comms/fldigi/distinfo (revision 436979) +++ head/comms/fldigi/distinfo (revision 436980) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483830837 -SHA256 (fldigi-3.23.20.tar.gz) = 97b5489c4e428ed707aaf6c05a7b46874339031a8e9b24e50f4818c15435fce9 -SIZE (fldigi-3.23.20.tar.gz) = 3215903 +TIMESTAMP = 1490552971 +SHA256 (fldigi-3.23.21.tar.gz) = a70914876a415eba5eec112f752330a1cecbf55aa442f5d9dd466fb75ea11a3b +SIZE (fldigi-3.23.21.tar.gz) = 3217867 Index: head/comms/fldigi/files/patch-src_include_main.h =================================================================== --- head/comms/fldigi/files/patch-src_include_main.h (revision 436979) +++ head/comms/fldigi/files/patch-src_include_main.h (revision 436980) @@ -1,11 +1,11 @@ ---- src/include/main.h.orig 2016-12-07 04:15:22 UTC +--- 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 Index: head/comms/fldigi/files/patch-src_logbook_adif__io.cxx =================================================================== --- head/comms/fldigi/files/patch-src_logbook_adif__io.cxx (nonexistent) +++ head/comms/fldigi/files/patch-src_logbook_adif__io.cxx (revision 436980) @@ -0,0 +1,11 @@ +--- 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 Property changes on: head/comms/fldigi/files/patch-src_logbook_adif__io.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_misc_newinstall.cxx =================================================================== --- head/comms/fldigi/files/patch-src_misc_newinstall.cxx (revision 436979) +++ head/comms/fldigi/files/patch-src_misc_newinstall.cxx (revision 436980) @@ -1,20 +1,20 @@ ---- src/misc/newinstall.cxx.orig 2016-08-07 11:40:51 UTC +--- src/misc/newinstall.cxx.orig 2017-01-29 13:26:25 UTC +++ src/misc/newinstall.cxx @@ -67,7 +67,7 @@ text[3] = " btu de \n\ Web: \n\ Email: "; Index: head/comms/fldigi/files/patch-src_widgets_picture.cxx =================================================================== --- head/comms/fldigi/files/patch-src_widgets_picture.cxx (revision 436979) +++ head/comms/fldigi/files/patch-src_widgets_picture.cxx (revision 436980) @@ -1,10 +1,10 @@ ---- src/widgets/picture.cxx.orig 2016-09-18 12:35:58 UTC +--- 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