Index: head/comms/fldigi/Makefile =================================================================== --- head/comms/fldigi/Makefile (revision 500573) +++ head/comms/fldigi/Makefile (revision 500574) @@ -1,68 +1,68 @@ # $FreeBSD$ PORTNAME= fldigi -PORTVERSION= 4.1.02 +PORTVERSION= 4.1.03 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 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 Index: head/comms/fldigi/distinfo =================================================================== --- head/comms/fldigi/distinfo (revision 500573) +++ head/comms/fldigi/distinfo (revision 500574) @@ -1,3 +1,3 @@ -TIMESTAMP = 1555660048 -SHA256 (fldigi-4.1.02.tar.gz) = ed5320619594911e8b7a887a8a098ee2b08bd25a594cd0e7be8c5834ea99d224 -SIZE (fldigi-4.1.02.tar.gz) = 4681621 +TIMESTAMP = 1555867447 +SHA256 (fldigi-4.1.03.tar.gz) = 37d9404cd02ad0497fb369ab73ade4f6330e1f82bfce908c4fe89f21642775b4 +SIZE (fldigi-4.1.03.tar.gz) = 4682813 Property changes on: head/comms/fldigi/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ 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 500573) +++ head/comms/fldigi/files/patch-src_misc_newinstall.cxx (revision 500574) @@ -1,20 +1,11 @@ ---- src/misc/newinstall.cxx.orig 2018-02-24 13:42:49 UTC +--- src/misc/newinstall.cxx.orig 2019-04-18 20:27:04 UTC +++ src/misc/newinstall.cxx @@ -67,7 +67,7 @@ text[3] = " btu de k\n\ label[4] = "SK @||"; text[4] = "\n\ -tnx fer QSO , 73, God bless.\n\ +tnx fer QSO , 73.\n\ de sk\n\ "; -@@ -84,7 +84,7 @@ Age: \n\ - Rig: \n\ - Pwr: \n\ - Ant: \n\ --OS: Linux\n\ -+OS: FreeBSD\n\ - Soft: \n\ - Web: \n\ - Email: "; Index: head/comms/fldigi/files/patch-src_soundcard_soundconf.cxx =================================================================== --- head/comms/fldigi/files/patch-src_soundcard_soundconf.cxx (revision 500573) +++ head/comms/fldigi/files/patch-src_soundcard_soundconf.cxx (revision 500574) @@ -1,49 +1,49 @@ ---- src/soundcard/soundconf.cxx.orig 2019-04-19 08:05:01 UTC +--- src/soundcard/soundconf.cxx.orig 2019-03-18 15:12:35 UTC +++ src/soundcard/soundconf.cxx -@@ -53,6 +53,11 @@ double std_sample_rates[] = { 8000.0, 96 +@@ -53,6 +53,11 @@ double std_sample_rates[] = { 8000.0, 9600.0, 11025.0, 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 ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property