Index: head/comms/fldigi/Makefile =================================================================== --- head/comms/fldigi/Makefile (revision 499333) +++ head/comms/fldigi/Makefile (revision 499334) @@ -1,76 +1,68 @@ # $FreeBSD$ PORTNAME= fldigi -PORTVERSION= 4.1.01 -PORTREVISION= 1 +PORTVERSION= 4.1.02 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\ 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 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= NATIVE_OPT FLARQ OSS SNDFILE PORTAUDIO PULSEAUDIO HAMLIB NLS DOCS +OPTIONS_DEFINE= NATIVE_OPT FLARQ OSS 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_ENABLE= sndfile -SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile -PORTAUDIO_CONFIGURE_ENABLE= portaudio -PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio -PULSEAUDIO_CONFIGURE_ENABLE= pulseaudio +PULSEAUDIO_CONFIGURE_WITH= pulseaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -HAMLIB_CONFIGURE_ENABLE= hamlib +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 -# Upstream as of 4.0.5 always uses portaudio and sndfile now -# Which makes fldigi configure options portaudio & oss useless -CONFIGURE_ARGS+=--with-portaudio --disable-oss +# 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 Index: head/comms/fldigi/distinfo =================================================================== --- head/comms/fldigi/distinfo (revision 499333) +++ head/comms/fldigi/distinfo (revision 499334) @@ -1,3 +1,3 @@ -TIMESTAMP = 1550613937 -SHA256 (fldigi-4.1.01.tar.gz) = be51ace44d01ca3fc7a5f21c15badf7063c7d7e6665a7ba9c307a39d51c0f6df -SIZE (fldigi-4.1.01.tar.gz) = 3916445 +TIMESTAMP = 1555660048 +SHA256 (fldigi-4.1.02.tar.gz) = ed5320619594911e8b7a887a8a098ee2b08bd25a594cd0e7be8c5834ea99d224 +SIZE (fldigi-4.1.02.tar.gz) = 4681621 Property changes on: head/comms/fldigi/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/fldigi/files/patch-src_soundcard_soundconf.cxx =================================================================== --- head/comms/fldigi/files/patch-src_soundcard_soundconf.cxx (nonexistent) +++ head/comms/fldigi/files/patch-src_soundcard_soundconf.cxx (revision 499334) @@ -0,0 +1,49 @@ +--- src/soundcard/soundconf.cxx.orig 2019-04-19 08:05:01 UTC ++++ src/soundcard/soundconf.cxx +@@ -53,6 +53,11 @@ double std_sample_rates[] = { 8000.0, 96 + static void init_oss(void) + { + #if USE_OSS ++#ifdef __FreeBSD__ ++ char *last = NULL; ++ char *curr = NULL; ++ char *p; ++#endif + glob_t gbuf; + glob("/dev/dsp*", 0, NULL, &gbuf); + if (gbuf.gl_pathc == 0) { +@@ -61,8 +66,33 @@ static void init_oss(void) + menuOSSDev->deactivate(); + return; + } +- for (size_t i = 0; i < gbuf.gl_pathc; i++) ++ for (size_t i = 0; i < gbuf.gl_pathc; i++) { ++#ifdef __FreeBSD__ ++ if (curr) ++ free(curr); ++ curr = strdup(gbuf.gl_pathv[i]); ++ p = strrchr(curr, '.'); ++ if (p) ++ *p = '\0'; ++ if (last != NULL) { ++ if (strcmp(last, curr) == 0) ++ continue; ++ } ++ menuOSSDev->add(curr); ++ if (last) ++ free(last); ++ last = curr; ++ curr = NULL; ++#else + menuOSSDev->add(gbuf.gl_pathv[i]); ++#endif ++ } ++#ifdef __FreeBSD__ ++ if (last) ++ free(last); ++ if (curr) ++ free(curr); ++#endif + if (progdefaults.OSSdevice.length() == 0 && gbuf.gl_pathc) + progdefaults.OSSdevice = gbuf.gl_pathv[0]; + menuOSSDev->value(progdefaults.OSSdevice.c_str()); Property changes on: head/comms/fldigi/files/patch-src_soundcard_soundconf.cxx ___________________________________________________________________ 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