Index: branches/2017Q3/x11-toolkits/termit/Makefile =================================================================== --- branches/2017Q3/x11-toolkits/termit/Makefile (revision 445984) +++ branches/2017Q3/x11-toolkits/termit/Makefile (revision 445985) @@ -1,51 +1,43 @@ -# Created by: chinsan # $FreeBSD$ PORTNAME= termit PORTVERSION= 3.0 DISTVERSIONPREFIX= ${PORTNAME}- +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome -MAINTAINER= ports@FreeBSD.org +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 USE_GITHUB= yes GH_ACCOUNT= nonstop USES= cmake lua pkgconfig USE_XORG= x11 USE_GNOME= cairo gdkpixbuf2 gtk30 vte3 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-patch: - @${REINPLACE_CMD} 's|share/man|man|; s|../COPYING||' \ - ${WRKSRC}/doc/CMakeLists.txt - @${REINPLACE_CMD} 's|OpenBSD|${OPSYS}|; s|lua52|lua-${LUA_VER}|' \ - ${WRKSRC}/src/CMakeLists.txt - @${REINPLACE_CMD} 's|ADD_SUBDIRECTORY(etc)||' ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} 's|/etc|${PREFIX}/etc|' ${WRKSRC}/src/lua_conf.c 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: branches/2017Q3/x11-toolkits/termit/distinfo =================================================================== --- branches/2017Q3/x11-toolkits/termit/distinfo (revision 445984) +++ branches/2017Q3/x11-toolkits/termit/distinfo (revision 445985) @@ -1,3 +1,3 @@ -TIMESTAMP = 1493220356 +TIMESTAMP = 1496271624 SHA256 (nonstop-termit-termit-3.0_GH0.tar.gz) = 8c3af8e427aeec42ef19256d2d572c8623c5ae8f2f43494f29b5d3a3cbd1dd5f SIZE (nonstop-termit-termit-3.0_GH0.tar.gz) = 137127 Index: branches/2017Q3/x11-toolkits/termit/files/patch-CMakeLists.txt =================================================================== --- branches/2017Q3/x11-toolkits/termit/files/patch-CMakeLists.txt (nonexistent) +++ branches/2017Q3/x11-toolkits/termit/files/patch-CMakeLists.txt (revision 445985) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2016-07-12 17:38:44 UTC ++++ CMakeLists.txt +@@ -60,7 +60,7 @@ IF(ENABLE_NLS) + ADD_SUBDIRECTORY(po) + ENDIF(ENABLE_NLS) + ADD_SUBDIRECTORY(utils) +-ADD_SUBDIRECTORY(etc) ++ + + MESSAGE("\n termit ${TERMIT_PACKAGE_VERSION}\n") + MESSAGE("Prefix dir:.......... ${CMAKE_INSTALL_PREFIX}") Property changes on: branches/2017Q3/x11-toolkits/termit/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q3/x11-toolkits/termit/files/patch-doc_CMakeLists.txt =================================================================== --- branches/2017Q3/x11-toolkits/termit/files/patch-doc_CMakeLists.txt (nonexistent) +++ branches/2017Q3/x11-toolkits/termit/files/patch-doc_CMakeLists.txt (revision 445985) @@ -0,0 +1,15 @@ +--- doc/CMakeLists.txt.orig 2016-07-12 17:38:44 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) + Property changes on: branches/2017Q3/x11-toolkits/termit/files/patch-doc_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q3/x11-toolkits/termit/files/patch-doc_termit.1 =================================================================== --- branches/2017Q3/x11-toolkits/termit/files/patch-doc_termit.1 (nonexistent) +++ branches/2017Q3/x11-toolkits/termit/files/patch-doc_termit.1 (revision 445985) @@ -0,0 +1,26 @@ +--- doc/termit.1.orig 2016-07-12 17:38:44 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 + .SH AUTHOR + Evgeny Ratnikov + .SH "SEE ALSO" +-.BR lua (1) ++.BR lua52 (1) Property changes on: branches/2017Q3/x11-toolkits/termit/files/patch-doc_termit.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q3/x11-toolkits/termit/files/patch-src_CMakeLists.txt =================================================================== --- branches/2017Q3/x11-toolkits/termit/files/patch-src_CMakeLists.txt (nonexistent) +++ branches/2017Q3/x11-toolkits/termit/files/patch-src_CMakeLists.txt (revision 445985) @@ -0,0 +1,45 @@ +--- src/CMakeLists.txt.orig 2016-07-12 17:38:44 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) +- ELSE(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") ++ IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") ++ pkg_search_module(LUA REQUIRED lua53 lua-5.2) ++ ELSE(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + pkg_search_module(LUA REQUIRED lua>=5.2 lua5.3 lua5.2) +- 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}) +@@ -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 + + ADD_EXECUTABLE(${TARGET} ${TERMIT_SRCS}) + +-IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") ++IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + SET(TERMIT_LDFLAGS"-llua5.2") +-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) Property changes on: branches/2017Q3/x11-toolkits/termit/files/patch-src_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q3/x11-toolkits/termit/files/patch-src_lua__conf.c =================================================================== --- branches/2017Q3/x11-toolkits/termit/files/patch-src_lua__conf.c (nonexistent) +++ branches/2017Q3/x11-toolkits/termit/files/patch-src_lua__conf.c (revision 445985) @@ -0,0 +1,14 @@ +--- src/lua_conf.c.orig 2016-07-12 17:38:44 UTC ++++ src/lua_conf.c +@@ -340,9 +340,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); Property changes on: branches/2017Q3/x11-toolkits/termit/files/patch-src_lua__conf.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q3 =================================================================== --- branches/2017Q3 (revision 445984) +++ branches/2017Q3 (revision 445985) Property changes on: branches/2017Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r445874