diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index 06750661b37f..d36f51422fde 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -1,70 +1,62 @@
 PORTNAME=	fldigi
 DISTVERSION=	4.2.04
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/fldigi/${PORTNAME} \
 		http://www.w1hkj.com/files/fldigi/
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Digital decoder for psk, cw, psk31, olivia
 WWW=		http://www.w1hkj.com
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 		docbook-xsl>=1.0:textproc/docbook-xsl \
 		xsltproc:textproc/libxslt
-LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
-		libfltk.so:x11-toolkits/fltk \
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libpng.so:graphics/png \
 		libportaudio.so:audio/portaudio \
 		libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile \
 		libudev.so:devel/libudev-devd
 
 USES=		autoreconf compiler:c++11-lib desktop-file-utils gmake jpeg \
 		perl5 pkgconfig shebangfix xorg
+USE_XORG=	x11 xcursor xext xfixes xft xinerama xrender
 
 USE_CXXSTD=	gnu++0x
 GNU_CONFIGURE=	yes
-USE_XORG=	x11 xcursor xext xfixes xft xinerama xrender
+
 CONFIGURE_ENV=	EXTRA_LIBS="-lexecinfo" \
 		FLTK_CONFIG="${LOCALBASE}/bin/fltk-config"
+CONFIGURE_ARGS=	--with-asciidoc \
+		--with-sndfile \
+		--enable-optimizations=none
 
 OPTIONS_DEFINE=	DOCS FLARQ HAMLIB NLS OSS PULSEAUDIO
+OPTIONS_DEFAULT=FLARQ HAMLIB OSS
+OPTIONS_SUB=	yes
 
-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 HAMLIB OSS
-OPTIONS_SUB=		yes
+FLARQ_DESC=	Compile flarq
+HAMLIB_DESC=	Support rig control via hamlib
 
-NATIVE_OPT_CONFIGURE_ON=	--enable-optimizations=native
-NATIVE_OPT_CONFIGURE_OFF=	--enable-optimizations=none
 FLARQ_CONFIGURE_ENABLE=		flarq
+HAMLIB_LIB_DEPENDS=		libhamlib.so:comms/hamlib
+HAMLIB_CONFIGURE_WITH=		hamlib
 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
+PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
 NLS_USES=			gettext
-
-# Always need asciidoc for man pages
-CONFIGURE_ARGS+=	--with-asciidoc
-# Always need soundfile
-CONFIGURE_ARGS+=	--with-sndfile
+NLS_CONFIGURE_ENABLE=		nls
 
 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>
diff --git a/comms/fldigi/pkg-plist b/comms/fldigi/pkg-plist
index 745e5a8d0c37..8ffef82afd60 100644
--- a/comms/fldigi/pkg-plist
+++ b/comms/fldigi/pkg-plist
@@ -1,22 +1,23 @@
 %%FLARQ%%bin/flarq
 bin/fldigi
 %%FLARQ%%man/man1/flarq.1.gz
 man/man1/fldigi.1.gz
 %%FLARQ%%share/applications/flarq.desktop
 share/applications/fldigi.desktop
+%%NLS%%share/locale/ca/LC_MESSAGES/fldigi.mo
 %%NLS%%share/locale/de/LC_MESSAGES/fldigi.mo
 %%NLS%%share/locale/el/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
 %%NLS%%share/locale/ru/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