7 files changed, 24 insertions, 23 deletions

diff --git a/x11-toolkits/termit/Makefile b/x11-toolkits/termit/Makefile
index 939b3691075c..cbfc4ab7c1df 100644
--- a/x11-toolkits/termit/Makefile
+++ b/x11-toolkits/termit/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	termit
-PORTVERSION=	3.0
+PORTVERSION=	3.1
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	2
 CATEGORIES=	x11-toolkits gnome
 
 MAINTAINER=	bob@eager.cx
@@ -15,12 +14,14 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
 		libgnutls.so:security/gnutls
 
+USES=		cmake gnome lua:53+ pkgconfig xorg
+USE_XORG=	x11
+USE_GNOME=	cairo gdkpixbuf2 gtk30 vte3
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	nonstop
 
-USES=		cmake gnome lua pkgconfig xorg
-USE_XORG=	x11
-USE_GNOME=	cairo gdkpixbuf2 gtk30 vte3
+SUB_FILES=	pkg-message
 
 CPPFLAGS+=	-I${LOCALBASE}/include/vte-0.0
 
diff --git a/x11-toolkits/termit/distinfo b/x11-toolkits/termit/distinfo
index 7903019363df..0274fd418eb0 100644
--- a/x11-toolkits/termit/distinfo
+++ b/x11-toolkits/termit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496271624
-SHA256 (nonstop-termit-termit-3.0_GH0.tar.gz) = 8c3af8e427aeec42ef19256d2d572c8623c5ae8f2f43494f29b5d3a3cbd1dd5f
-SIZE (nonstop-termit-termit-3.0_GH0.tar.gz) = 137127
+TIMESTAMP = 1582048205
+SHA256 (nonstop-termit-termit-3.1_GH0.tar.gz) = d899930f60d8adef57c24d326f6e561fd68578eada5bd54ba6e44b3edc1e4a4e
+SIZE (nonstop-termit-termit-3.1_GH0.tar.gz) = 137773
diff --git a/x11-toolkits/termit/files/patch-doc_CMakeLists.txt b/x11-toolkits/termit/files/patch-doc_CMakeLists.txt
index 10c3e7f6580c..c955577b4acb 100644
--- a/x11-toolkits/termit/files/patch-doc_CMakeLists.txt
+++ b/x11-toolkits/termit/files/patch-doc_CMakeLists.txt
@@ -1,4 +1,4 @@
---- doc/CMakeLists.txt.orig	2016-07-12 17:38:44 UTC
+--- doc/CMakeLists.txt.orig	2020-02-17 06:02:21 UTC
 +++ doc/CMakeLists.txt
 @@ -13,10 +13,10 @@
  # You should have received a copy of the GNU General Public License
@@ -11,5 +11,5 @@
 -INSTALL(FILES termit.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
 +INSTALL(FILES termit.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
  INSTALL(FILES termit.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
- INSTALL(FILES termit.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata)
+ INSTALL(FILES termit.metainfo.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
  
diff --git a/x11-toolkits/termit/files/patch-doc_termit.1 b/x11-toolkits/termit/files/patch-doc_termit.1
index b3bbba35bcd7..b1152d7a0c4a 100644
--- a/x11-toolkits/termit/files/patch-doc_termit.1
+++ b/x11-toolkits/termit/files/patch-doc_termit.1
@@ -1,4 +1,4 @@
---- doc/termit.1.orig	2016-07-12 17:38:44 UTC
+--- doc/termit.1.orig	2020-02-17 06:02:21 UTC
 +++ doc/termit.1
 @@ -1,7 +1,7 @@
  .\" Process this file with
@@ -18,9 +18,9 @@
  .RS
  Example rc.lua file. Demonstrates usage of almost all available settings.
  .SH "TERMIT LUA API"
-@@ -433,4 +433,4 @@ In options table 'tabs' field should be 
+@@ -435,4 +435,4 @@ In options table 'tabs' field should be the last one. 
  .SH AUTHOR
  Evgeny Ratnikov <ratnikov.ev at gmail dot com>
  .SH "SEE ALSO"
 -.BR lua (1)
-+.BR lua52 (1)
++.BR lua53 (1)
diff --git a/x11-toolkits/termit/files/patch-src_CMakeLists.txt b/x11-toolkits/termit/files/patch-src_CMakeLists.txt
index 5d7ef4cb60d7..cab42af83c90 100644
--- a/x11-toolkits/termit/files/patch-src_CMakeLists.txt
+++ b/x11-toolkits/termit/files/patch-src_CMakeLists.txt
@@ -1,21 +1,21 @@
---- src/CMakeLists.txt.orig	2016-07-12 17:38:44 UTC
+--- src/CMakeLists.txt.orig	2020-02-17 06:02:21 UTC
 +++ src/CMakeLists.txt
 @@ -27,11 +27,11 @@ ENDIF(NOT VTE_FOUND)
  
  SET(LUA_VERSION "" CACHE STRING "Lua version")
  IF(LUA_VERSION STREQUAL "")
 -    IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
--       pkg_search_module(LUA REQUIRED lua53 lua52)
+-       pkg_search_module(LUA REQUIRED lua53)
 -    ELSE(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
 +    IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+       pkg_search_module(LUA REQUIRED lua53 lua-5.2)
++       pkg_search_module(LUA REQUIRED lua>=5.3 lua-5.3)
 +    ELSE(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-        pkg_search_module(LUA REQUIRED lua>=5.2 lua5.3 lua5.2)
+        pkg_search_module(LUA REQUIRED lua>=5.3 lua5.3)
 -    ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
 +    ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
  ELSE(LUA_VERSION STREQUAL "")
    pkg_search_module(LUA REQUIRED
-     lua=${LUA_VERSION} lua5.3=${LUA_VERSION} lua5.2=${LUA_VERSION})
+     lua=${LUA_VERSION} lua5.3=${LUA_VERSION})
 @@ -43,9 +43,9 @@ ENDIF(NOT LUA_FOUND)
  INCLUDE(Sources.cmake)
  
@@ -28,13 +28,13 @@
  FOREACH(cflag ${VTE_CFLAGS} ${GTK_CFLAGS} ${LUA_CFLAGS})
    SET(TERMIT_CFLAGS "${TERMIT_CFLAGS} ${cflag}")
  ENDFOREACH(cflag)
-@@ -64,11 +64,11 @@ SET_SOURCE_FILES_PROPERTIES(${TERMIT_SRC
+@@ -64,11 +64,11 @@ SET_SOURCE_FILES_PROPERTIES(${TERMIT_SRCS} PROPERTIES 
  
  ADD_EXECUTABLE(${TARGET} ${TERMIT_SRCS})
  
 -IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
 +IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-     SET(TERMIT_LDFLAGS"-llua5.2")
+     SET(TERMIT_LDFLAGS"-llua5.3")
 -ELSE(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
 +ELSE(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
      SET(TERMIT_LDFLAGS "-ldl -lm")
diff --git a/x11-toolkits/termit/files/patch-src_lua__conf.c b/x11-toolkits/termit/files/patch-src_lua__conf.c
index 459a26221c02..51293de8c5e8 100644
--- a/x11-toolkits/termit/files/patch-src_lua__conf.c
+++ b/x11-toolkits/termit/files/patch-src_lua__conf.c
@@ -1,6 +1,6 @@
---- src/lua_conf.c.orig	2016-07-12 17:38:44 UTC
+--- src/lua_conf.c.orig	2020-02-17 06:02:21 UTC
 +++ src/lua_conf.c
-@@ -340,9 +340,9 @@ static gchar** termit_system_path()
+@@ -344,9 +344,9 @@ static gchar** termit_system_path()
      const gchar *configSystem = g_getenv("XDG_CONFIG_DIRS");
      gchar* xdgConfigDirs = NULL;
      if (configSystem) {
diff --git a/x11-toolkits/termit/pkg-plist b/x11-toolkits/termit/pkg-plist
index 2808b70dfd0d..35228936e4d6 100644
--- a/x11-toolkits/termit/pkg-plist
+++ b/x11-toolkits/termit/pkg-plist
@@ -3,8 +3,8 @@ bin/termit
 @sample etc/xdg/termit/rc.lua.sample
 @sample etc/xdg/termit/utils.lua.sample
 man/man1/termit.1.gz
-share/appdata/termit.appdata.xml
 share/applications/termit.desktop
+share/metainfo/termit.metainfo.xml
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/lua_api.txt
 %%PORTDOCS%%%%DOCSDIR%%/rc.lua.example