Attachment #183117 for bug #219697

View | Details | Raw Unified | Return to bug 219697
Collapse All | Expand All




# Created by: chinsan
# $FreeBSD: head/x11-toolkits/termit/Makefile 439491 2017-04-26 20:20:42Z pawel $

PORTNAME=	termit
PORTVERSION=	3.0
DISTVERSIONPREFIX=	${PORTNAME}-
PORTREVISION=	1
CATEGORIES=	x11-toolkits gnome

MAINTAINER=	bob@eager.cx
COMMENT=	Small terminal emulator with Lua scripting

LICENSE=	GPLv3

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

Lines 1-3 Link Here

(-)./distinfo (-1 / +1 lines)
1	TIMESTAMP = 1493220356	1	TIMESTAMP = 1496271624
2	SHA256 (nonstop-termit-termit-3.0_GH0.tar.gz) = 8c3af8e427aeec42ef19256d2d572c8623c5ae8f2f43494f29b5d3a3cbd1dd5f	2	SHA256 (nonstop-termit-termit-3.0_GH0.tar.gz) = 8c3af8e427aeec42ef19256d2d572c8623c5ae8f2f43494f29b5d3a3cbd1dd5f
3	SIZE (nonstop-termit-termit-3.0_GH0.tar.gz) = 137127	3	SIZE (nonstop-termit-termit-3.0_GH0.tar.gz) = 137127

Line 0 Link Here

(-)./files/patch-CMakeLists.txt (+11 lines)
	1	--- CMakeLists.txt.orig 2016-07-12 17:38:44 UTC
	2	+++ CMakeLists.txt
	3	@@ -60,7 +60,7 @@ IF(ENABLE_NLS)
	4	ADD_SUBDIRECTORY(po)
	5	ENDIF(ENABLE_NLS)
	6	ADD_SUBDIRECTORY(utils)
	7	-ADD_SUBDIRECTORY(etc)
	8	+
	9
	10	MESSAGE("\n termit ${TERMIT_PACKAGE_VERSION}\n")
	11	MESSAGE("Prefix dir:.......... ${CMAKE_INSTALL_PREFIX}")




--- 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 <http://www.gnu.org/licenses/>.
 
-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)
 




--- 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 <ratnikov.ev at gmail dot com>
 .SH "SEE ALSO"
-.BR lua (1)
+.BR lua52 (1)




--- 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)




--- 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);

Return to bug 219697

Lines 1-12 Link Here

(-)./Makefile (-10 / +2 lines)
1	# Created by: chinsan
2	# $FreeBSD: head/x11-toolkits/termit/Makefile 439491 2017-04-26 20:20:42Z pawel $	1	# $FreeBSD: head/x11-toolkits/termit/Makefile 439491 2017-04-26 20:20:42Z pawel $
3		2
4	PORTNAME= termit	3	PORTNAME= termit
5	PORTVERSION= 3.0	4	PORTVERSION= 3.0
6	DISTVERSIONPREFIX= ${PORTNAME}-	5	DISTVERSIONPREFIX= ${PORTNAME}-
		6	PORTREVISION= 1
7	CATEGORIES= x11-toolkits gnome	7	CATEGORIES= x11-toolkits gnome
8		8
9	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= bob@eager.cx
10	COMMENT= Small terminal emulator with Lua scripting	10	COMMENT= Small terminal emulator with Lua scripting
11		11
12	LICENSE= GPLv3	12	LICENSE= GPLv3
Lines 34-47 Link Here
34	NLS_CMAKE_OFF= -DENABLE_NLS:BOOL=NO	34	NLS_CMAKE_OFF= -DENABLE_NLS:BOOL=NO
35	NLS_USES= gettext	35	NLS_USES= gettext
36		36
37	post-patch:
38	@${REINPLACE_CMD} 's\|share/man\|man\|; s\|../COPYING\|\|' \
39	${WRKSRC}/doc/CMakeLists.txt
40	@${REINPLACE_CMD} 's\|OpenBSD\|${OPSYS}\|; s\|lua52\|lua-${LUA_VER}\|' \
41	${WRKSRC}/src/CMakeLists.txt
42	@${REINPLACE_CMD} 's\|ADD_SUBDIRECTORY(etc)\|\|' ${WRKSRC}/CMakeLists.txt
43	@${REINPLACE_CMD} 's\|/etc\|${PREFIX}/etc\|' ${WRKSRC}/src/lua_conf.c
44
45	post-install:	37	post-install:
46	@${MKDIR} ${TERMIT_ETC}	38	@${MKDIR} ${TERMIT_ETC}
47	.for file in colormaps.lua rc.lua utils.lua	39	.for file in colormaps.lua rc.lua utils.lua

Line 0 Link Here

(-)./files/patch-doc_CMakeLists.txt (+15 lines)
	1	--- doc/CMakeLists.txt.orig 2016-07-12 17:38:44 UTC
	2	+++ doc/CMakeLists.txt
	3	@@ -13,10 +13,10 @@
	4	# You should have received a copy of the GNU General Public License
	5	# along with this program. If not, see <http://www.gnu.org/licenses/>.
	6
	7	-SET(TERMIT_DOCS ../COPYING README lua_api.txt rc.lua.example)
	8	+SET(TERMIT_DOCS README lua_api.txt rc.lua.example)
	9
	10	INSTALL(FILES ${TERMIT_DOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/${TERMIT_PACKAGE})
	11	-INSTALL(FILES termit.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
	12	+INSTALL(FILES termit.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
	13	INSTALL(FILES termit.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
	14	INSTALL(FILES termit.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata)
	15

Line 0 Link Here

(-)./files/patch-doc_termit.1 (+26 lines)
	1	--- doc/termit.1.orig 2016-07-12 17:38:44 UTC
	2	+++ doc/termit.1
	3	@@ -1,7 +1,7 @@
	4	.\" Process this file with
	5	.\" groff -man -Tascii foo.1
	6	.\"
	7	-.TH TERMIT 1 "NOV 2008" Linux "User Manuals"
	8	+.TH TERMIT 1 "NOV 2008" FreeBSD "User Manuals"
	9	.SH NAME
	10	termit \(hy lightweight terminal emulator
	11	.SH SYNOPSIS
	12	@@ -89,7 +89,7 @@ Per user configuration file. See section
	13	.BR "TERMIT LUA API"
	14	for further details.
	15	.RE
	16	-.I /usr/share/doc/termit/rc.lua.example
	17	+.I /usr/local/share/doc/termit/rc.lua.example
	18	.RS
	19	Example rc.lua file. Demonstrates usage of almost all available settings.
	20	.SH "TERMIT LUA API"
	21	@@ -433,4 +433,4 @@ In options table 'tabs' field should be
	22	.SH AUTHOR
	23	Evgeny Ratnikov <ratnikov.ev at gmail dot com>
	24	.SH "SEE ALSO"
	25	-.BR lua (1)
	26	+.BR lua52 (1)

Line 0 Link Here

(-)./files/patch-src_CMakeLists.txt (+45 lines)
	1	--- src/CMakeLists.txt.orig 2016-07-12 17:38:44 UTC
	2	+++ src/CMakeLists.txt
	3	@@ -27,11 +27,11 @@ ENDIF(NOT VTE_FOUND)
	4
	5	SET(LUA_VERSION "" CACHE STRING "Lua version")
	6	IF(LUA_VERSION STREQUAL "")
	7	- IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
	8	- pkg_search_module(LUA REQUIRED lua53 lua52)
	9	- ELSE(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
	10	+ IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
	11	+ pkg_search_module(LUA REQUIRED lua53 lua-5.2)
	12	+ ELSE(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
	13	pkg_search_module(LUA REQUIRED lua>=5.2 lua5.3 lua5.2)
	14	- ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
	15	+ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
	16	ELSE(LUA_VERSION STREQUAL "")
	17	pkg_search_module(LUA REQUIRED
	18	lua=${LUA_VERSION} lua5.3=${LUA_VERSION} lua5.2=${LUA_VERSION})
	19	@@ -43,9 +43,9 @@ ENDIF(NOT LUA_FOUND)
	20	INCLUDE(Sources.cmake)
	21
	22	SET(TERMIT_CFLAGS "-I${LUA_INCLUDE_DIR}")
	23	-IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
	24	+IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
	25	SET(TERMIT_CFLAGS "${TERMIT_CFLAGS} -I/usr/local/include")
	26	-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
	27	+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
	28	FOREACH(cflag ${VTE_CFLAGS} ${GTK_CFLAGS} ${LUA_CFLAGS})
	29	SET(TERMIT_CFLAGS "${TERMIT_CFLAGS} ${cflag}")
	30	ENDFOREACH(cflag)
	31	@@ -64,11 +64,11 @@ SET_SOURCE_FILES_PROPERTIES(${TERMIT_SRC
	32
	33	ADD_EXECUTABLE(${TARGET} ${TERMIT_SRCS})
	34
	35	-IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
	36	+IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
	37	SET(TERMIT_LDFLAGS"-llua5.2")
	38	-ELSE(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
	39	+ELSE(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
	40	SET(TERMIT_LDFLAGS "-ldl -lm")
	41	-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
	42	+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
	43	FOREACH(ldflag ${VTE_LDFLAGS} ${LUA_LDFLAGS})
	44	LIST(APPEND TERMIT_LDFLAGS "${ldflag}")
	45	ENDFOREACH(ldflag)

Line 0 Link Here

(-)./files/patch-src_lua__conf.c (+14 lines)
	1	--- src/lua_conf.c.orig 2016-07-12 17:38:44 UTC
	2	+++ src/lua_conf.c
	3	@@ -340,9 +340,9 @@ static gchar** termit_system_path()
	4	const gchar *configSystem = g_getenv("XDG_CONFIG_DIRS");
	5	gchar* xdgConfigDirs = NULL;
	6	if (configSystem) {
	7	- xdgConfigDirs = g_strdup_printf("%s:/etc/xdg", configSystem);
	8	+ xdgConfigDirs = g_strdup_printf("%s:/usr/local/etc/xdg", configSystem);
	9	} else {
	10	- xdgConfigDirs = g_strdup("/etc/xdg");
	11	+ xdgConfigDirs = g_strdup("/usr/local/etc/xdg");
	12	}
	13	gchar** systemPaths = g_strsplit(xdgConfigDirs, ":", 0);
	14	g_free(xdgConfigDirs);