Attachment 183117 Details for Bug 219697 – Diffs for ports files (including patches)

[patch] Diffs for ports files (including patches)

termit.diff (text/plain), 7.03 KB, created by Bob Eager on 2017-05-31 23:23:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bob Eager

Created: 2017-05-31 23:23:45 UTC

Size: 7.03 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with cdiff -s -w 0
>diff -ruN ../termit.orig/Makefile ./Makefile
>--- ../termit.orig/Makefile	2017-04-26 21:20:42.000000000 +0100
>+++ ./Makefile	2017-06-01 00:00:01.547761000 +0100
>@@ -1,12 +1,12 @@
>-# 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=	ports@FreeBSD.org
>+MAINTAINER=	bob@eager.cx
> COMMENT=	Small terminal emulator with Lua scripting
> 
> LICENSE=	GPLv3
>@@ -34,14 +34,6 @@
> 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
>diff -ruN ../termit.orig/distinfo ./distinfo
>--- ../termit.orig/distinfo	2017-04-26 21:20:42.000000000 +0100
>+++ ./distinfo	2017-06-01 00:00:24.483795000 +0100
>@@ -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
>diff -ruN ../termit.orig/files/patch-CMakeLists.txt ./files/patch-CMakeLists.txt
>--- ../termit.orig/files/patch-CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-CMakeLists.txt	2017-06-01 00:06:47.473956000 +0100
>@@ -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}")
>diff -ruN ../termit.orig/files/patch-doc_CMakeLists.txt ./files/patch-doc_CMakeLists.txt
>--- ../termit.orig/files/patch-doc_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-doc_CMakeLists.txt	2017-06-01 00:06:47.475547000 +0100
>@@ -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 <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)
>+ 
>diff -ruN ../termit.orig/files/patch-doc_termit.1 ./files/patch-doc_termit.1
>--- ../termit.orig/files/patch-doc_termit.1	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-doc_termit.1	2017-06-01 00:06:47.477118000 +0100
>@@ -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 <ratnikov.ev at gmail dot com>
>+ .SH "SEE ALSO"
>+-.BR lua (1)
>++.BR lua52 (1)
>diff -ruN ../termit.orig/files/patch-src_CMakeLists.txt ./files/patch-src_CMakeLists.txt
>--- ../termit.orig/files/patch-src_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-src_CMakeLists.txt	2017-06-01 00:06:47.478713000 +0100
>@@ -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)
>diff -ruN ../termit.orig/files/patch-src_lua__conf.c ./files/patch-src_lua__conf.c
>--- ../termit.orig/files/patch-src_lua__conf.c	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-src_lua__conf.c	2017-06-01 00:06:47.480286000 +0100
>@@ -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);
>====> Cleaning up
>===> Done

Actions: View | Diff

Attachments on bug 219697: 183117