From owner-svn-ports-head@freebsd.org Sat Jul 15 13:54:35 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AB570AFAC46; Sat, 15 Jul 2017 13:54:35 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7BD0470F39; Sat, 15 Jul 2017 13:54:35 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6FDsYQO075370; Sat, 15 Jul 2017 13:54:34 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6FDsXgc075363; Sat, 15 Jul 2017 13:54:33 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201707151354.v6FDsXgc075363@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 15 Jul 2017 13:54:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445874 - in head/x11-toolkits/termit: . files X-SVN-Group: ports-head X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in head/x11-toolkits/termit: . files X-SVN-Commit-Revision: 445874 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Jul 2017 13:54:35 -0000 Author: riggs Date: Sat Jul 15 13:54:33 2017 New Revision: 445874 URL: https://svnweb.freebsd.org/changeset/ports/445874 Log: General port cleanup; new maintainer: bob@eager.cx PR: 219697 Submitted by: bob@eager.cx (maintainer) MFH: 2017Q3 Added: head/x11-toolkits/termit/files/ head/x11-toolkits/termit/files/patch-CMakeLists.txt (contents, props changed) head/x11-toolkits/termit/files/patch-doc_CMakeLists.txt (contents, props changed) head/x11-toolkits/termit/files/patch-doc_termit.1 (contents, props changed) head/x11-toolkits/termit/files/patch-src_CMakeLists.txt (contents, props changed) head/x11-toolkits/termit/files/patch-src_lua__conf.c (contents, props changed) Modified: head/x11-toolkits/termit/Makefile head/x11-toolkits/termit/distinfo Modified: head/x11-toolkits/termit/Makefile ============================================================================== --- head/x11-toolkits/termit/Makefile Sat Jul 15 13:08:41 2017 (r445873) +++ head/x11-toolkits/termit/Makefile Sat Jul 15 13:54:33 2017 (r445874) @@ -1,12 +1,12 @@ -# 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 @@ -33,14 +33,6 @@ 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} Modified: head/x11-toolkits/termit/distinfo ============================================================================== --- head/x11-toolkits/termit/distinfo Sat Jul 15 13:08:41 2017 (r445873) +++ head/x11-toolkits/termit/distinfo Sat Jul 15 13:54:33 2017 (r445874) @@ -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 Added: head/x11-toolkits/termit/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/termit/files/patch-CMakeLists.txt Sat Jul 15 13:54:33 2017 (r445874) @@ -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}") Added: head/x11-toolkits/termit/files/patch-doc_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/termit/files/patch-doc_CMakeLists.txt Sat Jul 15 13:54:33 2017 (r445874) @@ -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) + Added: head/x11-toolkits/termit/files/patch-doc_termit.1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/termit/files/patch-doc_termit.1 Sat Jul 15 13:54:33 2017 (r445874) @@ -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) Added: head/x11-toolkits/termit/files/patch-src_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/termit/files/patch-src_CMakeLists.txt Sat Jul 15 13:54:33 2017 (r445874) @@ -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) Added: head/x11-toolkits/termit/files/patch-src_lua__conf.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/termit/files/patch-src_lua__conf.c Sat Jul 15 13:54:33 2017 (r445874) @@ -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);