Index: head/comms/fldigi/Makefile =================================================================== --- head/comms/fldigi/Makefile (revision 385220) +++ head/comms/fldigi/Makefile (revision 385221) @@ -1,122 +1,121 @@ # $FreeBSD$ PORTNAME= fldigi -PORTVERSION= 3.22.05 +PORTVERSION= 3.22.08 CATEGORIES= comms hamradio MASTER_SITES= http://www.w1hkj.com/downloads/fldigi/\ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= shurd 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= gmake pkgconfig compiler:c++11-lib perl5 shebangfix CONFIGURE_ENV= FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" \ EXTRA_LIBS="-lexecinfo" -SHEBANG_FILES= scripts/fldigi-shell 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 .include .if ${ARCH} == "sparc64" BROKEN= Fails to install .endif .if ${PORT_OPTIONS:MNATIVE_OPT} CONFIGURE_ARGS+=--enable-optimizations=native .else CONFIGURE_ARGS+=--enable-optimizations=none .endif .if ${PORT_OPTIONS:MFLARQ} CONFIGURE_ARGS+=--enable-flarq MAN1+= flarq.1 PLIST_SUB+= FLARQ="" .else CONFIGURE_ARGS+=--disable-flarq PLIST_SUB+= FLARQ="@comment " .endif PLIST_SUB+= XMLRPC="" .if ${PORT_OPTIONS:MOSS} CONFIGURE_ARGS+=--enable-oss .else CONFIGURE_ARGS+=--disable-oss .endif .if ${PORT_OPTIONS:MSNDFILE} CONFIGURE_ARGS+=--with-sndfile LIB_DEPENDS+= libsndfile.so:${PORTSDIR}/audio/libsndfile .else CONFIGURE_ARGS+=--without-sndfile .endif .if ${PORT_OPTIONS:MPORTAUDIO} CONFIGURE_ARGS+=--with-portaudio BUILD_DEPENDS+= ${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2 RUN_DEPENDS+= ${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2 .else CONFIGURE_ARGS+=--without-portaudio .endif .if ${PORT_OPTIONS:MPULSEAUDIO} CONFIGURE_ARGS+=--with-pulseaudio LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio .else CONFIGURE_ARGS+=--without-pulseaudio .endif .if ${PORT_OPTIONS:MHAMLIB} CONFIGURE_ARGS+=--with-hamlib LIB_DEPENDS+= libhamlib.so:${PORTSDIR}/comms/hamlib .else CONFIGURE_ARGS+=--without-hamlib .endif .if ${PORT_OPTIONS:MNLS} USES+= gettext CONFIGURE_ARGS+=--enable-nls PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif # 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 Index: head/comms/fldigi/distinfo =================================================================== --- head/comms/fldigi/distinfo (revision 385220) +++ head/comms/fldigi/distinfo (revision 385221) @@ -1,2 +1,2 @@ -SHA256 (fldigi-3.22.05.tar.gz) = 8c88a06f5c9753704458aeebfbb73166ace08e9d22ce43e01ce7d347b4147496 -SIZE (fldigi-3.22.05.tar.gz) = 2822375 +SHA256 (fldigi-3.22.08.tar.gz) = ce7d31db9d85865c9d481866667dd0f7c9cfdd848c55cf2ea0d7c59772e3b887 +SIZE (fldigi-3.22.08.tar.gz) = 2876959 Index: head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp =================================================================== --- head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp (revision 385220) +++ head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/xmlrpcpp/XmlRpcServer.cpp.orig 2014-03-21 11:25:57.000000000 -0500 -+++ src/xmlrpcpp/XmlRpcServer.cpp 2014-03-21 18:21:06.000000000 -0500 -@@ -500,7 +500,7 @@ - "Content-length: "; - - char buffLen[40]; -- sprintf(buffLen,"%"PRIuSZ"\r\n\r\n", body.size()); -+ sprintf(buffLen,"%" PRIuSZ "\r\n\r\n", body.size()); - - return header + buffLen; - } Property changes on: head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp ___________________________________________________________________ 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_xmlrpcpp_base64.h =================================================================== --- head/comms/fldigi/files/patch-src_xmlrpcpp_base64.h (revision 385220) +++ head/comms/fldigi/files/patch-src_xmlrpcpp_base64.h (nonexistent) @@ -1,8 +0,0 @@ ---- src/xmlrpcpp/base64.h.orig 2014-03-21 11:25:57.000000000 -0500 -+++ src/xmlrpcpp/base64.h 2014-03-21 18:21:09.000000000 -0500 -@@ -1,4 +1,4 @@ --// base64.hpp -+#include - // Autor Konstantin Pilipchuk - // mailto:lostd@ukr.net - // ---------------------------------------------------------------------------- Property changes on: head/comms/fldigi/files/patch-src_xmlrpcpp_base64.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ 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_xmlrpcpp_XmlRpcClient.cpp =================================================================== --- head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcClient.cpp (revision 385220) +++ head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcClient.cpp (nonexistent) @@ -1,19 +0,0 @@ ---- src/xmlrpcpp/XmlRpcClient.cpp.orig 2014-03-21 11:25:57.000000000 -0500 -+++ src/xmlrpcpp/XmlRpcClient.cpp 2014-03-21 18:21:01.000000000 -0500 -@@ -22,6 +22,7 @@ - // ---------------------------------------------------------------------------- - - #include -+#include - - #include "XmlRpcClient.h" - -@@ -338,7 +339,7 @@ - - header += "Content-Type: text/xml\r\nContent-length: "; - -- sprintf(buff,"%"PRIuSZ"\r\n\r\n", body.size()); -+ sprintf(buff,"%" PRIuSZ "\r\n\r\n", body.size()); - - return header + buff; - } Property changes on: head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcClient.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ 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_xmrpcpp_XmlRpcBase64.h =================================================================== --- head/comms/fldigi/files/patch-src_xmrpcpp_XmlRpcBase64.h (nonexistent) +++ head/comms/fldigi/files/patch-src_xmrpcpp_XmlRpcBase64.h (revision 385221) @@ -0,0 +1,10 @@ +--- src/xmlrpcpp/XmlRpcBase64.h.orig 2015-04-27 22:16:11.000000000 -0700 ++++ src/xmlrpcpp/XmlRpcBase64.h 2015-04-27 22:16:22.000000000 -0700 +@@ -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_xmrpcpp_XmlRpcBase64.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ 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/pkg-plist =================================================================== --- head/comms/fldigi/pkg-plist (revision 385220) +++ head/comms/fldigi/pkg-plist (revision 385221) @@ -1,22 +1,20 @@ %%FLARQ%%bin/flarq bin/fldigi %%FLARQ%%man/man1/flarq.1.gz -man/man1/fldigi-shell.1.gz man/man1/fldigi.1.gz -bin/fldigi-shell %%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 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