luakit[-git]: Use CONF_FILES

This commit is contained in:
nia 2020-01-19 15:47:37 +00:00
parent dd1dfba343
commit 4837bb9757
8 changed files with 58 additions and 6 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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