Index: head/misc/lxi-tools/Makefile
===================================================================
--- head/misc/lxi-tools/Makefile	(revision 461314)
+++ head/misc/lxi-tools/Makefile	(revision 461315)
@@ -1,45 +1,50 @@
 # $FreeBSD$
 
 PORTNAME=	lxi-tools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.17
+DISTVERSION=	1.18
 CATEGORIES=	misc
 
 MAINTAINER=	dg@syrec.org
 COMMENT=	Collection of tools that enables control of LXI compatible instruments
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	liblxi.so:misc/liblxi
 
 USES=		autoreconf libtool localbase pkgconfig readline
 USE_GITHUB=	yes
 GH_ACCOUNT=	lxi-tools
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-static
+CONFIGURE_ARGS=	--disable-static \
+		--with-bash-completion-dir=${PREFIX}/etc/bash_completion.d
 CFLAGS+=	-D_WITH_GETLINE # enable getline(3) prototype
 
 PORTDOCS=	README
 
 PLIST_FILES=	bin/lxi \
+		etc/bash_completion.d/lxi \
 		man/man1/lxi.1.gz
 
-OPTIONS_DEFINE=	BASH DOCS GUI
+OPTIONS_DEFINE=	DOCS GUI
 
-BASH_CONFIGURE_WITH=	bash-completion-dir=${PREFIX}/etc/bash_completion.d
-BASH_PLIST_FILES=	${PREFIX}/etc/bash_completion.d/lxi
-
-GUI_CONFIGURE_ENABLE=	lxi-gui
 GUI_USE=		qt5=core,gui,charts,widgets,buildtools_build,qmake_build gl=gl
+GUI_CONFIGURE_ENABLE=	lxi-gui
+GUI_CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${QT_LIBDIR}"
+GUI_VARS=		QT_NONSTANDARD=yes
 GUI_PLIST_FILES=	bin/lxi-gui
+
+post-patch:
+	${REINPLACE_CMD} -e '/\$$(QTCHOOSER)/s/-qt=5//' \
+		${WRKSRC}/src/gui/lxi-gui/Makefile.am
 
 post-install-GUI-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lxi-gui
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/misc/lxi-tools/distinfo
===================================================================
--- head/misc/lxi-tools/distinfo	(revision 461314)
+++ head/misc/lxi-tools/distinfo	(revision 461315)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517144469
-SHA256 (lxi-tools-lxi-tools-v1.17_GH0.tar.gz) = c9c35e4486e637533162ce559882f959d6bb044cb8ec9785c708ff15d90e7d36
-SIZE (lxi-tools-lxi-tools-v1.17_GH0.tar.gz) = 143892
+TIMESTAMP = 1518112735
+SHA256 (lxi-tools-lxi-tools-v1.18_GH0.tar.gz) = 6ed1890715a895cb9c6c1ca8f7152f16853f8c127699265218aa1d89eb301e50
+SIZE (lxi-tools-lxi-tools-v1.18_GH0.tar.gz) = 145699