luakit[-git]: Use CONF_FILES

[nia <nia%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Sun Jan 19 15:47:37 2020 +0000
Changeset:	4837bb97579be4a805acf21f116d45a6093bda2f

Modified Files:
	luakit-git/Makefile
	luakit-git/PLIST
	luakit-git/distinfo
	luakit/Makefile
	luakit/PLIST
	luakit/distinfo
Added Files:
	luakit-git/patches/patch-Makefile
	luakit/patches/patch-Makefile

Log Message:
luakit[-git]: Use CONF_FILES

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

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

diffstat:
 luakit-git/Makefile               | 10 +++++++++-
 luakit-git/PLIST                  |  4 ++--
 luakit-git/distinfo               |  1 +
 luakit-git/patches/patch-Makefile | 17 +++++++++++++++++
 luakit/Makefile                   | 10 +++++++++-
 luakit/PLIST                      |  4 ++--
 luakit/distinfo                   |  1 +
 luakit/patches/patch-Makefile     | 17 +++++++++++++++++
 8 files changed, 58 insertions(+), 6 deletions(-)

diffs:
diff --git a/luakit-git/Makefile b/luakit-git/Makefile
index 37d782cebf..9a943384ac 100644
--- a/luakit-git/Makefile
+++ b/luakit-git/Makefile
@@ -21,7 +21,7 @@ MAKE_FLAGS+=	APPDIR=${PREFIX}/share/applications
 MAKE_FLAGS+=	DOCDIR=${PREFIX}/share/doc/luakit
 MAKE_FLAGS+=	MANPREFIX=${PREFIX}/${PKGMANDIR}
 MAKE_FLAGS+=	PIXMAPDIR=${PREFIX}/share/pixmaps
-MAKE_FLAGS+=	XDGPREFIX=${PREFIX}/etc/xdg
+MAKE_FLAGS+=	XDGPREFIX=${PKG_SYSCONFDIR}
 
 LUA_VERSIONS_ACCEPTED=	51
 
@@ -29,6 +29,14 @@ LUA_VERSIONS_ACCEPTED=	51
 
 DEPENDS+=	${LUA_PKGPREFIX}-filesystem-[0-9]*:../../devel/lua-filesystem
 
+OWN_DIRS+=	${PKG_SYSCONFDIR}/xdg/luakit
+
+CONF_FILES+=	${PREFIX}/share/examples/luakit/rc.lua \
+		${PKG_SYSCONFDIR}/xdg/luakit/rc.lua
+
+CONF_FILES+=	${PREFIX}/share/examples/luakit/theme.lua \
+		${PKG_SYSCONFDIR}/xdg/luakit/theme.lua
+
 # Based on lang/swi-prolog-packages:
 setupx:
 .if exists(${X11BASE}/bin/Xvfb)
diff --git a/luakit-git/PLIST b/luakit-git/PLIST
index cb3c4f2ae3..f7d4973b63 100644
--- a/luakit-git/PLIST
+++ b/luakit-git/PLIST
@@ -1,7 +1,5 @@
 @comment $NetBSD$
 bin/luakit
-etc/xdg/luakit/rc.lua
-etc/xdg/luakit/theme.lua
 lib/luakit/luakit.so
 man/man1/luakit.1
 share/applications/luakit.desktop
@@ -123,6 +121,8 @@ share/doc/luakit/pages/04-migration-guide.html
 share/doc/luakit/pages/05-configuration.html
 share/doc/luakit/pages/06-tests.html
 share/doc/luakit/pages/07-build-debian-package.html
+share/examples/luakit/rc.lua
+share/examples/luakit/theme.lua
 share/luakit/lib/adblock.lua
 share/luakit/lib/adblock_chrome.lua
 share/luakit/lib/adblock_wm.lua
diff --git a/luakit-git/distinfo b/luakit-git/distinfo
index bee64336e1..91c5fbb29c 100644
--- a/luakit-git/distinfo
+++ b/luakit-git/distinfo
@@ -4,4 +4,5 @@ SHA1 (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf3903
 RMD160 (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf3903c3947779f8c4d4.zip) = c829f11889a2e50e8a91b5c9553e84c0ded5fdd9
 SHA512 (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf3903c3947779f8c4d4.zip) = f493fde91e87b8bd40f3a90b558c4d297ed31bc00e6924660a5c1fa55aa35bfd2eb7c8a6a7ea1d6b9ef7d095d358659d350ca92fbc6f654a9df9a1544ce30fdf
 Size (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf3903c3947779f8c4d4.zip) = 518360 bytes
+SHA1 (patch-Makefile) = d45f31061ea5d5bcf5ed6d63fcea41590003e10b
 SHA1 (patch-lib_window.lua) = cdbea2b3a9cca18c6e3a6b682cdb33b44ef286c0
diff --git a/luakit-git/patches/patch-Makefile b/luakit-git/patches/patch-Makefile
new file mode 100644
index 0000000000..7f95999d71
--- /dev/null
+++ b/luakit-git/patches/patch-Makefile
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Install config files to examples.
+
+--- Makefile.orig	2020-01-18 15:10:39.000000000 +0000
++++ Makefile
+@@ -108,8 +108,8 @@ install: all
+ 	install -m644 luakit.so $(DESTDIR)$(PREFIX)/lib/luakit/luakit.so
+ 	install -d $(DESTDIR)$(PREFIX)/bin
+ 	install luakit $(DESTDIR)$(PREFIX)/bin/luakit
+-	install -d $(DESTDIR)$(XDGPREFIX)/luakit/
+-	install -m644 config/*.lua $(DESTDIR)$(XDGPREFIX)/luakit/
++	install -d $(DESTDIR)$(PREFIX)/share/examples/luakit/
++	install -m644 config/*.lua $(DESTDIR)$(PREFIX)/share/examples/luakit/
+ 	install -d $(DESTDIR)$(PIXMAPDIR)
+ 	install -m644 extras/luakit.png $(DESTDIR)$(PIXMAPDIR)
+ 	install -d $(DESTDIR)$(APPDIR)
diff --git a/luakit/Makefile b/luakit/Makefile
index c3550ee0e6..4381745fd0 100644
--- a/luakit/Makefile
+++ b/luakit/Makefile
@@ -16,7 +16,7 @@ MAKE_FLAGS+=	APPDIR=${PREFIX}/share/applications
 MAKE_FLAGS+=	DOCDIR=${PREFIX}/share/doc/luakit
 MAKE_FLAGS+=	MANPREFIX=${PREFIX}/${PKGMANDIR}
 MAKE_FLAGS+=	PIXMAPDIR=${PREFIX}/share/pixmaps
-MAKE_FLAGS+=	XDGPREFIX=${PREFIX}/etc/xdg
+MAKE_FLAGS+=	XDGPREFIX=${PKG_SYSCONFDIR}
 
 MAKE_ENV+=	DISPLAY=${DISPLAY:Q}
 
@@ -26,6 +26,14 @@ LUA_VERSIONS_ACCEPTED=	51
 
 DEPENDS+=	${LUA_PKGPREFIX}-filesystem-[0-9]*:../../devel/lua-filesystem
 
+OWN_DIRS+=	${PKG_SYSCONFDIR}/xdg/luakit
+
+CONF_FILES+=	${PREFIX}/share/examples/luakit/rc.lua \
+		${PKG_SYSCONFDIR}/xdg/luakit/rc.lua
+
+CONF_FILES+=	${PREFIX}/share/examples/luakit/theme.lua \
+		${PKG_SYSCONFDIR}/xdg/luakit/theme.lua
+
 # Based on lang/swi-prolog-packages:
 setupx:
 .if exists(${X11BASE}/bin/Xvfb)
diff --git a/luakit/PLIST b/luakit/PLIST
index cb3c4f2ae3..f7d4973b63 100644
--- a/luakit/PLIST
+++ b/luakit/PLIST
@@ -1,7 +1,5 @@
 @comment $NetBSD$
 bin/luakit
-etc/xdg/luakit/rc.lua
-etc/xdg/luakit/theme.lua
 lib/luakit/luakit.so
 man/man1/luakit.1
 share/applications/luakit.desktop
@@ -123,6 +121,8 @@ share/doc/luakit/pages/04-migration-guide.html
 share/doc/luakit/pages/05-configuration.html
 share/doc/luakit/pages/06-tests.html
 share/doc/luakit/pages/07-build-debian-package.html
+share/examples/luakit/rc.lua
+share/examples/luakit/theme.lua
 share/luakit/lib/adblock.lua
 share/luakit/lib/adblock_chrome.lua
 share/luakit/lib/adblock_wm.lua
diff --git a/luakit/distinfo b/luakit/distinfo
index 74fd1c5918..c18f7b2f45 100644
--- a/luakit/distinfo
+++ b/luakit/distinfo
@@ -4,5 +4,6 @@ SHA1 (luakit-2.1.tar.gz) = fe0d7d52e76aae598639ff6f2b4834cdc5670740
 RMD160 (luakit-2.1.tar.gz) = a462c13895d62ad2f45c10805fdb39cf84307bdb
 SHA512 (luakit-2.1.tar.gz) = 1daee7fe4bf5fad0f2c70d714c316914c601467facafdb22e4f27c18a691e249cefd5680ede834bcc555041afdc5d7e70610e2cd5e33db1ad8d9f2fe0327ccac
 Size (luakit-2.1.tar.gz) = 485605 bytes
+SHA1 (patch-Makefile) = 8510a1de1c99244ce1f8cb925439921381692f3d
 SHA1 (patch-lib_window.lua) = 7a2a41610b20cc18e8ff5a4bd7f0ed06994c2ce8
 SHA1 (patch-widgets_webview.c) = 82e16ceb4f698aaf79e27d49a882d65e68a7c4c4
diff --git a/luakit/patches/patch-Makefile b/luakit/patches/patch-Makefile
new file mode 100644
index 0000000000..7af0f117b4
--- /dev/null
+++ b/luakit/patches/patch-Makefile
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Install config files to examples.
+
+--- Makefile.orig	2018-11-16 08:12:24.000000000 +0000
++++ Makefile
+@@ -108,8 +108,8 @@ install: all
+ 	install -m644 luakit.so $(DESTDIR)$(PREFIX)/lib/luakit/luakit.so
+ 	install -d $(DESTDIR)$(PREFIX)/bin
+ 	install luakit $(DESTDIR)$(PREFIX)/bin/luakit
+-	install -d $(DESTDIR)$(XDGPREFIX)/luakit/
+-	install -m644 config/*.lua $(DESTDIR)$(XDGPREFIX)/luakit/
++	install -d $(DESTDIR)$(PREFIX)/share/examples/luakit/
++	install -m644 config/*.lua $(DESTDIR)$(PREFIX)/share/examples/luakit/
+ 	install -d $(DESTDIR)$(PIXMAPDIR)
+ 	install -m644 extras/luakit.png $(DESTDIR)$(PIXMAPDIR)
+ 	install -d $(DESTDIR)$(APPDIR)