CVS commit: pkgsrc/www

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Aug  9 17:25:37 UTC 2020

Modified Files:
        pkgsrc/www: Makefile
Added Files:
        pkgsrc/www/luakit: DESCR Makefile PLIST distinfo options.mk
        pkgsrc/www/luakit/patches: patch-Makefile patch-lib_window.lua

Log Message:
www: Add luakit

Luakit is a highly configurable browser framework based on the WebKit web
content engine and the GTK+ toolkit. It is very fast, extensible with Lua,
and licensed under the GNU GPLv3 license. It is primarily targeted at
power users, developers and anyone who wants to have fine-grained control
over their web browser's behaviour and interface.


To generate a diff of this commit:
cvs rdiff -u -r1.1479 -r1.1480 pkgsrc/www/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/www/luakit/DESCR pkgsrc/www/luakit/Makefile \
    pkgsrc/www/luakit/PLIST pkgsrc/www/luakit/distinfo \
    pkgsrc/www/luakit/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/www/luakit/patches/patch-Makefile \
    pkgsrc/www/luakit/patches/patch-lib_window.lua

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

Modified files:

Index: pkgsrc/www/Makefile
diff -u pkgsrc/www/Makefile:1.1479 pkgsrc/www/Makefile:1.1480
--- pkgsrc/www/Makefile:1.1479  Fri Aug  7 01:57:55 2020
+++ pkgsrc/www/Makefile Sun Aug  9 17:25:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1479 2020/08/07 01:57:55 brook Exp $
+# $NetBSD: Makefile,v 1.1480 2020/08/09 17:25:37 nia Exp $
 #
 
 COMMENT=       Packages related to the World Wide Web
@@ -200,6 +200,7 @@ SUBDIR+=    logswan
 SUBDIR+=       lua-curl
 SUBDIR+=       lua-http
 SUBDIR+=       lua-psl
+SUBDIR+=       luakit
 SUBDIR+=       lynx
 SUBDIR+=       mMosaic
 SUBDIR+=       make_album

Added files:

Index: pkgsrc/www/luakit/DESCR
diff -u /dev/null pkgsrc/www/luakit/DESCR:1.1
--- /dev/null   Sun Aug  9 17:25:37 2020
+++ pkgsrc/www/luakit/DESCR     Sun Aug  9 17:25:37 2020
@@ -0,0 +1,5 @@
+Luakit is a highly configurable browser framework based on the WebKit web
+content engine and the GTK+ toolkit. It is very fast, extensible with Lua,
+and licensed under the GNU GPLv3 license. It is primarily targeted at
+power users, developers and anyone who wants to have fine-grained control
+over their web browser's behaviour and interface.
Index: pkgsrc/www/luakit/Makefile
diff -u /dev/null pkgsrc/www/luakit/Makefile:1.1
--- /dev/null   Sun Aug  9 17:25:37 2020
+++ pkgsrc/www/luakit/Makefile  Sun Aug  9 17:25:37 2020
@@ -0,0 +1,42 @@
+# $NetBSD: Makefile,v 1.1 2020/08/09 17:25:37 nia Exp $
+
+DISTNAME=      luakit-2.2
+CATEGORIES=    www lua
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=luakit/}
+
+MAINTAINER=    nia%NetBSD.org@localhost
+HOMEPAGE=      https://luakit.org/
+COMMENT=       Webkit based browser framework extensible with Lua
+LICENSE=       gnu-gpl-v3
+
+USE_TOOLS+=    gmake pkg-config
+
+MAKE_FLAGS+=   DEVELOPMENT_PATHS=0
+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=${PKG_SYSCONFDIR}
+
+LUA_VERSIONS_ACCEPTED= 51
+
+.include "../../lang/lua/luaversion.mk"
+
+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
+
+pre-install:
+       ${RM} -f ${WRKSRC}/lib/*.orig
+
+.include "options.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/luakit/PLIST
diff -u /dev/null pkgsrc/www/luakit/PLIST:1.1
--- /dev/null   Sun Aug  9 17:25:37 2020
+++ pkgsrc/www/luakit/PLIST     Sun Aug  9 17:25:37 2020
@@ -0,0 +1,225 @@
+@comment $NetBSD: PLIST,v 1.1 2020/08/09 17:25:37 nia Exp $
+bin/luakit
+lib/luakit/luakit.so
+man/man1/luakit.1
+share/applications/luakit.desktop
+share/doc/luakit/AUTHORS
+share/doc/luakit/COPYING.GPLv3
+share/doc/luakit/README.md
+share/doc/luakit/classes/dom_document.html
+share/doc/luakit/classes/dom_element.html
+share/doc/luakit/classes/download.html
+share/doc/luakit/classes/page.html
+share/doc/luakit/classes/regex.html
+share/doc/luakit/classes/sqlite3.html
+share/doc/luakit/classes/stylesheet.html
+share/doc/luakit/classes/timer.html
+share/doc/luakit/classes/widget.html
+share/doc/luakit/classes/widget:box.html
+share/doc/luakit/classes/widget:drawing_area.html
+share/doc/luakit/classes/widget:entry.html
+share/doc/luakit/classes/widget:event_box.html
+share/doc/luakit/classes/widget:image.html
+share/doc/luakit/classes/widget:label.html
+share/doc/luakit/classes/widget:notebook.html
+share/doc/luakit/classes/widget:overlay.html
+share/doc/luakit/classes/widget:paned.html
+share/doc/luakit/classes/widget:scrolled.html
+share/doc/luakit/classes/widget:socket.html
+share/doc/luakit/classes/widget:spinner.html
+share/doc/luakit/classes/widget:webview.html
+share/doc/luakit/classes/widget:window.html
+share/doc/luakit/index.html
+share/doc/luakit/modules/adblock.html
+share/doc/luakit/modules/adblock_chrome.html
+share/doc/luakit/modules/binds.html
+share/doc/luakit/modules/binds_chrome.html
+share/doc/luakit/modules/bookmarks.html
+share/doc/luakit/modules/bookmarks_chrome.html
+share/doc/luakit/modules/chrome.html
+share/doc/luakit/modules/cmdhist.html
+share/doc/luakit/modules/completion.html
+share/doc/luakit/modules/domain_props.html
+share/doc/luakit/modules/downloads.html
+share/doc/luakit/modules/downloads_chrome.html
+share/doc/luakit/modules/editor.html
+share/doc/luakit/modules/error_page.html
+share/doc/luakit/modules/follow.html
+share/doc/luakit/modules/follow_selected.html
+share/doc/luakit/modules/formfiller.html
+share/doc/luakit/modules/go_input.html
+share/doc/luakit/modules/go_next_prev.html
+share/doc/luakit/modules/go_up.html
+share/doc/luakit/modules/help_chrome.html
+share/doc/luakit/modules/hide_scrollbars.html
+share/doc/luakit/modules/history.html
+share/doc/luakit/modules/history_chrome.html
+share/doc/luakit/modules/image_css.html
+share/doc/luakit/modules/introspector_chrome.html
+share/doc/luakit/modules/ipc.html
+share/doc/luakit/modules/keysym.html
+share/doc/luakit/modules/log_chrome.html
+share/doc/luakit/modules/lousy.bind.html
+share/doc/luakit/modules/lousy.load.html
+share/doc/luakit/modules/lousy.mode.html
+share/doc/luakit/modules/lousy.pickle.html
+share/doc/luakit/modules/lousy.signal.html
+share/doc/luakit/modules/lousy.theme.html
+share/doc/luakit/modules/lousy.uri.html
+share/doc/luakit/modules/lousy.util.html
+share/doc/luakit/modules/lousy.widget.buf.html
+share/doc/luakit/modules/lousy.widget.common.html
+share/doc/luakit/modules/lousy.widget.hist.html
+share/doc/luakit/modules/lousy.widget.html
+share/doc/luakit/modules/lousy.widget.menu.html
+share/doc/luakit/modules/lousy.widget.progress.html
+share/doc/luakit/modules/lousy.widget.scroll.html
+share/doc/luakit/modules/lousy.widget.ssl.html
+share/doc/luakit/modules/lousy.widget.tab.html
+share/doc/luakit/modules/lousy.widget.tabi.html
+share/doc/luakit/modules/lousy.widget.tablist.html
+share/doc/luakit/modules/lousy.widget.uri.html
+share/doc/luakit/modules/lousy.widget.zoom.html
+share/doc/luakit/modules/luakit.html
+share/doc/luakit/modules/luakit.unique.html
+share/doc/luakit/modules/modes.html
+share/doc/luakit/modules/msg.html
+share/doc/luakit/modules/newtab_chrome.html
+share/doc/luakit/modules/noscript.html
+share/doc/luakit/modules/open_editor.html
+share/doc/luakit/modules/proxy.html
+share/doc/luakit/modules/quickmarks.html
+share/doc/luakit/modules/readline.html
+share/doc/luakit/modules/referer_control_wm.html
+share/doc/luakit/modules/search.html
+share/doc/luakit/modules/select.html
+share/doc/luakit/modules/select_wm.html
+share/doc/luakit/modules/session.html
+share/doc/luakit/modules/settings.html
+share/doc/luakit/modules/settings_chrome.html
+share/doc/luakit/modules/soup.html
+share/doc/luakit/modules/styles.html
+share/doc/luakit/modules/tab_favicons.html
+share/doc/luakit/modules/tabhistory.html
+share/doc/luakit/modules/taborder.html
+share/doc/luakit/modules/tests.lib.html
+share/doc/luakit/modules/undoclose.html
+share/doc/luakit/modules/unique_instance.html
+share/doc/luakit/modules/userscripts.html
+share/doc/luakit/modules/utf8.html
+share/doc/luakit/modules/vertical_tabs.html
+share/doc/luakit/modules/view_source.html
+share/doc/luakit/modules/viewpdf.html
+share/doc/luakit/modules/webinspector.html
+share/doc/luakit/modules/webview.html
+share/doc/luakit/modules/window.html
+share/doc/luakit/modules/xdg.html
+share/doc/luakit/pages/01-authors.html
+share/doc/luakit/pages/02-faq.html
+share/doc/luakit/pages/03-quick-start-guide.html
+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
+share/luakit/lib/binds.lua
+share/luakit/lib/binds_chrome.lua
+share/luakit/lib/bookmarks.lua
+share/luakit/lib/bookmarks_chrome.lua
+share/luakit/lib/chrome.lua
+share/luakit/lib/chrome_wm.lua
+share/luakit/lib/cmdhist.lua
+share/luakit/lib/completion.lua
+share/luakit/lib/domain_props.lua
+share/luakit/lib/downloads.lua
+share/luakit/lib/downloads_chrome.lua
+share/luakit/lib/editor.lua
+share/luakit/lib/error_page.lua
+share/luakit/lib/error_page_wm.lua
+share/luakit/lib/follow.lua
+share/luakit/lib/follow_selected.lua
+share/luakit/lib/follow_selected_wm.lua
+share/luakit/lib/follow_wm.lua
+share/luakit/lib/formfiller.lua
+share/luakit/lib/formfiller_wm.lua
+share/luakit/lib/go_input.lua
+share/luakit/lib/go_next_prev.lua
+share/luakit/lib/go_up.lua
+share/luakit/lib/help_chrome.lua
+share/luakit/lib/hide_scrollbars.lua
+share/luakit/lib/history.lua
+share/luakit/lib/history_chrome.lua
+share/luakit/lib/image_css.lua
+share/luakit/lib/image_css_wm.lua
+share/luakit/lib/introspector_chrome.lua
+share/luakit/lib/keysym.lua
+share/luakit/lib/log_chrome.lua
+share/luakit/lib/lousy/bind.lua
+share/luakit/lib/lousy/init.lua
+share/luakit/lib/lousy/load.lua
+share/luakit/lib/lousy/mode.lua
+share/luakit/lib/lousy/pickle.lua
+share/luakit/lib/lousy/signal.lua
+share/luakit/lib/lousy/theme.lua
+share/luakit/lib/lousy/uri.lua
+share/luakit/lib/lousy/util.lua
+share/luakit/lib/lousy/widget/buf.lua
+share/luakit/lib/lousy/widget/common.lua
+share/luakit/lib/lousy/widget/hist.lua
+share/luakit/lib/lousy/widget/init.lua
+share/luakit/lib/lousy/widget/menu.lua
+share/luakit/lib/lousy/widget/progress.lua
+share/luakit/lib/lousy/widget/scroll.lua
+share/luakit/lib/lousy/widget/ssl.lua
+share/luakit/lib/lousy/widget/tab.lua
+share/luakit/lib/lousy/widget/tabi.lua
+share/luakit/lib/lousy/widget/tablist.lua
+share/luakit/lib/lousy/widget/uri.lua
+share/luakit/lib/lousy/widget/zoom.lua
+share/luakit/lib/markdown.lua
+share/luakit/lib/modes.lua
+share/luakit/lib/newtab_chrome.lua
+share/luakit/lib/noscript.lua
+share/luakit/lib/open_editor.lua
+share/luakit/lib/proxy.lua
+share/luakit/lib/quickmarks.lua
+share/luakit/lib/readline.lua
+share/luakit/lib/referer_control_wm.lua
+share/luakit/lib/search.lua
+share/luakit/lib/select.lua
+share/luakit/lib/select_wm.lua
+share/luakit/lib/session.lua
+share/luakit/lib/settings.lua
+share/luakit/lib/settings_chrome.lua
+share/luakit/lib/styles.lua
+share/luakit/lib/tab_favicons.lua
+share/luakit/lib/tabhistory.lua
+share/luakit/lib/taborder.lua
+share/luakit/lib/undoclose.lua
+share/luakit/lib/unique_instance.lua
+share/luakit/lib/userscripts.lua
+share/luakit/lib/vertical_tabs.lua
+share/luakit/lib/view_source.lua
+share/luakit/lib/viewpdf.lua
+share/luakit/lib/webinspector.lua
+share/luakit/lib/webview.lua
+share/luakit/lib/webview_wm.lua
+share/luakit/lib/window.lua
+share/luakit/resources/icons/COPYING
+share/luakit/resources/icons/tab-icon-chrome.png
+share/luakit/resources/icons/tab-icon-chrome%2x.png@localhost
+share/luakit/resources/icons/tab-icon-crash.png
+share/luakit/resources/icons/tab-icon-crash%2x.png@localhost
+share/luakit/resources/icons/tab-icon-error.png
+share/luakit/resources/icons/tab-icon-error%2x.png@localhost
+share/luakit/resources/icons/tab-icon-page.png
+share/luakit/resources/icons/tab-icon-page%2x.png@localhost
+share/luakit/resources/icons/tab-icon-private.png
+share/luakit/resources/icons/tab-icon-private%2x.png@localhost
+share/luakit/resources/icons/tab-icon-security-error.png
+share/luakit/resources/icons/tab-icon-security-error%2x.png@localhost
+share/pixmaps/luakit.png
Index: pkgsrc/www/luakit/distinfo
diff -u /dev/null pkgsrc/www/luakit/distinfo:1.1
--- /dev/null   Sun Aug  9 17:25:37 2020
+++ pkgsrc/www/luakit/distinfo  Sun Aug  9 17:25:37 2020
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2020/08/09 17:25:37 nia Exp $
+
+SHA1 (luakit-2.2.tar.gz) = 644be3ed722cb6a004e57ad579a9e1ba33a7abd6
+RMD160 (luakit-2.2.tar.gz) = 2dc74d65d30c9322ea8ad8fd1d50d1d4d3c45d25
+SHA512 (luakit-2.2.tar.gz) = 5364acc559c934593dd9d66f8f3238225a7f89a824780f406a0a616d89fc78db4ee98b2cfa161e43ffbdfb9c5ac915a63383f45b1b6bd4eda9c33d62eff2b06f
+Size (luakit-2.2.tar.gz) = 488550 bytes
+SHA1 (patch-Makefile) = 8510a1de1c99244ce1f8cb925439921381692f3d
+SHA1 (patch-lib_window.lua) = 7a2a41610b20cc18e8ff5a4bd7f0ed06994c2ce8
Index: pkgsrc/www/luakit/options.mk
diff -u /dev/null pkgsrc/www/luakit/options.mk:1.1
--- /dev/null   Sun Aug  9 17:25:37 2020
+++ pkgsrc/www/luakit/options.mk        Sun Aug  9 17:25:37 2020
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2020/08/09 17:25:37 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.luakit
+PKG_SUPPORTED_OPTIONS=         luajit
+.include "../../lang/LuaJIT2/platform.mk"
+.if !empty(PLATFORM_SUPPORTS_LUAJIT:M[Yy][Ee][Ss])
+PKG_SUGGESTED_OPTIONS=         luajit
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mluajit)
+MAKE_FLAGS+=   USE_LUAJIT=1
+NOT_PAX_MPROTECT_SAFE+=        bin/luakit
+.  include "../../lang/LuaJIT2/buildlink3.mk"
+.else
+MAKE_FLAGS+=   USE_LUAJIT=0
+.  include "../../lang/lua51/buildlink3.mk"
+.endif

Index: pkgsrc/www/luakit/patches/patch-Makefile
diff -u /dev/null pkgsrc/www/luakit/patches/patch-Makefile:1.1
--- /dev/null   Sun Aug  9 17:25:37 2020
+++ pkgsrc/www/luakit/patches/patch-Makefile    Sun Aug  9 17:25:37 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-Makefile,v 1.1 2020/08/09 17:25:37 nia Exp $
+
+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)
Index: pkgsrc/www/luakit/patches/patch-lib_window.lua
diff -u /dev/null pkgsrc/www/luakit/patches/patch-lib_window.lua:1.1
--- /dev/null   Sun Aug  9 17:25:37 2020
+++ pkgsrc/www/luakit/patches/patch-lib_window.lua      Sun Aug  9 17:25:37 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-lib_window.lua,v 1.1 2020/08/09 17:25:37 nia Exp $
+
+Do not destroy() the current view.
+
+When just one tab is present it leads to an high CPU usage and luakit completely
+stuck (although start luakit via `--log=DEBUG' option shows that it responds to
+events). To workaround this problem avoid to call view:destroy().
+
+XXX: I'm not sure if it's the correct fix.
+
+Reported uptsream via:
+
+ <https://github.com/luakit/luakit/pull/726>
+
+--- lib/window.lua.orig        2017-08-10 09:50:15.000000000 +0000
++++ lib/window.lua
+@@ -519,7 +519,6 @@ window.methods = {
+         view = view or w.view
+         w:emit_signal("close-tab", view)
+         w:detach_tab(view, blank_last)
+-        view:destroy()
+     end,
+ 
+     attach_tab = function (w, view, switch, order)