Index: head/x11-toolkits/termit/Makefile =================================================================== --- head/x11-toolkits/termit/Makefile (revision 526935) +++ head/x11-toolkits/termit/Makefile (revision 526936) @@ -1,43 +1,44 @@ # $FreeBSD$ PORTNAME= termit -PORTVERSION= 3.0 +PORTVERSION= 3.1 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 2 CATEGORIES= x11-toolkits gnome MAINTAINER= bob@eager.cx COMMENT= Small terminal emulator with Lua scripting LICENSE= GPLv3 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 TERMIT_ETC= ${STAGEDIR}${PREFIX}/etc/xdg/${PORTNAME} OPTIONS_DEFINE= DEBUG DOCS NLS OPTIONS_SUB= yes DEBUG_CMAKE_ON= -DDEBUG:BOOL=YES NLS_CMAKE_OFF= -DENABLE_NLS:BOOL=NO NLS_USES= gettext post-install: @${MKDIR} ${TERMIT_ETC} .for file in colormaps.lua rc.lua utils.lua ${CP} ${WRKSRC}/etc/termit/${file} ${TERMIT_ETC}/${file}.sample .endfor .include Index: head/x11-toolkits/termit/distinfo =================================================================== --- head/x11-toolkits/termit/distinfo (revision 526935) +++ head/x11-toolkits/termit/distinfo (revision 526936) @@ -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 Index: head/x11-toolkits/termit/files/patch-doc_CMakeLists.txt =================================================================== --- head/x11-toolkits/termit/files/patch-doc_CMakeLists.txt (revision 526935) +++ head/x11-toolkits/termit/files/patch-doc_CMakeLists.txt (revision 526936) @@ -1,15 +1,15 @@ ---- 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 # along with this program. If not, see . -SET(TERMIT_DOCS ../COPYING README lua_api.txt rc.lua.example) +SET(TERMIT_DOCS README lua_api.txt rc.lua.example) INSTALL(FILES ${TERMIT_DOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/${TERMIT_PACKAGE}) -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) Index: head/x11-toolkits/termit/files/patch-doc_termit.1 =================================================================== --- head/x11-toolkits/termit/files/patch-doc_termit.1 (revision 526935) +++ head/x11-toolkits/termit/files/patch-doc_termit.1 (revision 526936) @@ -1,26 +1,26 @@ ---- 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 .\" groff -man -Tascii foo.1 .\" -.TH TERMIT 1 "NOV 2008" Linux "User Manuals" +.TH TERMIT 1 "NOV 2008" FreeBSD "User Manuals" .SH NAME termit \(hy lightweight terminal emulator .SH SYNOPSIS @@ -89,7 +89,7 @@ Per user configuration file. See section .BR "TERMIT LUA API" for further details. .RE -.I /usr/share/doc/termit/rc.lua.example +.I /usr/local/share/doc/termit/rc.lua.example .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 .SH "SEE ALSO" -.BR lua (1) -+.BR lua52 (1) ++.BR lua53 (1) Index: head/x11-toolkits/termit/files/patch-src_CMakeLists.txt =================================================================== --- head/x11-toolkits/termit/files/patch-src_CMakeLists.txt (revision 526935) +++ head/x11-toolkits/termit/files/patch-src_CMakeLists.txt (revision 526936) @@ -1,45 +1,45 @@ ---- 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) SET(TERMIT_CFLAGS "-I${LUA_INCLUDE_DIR}") -IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") +IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") SET(TERMIT_CFLAGS "${TERMIT_CFLAGS} -I/usr/local/include") -ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") +ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") 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") -ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") +ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") FOREACH(ldflag ${VTE_LDFLAGS} ${LUA_LDFLAGS}) LIST(APPEND TERMIT_LDFLAGS "${ldflag}") ENDFOREACH(ldflag) Index: head/x11-toolkits/termit/files/patch-src_lua__conf.c =================================================================== --- head/x11-toolkits/termit/files/patch-src_lua__conf.c (revision 526935) +++ head/x11-toolkits/termit/files/patch-src_lua__conf.c (revision 526936) @@ -1,14 +1,14 @@ ---- 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) { - xdgConfigDirs = g_strdup_printf("%s:/etc/xdg", configSystem); + xdgConfigDirs = g_strdup_printf("%s:/usr/local/etc/xdg", configSystem); } else { - xdgConfigDirs = g_strdup("/etc/xdg"); + xdgConfigDirs = g_strdup("/usr/local/etc/xdg"); } gchar** systemPaths = g_strsplit(xdgConfigDirs, ":", 0); g_free(xdgConfigDirs); Index: head/x11-toolkits/termit/pkg-plist =================================================================== --- head/x11-toolkits/termit/pkg-plist (revision 526935) +++ head/x11-toolkits/termit/pkg-plist (revision 526936) @@ -1,20 +1,20 @@ bin/termit @sample etc/xdg/termit/colormaps.lua.sample @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 %%NLS%%share/locale/de/LC_MESSAGES/termit.mo %%NLS%%share/locale/es/LC_MESSAGES/termit.mo %%NLS%%share/locale/fr/LC_MESSAGES/termit.mo %%NLS%%share/locale/hu/LC_MESSAGES/termit.mo %%NLS%%share/locale/ja/LC_MESSAGES/termit.mo %%NLS%%share/locale/ko/LC_MESSAGES/termit.mo %%NLS%%share/locale/pl/LC_MESSAGES/termit.mo %%NLS%%share/locale/ru/LC_MESSAGES/termit.mo %%NLS%%share/locale/sv/LC_MESSAGES/termit.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/termit.mo