svn commit: r444325 - in head/comms/fldigi: . files

[Diane Bruce]

Author: db
Date: Sun Jun 25 21:32:39 2017
New Revision: 444325
URL: https://svnweb.freebsd.org/changeset/ports/444325

Log:
  Update to fldigi 4.0.5
  
  N.B. Removal of options oss, sndfile, and portaudio as portaudio and
  sndfile is now always needed due to an upstream change.
  
  =Version 4.0.5=
  2017-06-19  David Freese  <iam_w1hkj at w1hkj.com>
  
          bc29d97: Documentation update
          6164c26: TELNET timeout
          8922c5d: FD macros
          b0928a0: N3FJP PTT
          dcca120: Rx/Tx open/close
          a49cf18: xmlrpc configuration
          36a7fce: FSQ macros
          6aaec34: Consistency check fail
          7bcd89c: Audio Alerts
          5f65d2e: Restore defaults
          a9346cd: cw variable squelch
          8460fba: INSTALL/README/NEWS
          c2c9f38: CW Extended char set
          ad8e33e: County field
          64b397f: autostart on os x
          43b37fe: Rx Context Menu
          3aea3ca: Port Audio on Linux
          f994b6a: NEWS update

Modified:
  head/comms/fldigi/Makefile
  head/comms/fldigi/distinfo
  head/comms/fldigi/files/patch-src_misc_newinstall.cxx

Modified: head/comms/fldigi/Makefile
==============================================================================
--- head/comms/fldigi/Makefile	Sun Jun 25 21:07:58 2017	(r444324)
+++ head/comms/fldigi/Makefile	Sun Jun 25 21:32:39 2017	(r444325)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	fldigi
-PORTVERSION=	4.0.4
+PORTVERSION=	4.0.5
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
@@ -17,6 +17,8 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs\
 		libpng16.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
 
 USE_CXXSTD=	gnu++0x
@@ -26,27 +28,20 @@ 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
+OPTIONS_DEFINE=	NATIVE_OPT FLARQ 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_DEFAULT=	FLARQ 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
@@ -56,6 +51,9 @@ 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
 
 post-configure:
 # force rebuild of man pages

Modified: head/comms/fldigi/distinfo
==============================================================================
--- head/comms/fldigi/distinfo	Sun Jun 25 21:07:58 2017	(r444324)
+++ head/comms/fldigi/distinfo	Sun Jun 25 21:32:39 2017	(r444325)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495496607
-SHA256 (fldigi-4.0.4.tar.gz) = 9269bdb81c154c7cb60508749bebcbd7c5396962969e58e412d616f1224ef637
-SIZE (fldigi-4.0.4.tar.gz) = 3351853
+TIMESTAMP = 1498172257
+SHA256 (fldigi-4.0.5.tar.gz) = a8a047447b50bbba638791fa2cd9fa265eea2a589a8647f1ec17fb0c284b973d
+SIZE (fldigi-4.0.5.tar.gz) = 3611622

Modified: head/comms/fldigi/files/patch-src_misc_newinstall.cxx
==============================================================================
--- head/comms/fldigi/files/patch-src_misc_newinstall.cxx	Sun Jun 25 21:07:58 2017	(r444324)
+++ head/comms/fldigi/files/patch-src_misc_newinstall.cxx	Sun Jun 25 21:32:39 2017	(r444325)
@@ -1,4 +1,4 @@
---- src/misc/newinstall.cxx.orig	2017-01-29 13:26:25 UTC
+--- src/misc/newinstall.cxx.orig	2017-05-12 11:32:10 UTC
 +++ src/misc/newinstall.cxx
 @@ -67,7 +67,7 @@ text[3] = " btu <NAME> <CALL> de <MYCALL