Index: head/misc/lxi-tools/Makefile =================================================================== --- head/misc/lxi-tools/Makefile (revision 469256) +++ head/misc/lxi-tools/Makefile (revision 469257) @@ -1,50 +1,51 @@ # $FreeBSD$ PORTNAME= lxi-tools DISTVERSIONPREFIX= v -DISTVERSION= 1.19 +DISTVERSION= 1.20 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 lua:52 pkgconfig readline USE_GITHUB= yes GH_ACCOUNT= lxi-tools GNU_CONFIGURE= yes 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 \ + etc/bash_completion.d/lxi.snap \ man/man1/lxi.1.gz OPTIONS_DEFINE= DOCS 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 Index: head/misc/lxi-tools/distinfo =================================================================== --- head/misc/lxi-tools/distinfo (revision 469256) +++ head/misc/lxi-tools/distinfo (revision 469257) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521105966 -SHA256 (lxi-tools-lxi-tools-v1.19_GH0.tar.gz) = 80d6d2cd9750a6aa03051c8e79345b19294fa022efc8572cc3439826598d5d96 -SIZE (lxi-tools-lxi-tools-v1.19_GH0.tar.gz) = 147651 +TIMESTAMP = 1525622668 +SHA256 (lxi-tools-lxi-tools-v1.20_GH0.tar.gz) = 68fd34023c917f09f862a5b587ab1081e03c4f3d72b3b5f33c795c5f97c3374d +SIZE (lxi-tools-lxi-tools-v1.20_GH0.tar.gz) = 148802 Index: head/misc/lxi-tools/files/patch-configure.ac =================================================================== --- head/misc/lxi-tools/files/patch-configure.ac (revision 469256) +++ head/misc/lxi-tools/files/patch-configure.ac (revision 469257) @@ -1,11 +1,15 @@ ---- configure.ac.orig 2018-03-14 20:22:39 UTC +--- configure.ac.orig 2018-05-06 16:07:56 UTC +++ configure.ac -@@ -15,7 +15,7 @@ AC_CHECK_LIB([readline], [readline], [], - AC_CHECK_LIB([lxi], [lxi_connect], [], [AC_MSG_ERROR(liblxi not found)]) +@@ -16,9 +16,9 @@ AC_CHECK_LIB([lxi], [lxi_connect], [], [ - # Check for Lua 5.2 --PKG_CHECK_MODULES([lua], [lua5.2]) -+PKG_CHECK_MODULES([lua], [lua-5.2]) - - # Handle bash completion - AC_ARG_WITH([bash-completion-dir], + # Check for Lua 5.1 or newer + lua_found=0 +-PKG_CHECK_MODULES([lua], [lua5.3],[lua_found=1],[x=0]) +-PKG_CHECK_MODULES([lua], [lua5.2],[lua_found=1],[x=0]) +-PKG_CHECK_MODULES([lua], [lua5.1],[lua_found=1],[x=0]) ++PKG_CHECK_MODULES([lua], [lua-5.3],[lua_found=1],[x=0]) ++PKG_CHECK_MODULES([lua], [lua-5.2],[lua_found=1],[x=0]) ++PKG_CHECK_MODULES([lua], [lua-5.1],[lua_found=1],[x=0]) + PKG_CHECK_MODULES([lua], [lua >= 5.1],[lua_found=1],[x=0]) + if test $lua_found == 0 + then