Index: head/comms/fldigi/Makefile
===================================================================
--- head/comms/fldigi/Makefile	(revision 444324)
+++ head/comms/fldigi/Makefile	(revision 444325)
@@ -1,69 +1,67 @@
 # $FreeBSD$
 
 PORTNAME=	fldigi
-PORTVERSION=	4.0.4
+PORTVERSION=	4.0.5
 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\
 		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
 GNU_CONFIGURE=	yes
 USES=		autoreconf 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
+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
 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
 
 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 <bsd.port.mk>
Index: head/comms/fldigi/distinfo
===================================================================
--- head/comms/fldigi/distinfo	(revision 444324)
+++ head/comms/fldigi/distinfo	(revision 444325)
@@ -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
Index: head/comms/fldigi/files/patch-src_misc_newinstall.cxx
===================================================================
--- head/comms/fldigi/files/patch-src_misc_newinstall.cxx	(revision 444324)
+++ head/comms/fldigi/files/patch-src_misc_newinstall.cxx	(revision 444325)
@@ -1,20 +1,20 @@
---- 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
  
  label[4] = "SK @||";
  text[4] = "\n\
 -tnx fer QSO <NAME>, 73, God bless.\n\
 +tnx fer QSO <NAME>, 73.\n\
  <ZDT> <CALL> de <MYCALL> sk\n\
  <RX>";
  
 @@ -84,7 +84,7 @@ Age:   \n\
  Rig:   \n\
  Pwr:   \n\
  Ant:   \n\
 -OS:    Linux\n\
 +OS:    FreeBSD\n\
  Soft:  <VER>\n\
  Web:   \n\
  Email: ";