luakit-git: Remove patch to honor pkgsrc xdg-dirs (no longer needed)

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sat Oct 6 17:12:38 2018 +0200
Changeset:	7a55cb3210a81d240ebf99b26d3d89b0bb80365a

Modified Files:
	luakit-git/Makefile
	luakit-git/distinfo
Removed Files:
	luakit-git/patches/patch-clib_xdg.c
	luakit-git/patches/patch-common_luautil.c
	luakit-git/patches/patch-luah.c

Log Message:
luakit-git: Remove patch to honor pkgsrc xdg-dirs (no longer needed)

(Not properly ktrace-ed, but probably patch-Makefile and
patch-config.mk probably fixed that.)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7a55cb3210a81d240ebf99b26d3d89b0bb80365a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 luakit-git/Makefile                       |  6 ------
 luakit-git/distinfo                       |  3 ---
 luakit-git/patches/patch-clib_xdg.c       | 36 -------------------------------
 luakit-git/patches/patch-common_luautil.c | 16 --------------
 luakit-git/patches/patch-luah.c           | 16 --------------
 5 files changed, 77 deletions(-)

diffs:
diff --git a/luakit-git/Makefile b/luakit-git/Makefile
index cc413148d8..1552af90e7 100644
--- a/luakit-git/Makefile
+++ b/luakit-git/Makefile
@@ -28,12 +28,6 @@ INSTALL_MAKE_FLAGS+=	${LUAKIT_MAKE_FLAGS}
 
 LUA_VERSIONS_ACCEPTED=	51
 
-SUBST_CLASSES+=		xdg-dirs
-SUBST_STAGE.xdg-dirs=	pre-configure
-SUBST_MESSAGE.xdg-dirs=	Add pkgsrc xdg-dirs to the search path.
-SUBST_FILES.xdg-dirs=	luah.c clib/xdg.c common/luautil.c
-SUBST_SED.xdg-dirs=	-e 's,@PKGSRCXDGPATH@,"${PREFIX}/etc/xdg",g'
-
 .include "../../lang/lua/luaversion.mk"
 
 DEPENDS+=	${LUA_PKGPREFIX}-filesystem-[0-9]*:../../devel/lua-filesystem
diff --git a/luakit-git/distinfo b/luakit-git/distinfo
index a1d52983d6..c4744eba64 100644
--- a/luakit-git/distinfo
+++ b/luakit-git/distinfo
@@ -5,8 +5,5 @@ RMD160 (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf39
 SHA512 (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf3903c3947779f8c4d4.zip) = f493fde91e87b8bd40f3a90b558c4d297ed31bc00e6924660a5c1fa55aa35bfd2eb7c8a6a7ea1d6b9ef7d095d358659d350ca92fbc6f654a9df9a1544ce30fdf
 Size (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf3903c3947779f8c4d4.zip) = 518360 bytes
 SHA1 (patch-Makefile) = 4a105f1201931904b432b9773c923274e0052d02
-SHA1 (patch-clib_xdg.c) = 503119fe2bba62a94b77575e3994db6329f19af3
-SHA1 (patch-common_luautil.c) = 73877098fe704e0f4a67c1eb273a777762d6c58d
 SHA1 (patch-config.mk) = e1c390151c004b2b806b2b53f9e1ce517d9b5d64
 SHA1 (patch-lib_window.lua) = 1282ea06f7c1a45b3465a3452b84b1483a694130
-SHA1 (patch-luah.c) = f811e2ddd3178007c62aba805110ba59934a3c3d
diff --git a/luakit-git/patches/patch-clib_xdg.c b/luakit-git/patches/patch-clib_xdg.c
deleted file mode 100644
index 4f8047b203..0000000000
--- a/luakit-git/patches/patch-clib_xdg.c
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD$
-
-Also search in the pkgsrc xdg path.
-
---- clib/xdg.c.orig	2017-07-10 04:22:35.000000000 +0000
-+++ clib/xdg.c
-@@ -52,6 +52,20 @@ luaH_push_path_array(lua_State *L, const
-     return 1;
- }
- 
-+static int
-+luaH_push_path_array_fallback(lua_State *L, const gchar * const * paths, const gchar *fallback)
-+{
-+    gint n;
-+    lua_newtable(L);
-+    for (n = 0; paths[n]; ++n) {
-+        luaH_push_path(L, paths[n]);
-+        lua_rawseti(L, -2, n+1);
-+    }
-+    luaH_push_path(L, fallback);
-+    lua_rawseti(L, -2, n+1);
-+    return 1;
-+}
-+
- static gint
- luaH_xdg_index(lua_State *L)
- {
-@@ -84,7 +98,7 @@ luaH_xdg_index(lua_State *L)
-         return luaH_push_path_array(L, g_get_system_data_dirs());
- 
-       case L_TK_SYSTEM_CONFIG_DIRS:
--        return luaH_push_path_array(L, g_get_system_config_dirs());
-+        return luaH_push_path_array_fallback(L, g_get_system_config_dirs(), @PKGSRCXDGPATH@);
- 
-       default:
-         break;
diff --git a/luakit-git/patches/patch-common_luautil.c b/luakit-git/patches/patch-common_luautil.c
deleted file mode 100644
index a1e01e062b..0000000000
--- a/luakit-git/patches/patch-common_luautil.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Also search in the pkgsrc xdg path.
-
---- common/luautil.c.orig	2017-08-27 19:41:20.547896796 +0000
-+++ common/luautil.c
-@@ -161,6 +161,9 @@ luaH_add_paths(lua_State *L, const gchar
-     /* add luakit install path */
-     g_ptr_array_add(paths, g_build_filename(LUAKIT_INSTALL_PATH, "lib", NULL));
- 
-+    /* add luakit xdg path */
-+    g_ptr_array_add(paths, g_build_filename(@PKGSRCXDGPATH@, "luakit", NULL));
-+
-     /* add users config dir (see: XDG_CONFIG_DIR) */
-     if (config_dir)
-         g_ptr_array_add(paths, g_strdup(config_dir));
diff --git a/luakit-git/patches/patch-luah.c b/luakit-git/patches/patch-luah.c
deleted file mode 100644
index c133ecaf23..0000000000
--- a/luakit-git/patches/patch-luah.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Also search in the pkgsrc xdg path.
-
---- luah.c.orig	2017-07-11 15:46:58.000000000 +0000
-+++ luah.c
-@@ -210,6 +210,9 @@ luaH_parserc(const gchar *confpath, gboo
-     for(; *config_dirs; config_dirs++)
-         g_ptr_array_add(paths, g_build_filename(*config_dirs, "luakit", "rc.lua", NULL));
- 
-+    /* add luakit xdg path */
-+    g_ptr_array_add(paths, g_build_filename(@PKGSRCXDGPATH@, "luakit", "rc.lua", NULL));
-+
-     /* get continuation variable; bail out if invalid */
-     char *i_str = getenv("LUAKIT_NEXT_CONFIG_INDEX");
-     gint i = i_str ? atoi(i_str) : 0;