How are ya now? Here is a diff that points luakit to a new upstream: https://github.com/aidanholm/luakit
Not entirely sure it's a sound idea to switch to this stream as they made this statement: "Additionally, I am in no hurry to guarantee the stability of anything that I implement." Anyway, this version lets us build against webkit2gtk-4.0, which lets us keep luakit in the tree. I am also not opposed to removing it completely! The original upstream (mason-larobina) seems to be almost completely inactive. -- PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE Index: Makefile =================================================================== RCS file: /cvs/ports/www/luakit/Makefile,v retrieving revision 1.16 diff -u -p -r1.16 Makefile --- Makefile 5 Jul 2016 17:00:21 -0000 1.16 +++ Makefile 7 Feb 2017 14:10:50 -0000 @@ -5,11 +5,10 @@ BROKEN-powerpc= help2man: can't get `--h COMMENT= fast, small, webkit based browser written in lua # Date of the most recent upstream commit. -VERSION= 2015.01.24 -GH_ACCOUNT= mason-larobina -GH_COMMIT= 16f8b89eb7cbcb3ff3a22eb06eb677e46430b1cb +VERSION= 2017.01.31 +GH_ACCOUNT= aidanholm +GH_COMMIT= 5f2a71b92c9f96cab99da236a0f63314b20cb360 GH_PROJECT= luakit -REVISION= 0 EPOCH= 0 @@ -19,31 +18,32 @@ CATEGORIES= www MAINTAINER= Aaron Bieber <[email protected]> -HOMEPAGE= http://luakit.org +HOMEPAGE= https://github.com/aidanholm/luakit # GPLv3 PERMIT_PACKAGE_CDROM= Yes USE_GMAKE= Yes -WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama -WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype -WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 -WANTLIB += gthread-2.0 gtk-x11-2.0 javascriptcoregtk-1.0 luajit-5.1 -WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread -WANTLIB += soup-2.4 sqlite3 unique-1.0 webkitgtk-1.0 z +WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 +WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-3 intl +WANTLIB += javascriptcoregtk-4.0 luajit-5.1 pango-1.0 pangocairo-1.0 +WANTLIB += pthread soup-2.4 sqlite3 webkit2gtk-4.0 -MODULES = lang/lua \ - devel/gettext +MODULES = lang/lua \ + gcc4 -BUILD_DEPENDS= devel/help2man +MODGCC4_LANGS = c +MODGCC4_ARCHS = * + +BUILD_DEPENDS= devel/help2man \ + devel/libunique RUN_DEPENDS= devel/luafs \ textproc/lua-markdown LIB_DEPENDS= lang/luajit \ - devel/libunique \ - www/webkit + www/webkitgtk4 # webkit browsing RUN_DEPENDS += multimedia/gstreamer1/plugins-good \ Index: distinfo =================================================================== RCS file: /cvs/ports/www/luakit/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 9 May 2016 15:39:32 -0000 1.4 +++ distinfo 7 Feb 2017 14:10:50 -0000 @@ -1,2 +1,2 @@ -SHA256 (luakit-2015.01.24.tar.gz) = Slmgbol8qOWJKzBWZNb9fIEoc0JsNfDEufzQzVg77Hw= -SIZE (luakit-2015.01.24.tar.gz) = 220420 +SHA256 (luakit-2017.01.31.tar.gz) = b7yekEzN+t/jAsjmhPMsMoP9d+LvhyrVwsaSw4TIuiE= +SIZE (luakit-2017.01.31.tar.gz) = 278575 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/www/luakit/patches/patch-Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-Makefile --- patches/patch-Makefile 28 Oct 2012 23:43:00 -0000 1.1.1.1 +++ patches/patch-Makefile 7 Feb 2017 14:10:50 -0000 @@ -1,14 +1,19 @@ -$OpenBSD: patch-Makefile,v 1.1.1.1 2012/10/28 23:43:00 abieber Exp $ ---- Makefile.orig Mon Oct 1 11:38:55 2012 -+++ Makefile Mon Oct 1 11:39:09 2012 -@@ -37,13 +37,13 @@ globalconf.h: globalconf.h.in - $(OBJS): $(HEADS) config.mk +$OpenBSD$ +--- Makefile.orig Wed Feb 1 07:15:16 2017 ++++ Makefile Wed Feb 1 07:16:48 2017 +@@ -42,21 +42,21 @@ globalconf.h: globalconf.h.in + $(filter-out $(EXT_OBJS),$(OBJS)) $(EXT_OBJS): $(HEADS) config.mk - .c.o: + $(filter-out $(EXT_OBJS),$(OBJS)) : %.o : %.c - @echo $(CC) -c $< -o $@ + @echo $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ @$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ + $(EXT_OBJS) : %.o : %.c +- @echo $(CC) -c $< -o $@ ++ @echo $(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fpic $(CPPFLAGS) $< -o $@ + @$(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fpic $(CPPFLAGS) $< -o $@ + widgets/webview.o: $(wildcard widgets/webview/*.c) luakit: $(OBJS) @@ -16,4 +21,9 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2012/ + @echo $(CC) -o $@ $(OBJS) $(LDFLAGS) @$(CC) -o $@ $(OBJS) $(LDFLAGS) - luakit.1: luakit + luakit.so: $(EXT_OBJS) +- @echo $(CC) -o $@ $(EXT_OBJS) ++ @echo $(CC) -o $@ $(EXT_OBJS) $(LDFLAGS) + @$(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS) + + luakit.1: luakit.1.in Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/luakit/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 5 Jul 2016 17:00:21 -0000 1.2 +++ pkg/PLIST 7 Feb 2017 14:10:50 -0000 @@ -21,23 +21,36 @@ share/examples/luakit/theme.lua @sample ${SYSCONFDIR}/xdg/luakit/theme.lua share/examples/luakit/webview.lua @sample ${SYSCONFDIR}/xdg/luakit/webview.lua +share/examples/luakit/webview_webmodule.lua share/examples/luakit/window.lua @sample ${SYSCONFDIR}/xdg/luakit/window.lua +share/lua/${MODLUA_VERSION}/adblock.lua +share/lua/${MODLUA_VERSION}/adblock_chrome.lua +share/lua/${MODLUA_VERSION}/adblock_webmodule.lua share/lua/${MODLUA_VERSION}/bookmarks.lua share/lua/${MODLUA_VERSION}/bookmarks_chrome.lua share/lua/${MODLUA_VERSION}/chrome.lua share/lua/${MODLUA_VERSION}/cmdhist.lua share/lua/${MODLUA_VERSION}/completion.lua share/lua/${MODLUA_VERSION}/cookie_blocking.lua +share/lua/${MODLUA_VERSION}/cookie_filter.lua +share/lua/${MODLUA_VERSION}/cookie_filter_chrome.lua share/lua/${MODLUA_VERSION}/cookies.lua share/lua/${MODLUA_VERSION}/downloads.lua share/lua/${MODLUA_VERSION}/downloads_chrome.lua +share/lua/${MODLUA_VERSION}/editor.lua +share/lua/${MODLUA_VERSION}/error_page.lua +share/lua/${MODLUA_VERSION}/error_page_webmodule.lua share/lua/${MODLUA_VERSION}/follow.lua share/lua/${MODLUA_VERSION}/follow_selected.lua +share/lua/${MODLUA_VERSION}/follow_selected_webmodule.lua +share/lua/${MODLUA_VERSION}/follow_webmodule.lua share/lua/${MODLUA_VERSION}/formfiller.lua +share/lua/${MODLUA_VERSION}/formfiller_webmodule.lua share/lua/${MODLUA_VERSION}/go_input.lua share/lua/${MODLUA_VERSION}/go_next_prev.lua share/lua/${MODLUA_VERSION}/go_up.lua +share/lua/${MODLUA_VERSION}/hide_scrollbars.lua share/lua/${MODLUA_VERSION}/history.lua share/lua/${MODLUA_VERSION}/history_chrome.lua share/lua/${MODLUA_VERSION}/introspector.lua @@ -46,6 +59,7 @@ share/lua/${MODLUA_VERSION}/lousy/bind.l share/lua/${MODLUA_VERSION}/lousy/init.lua share/lua/${MODLUA_VERSION}/lousy/load.lua share/lua/${MODLUA_VERSION}/lousy/mode.lua +share/lua/${MODLUA_VERSION}/lousy/pickle.lua share/lua/${MODLUA_VERSION}/lousy/signal.lua share/lua/${MODLUA_VERSION}/lousy/theme.lua share/lua/${MODLUA_VERSION}/lousy/uri.lua @@ -53,16 +67,22 @@ share/lua/${MODLUA_VERSION}/lousy/util.l share/lua/${MODLUA_VERSION}/lousy/widget/ share/lua/${MODLUA_VERSION}/lousy/widget/init.lua share/lua/${MODLUA_VERSION}/lousy/widget/menu.lua +share/lua/${MODLUA_VERSION}/lousy/widget/tab.lua share/lua/${MODLUA_VERSION}/lousy/widget/tablist.lua +share/lua/${MODLUA_VERSION}/mixed_content.lua share/lua/${MODLUA_VERSION}/noscript.lua +share/lua/${MODLUA_VERSION}/open_editor.lua share/lua/${MODLUA_VERSION}/proxy.lua share/lua/${MODLUA_VERSION}/quickmarks.lua +share/lua/${MODLUA_VERSION}/referer_control_webmodule.lua share/lua/${MODLUA_VERSION}/search.lua share/lua/${MODLUA_VERSION}/session.lua +share/lua/${MODLUA_VERSION}/styles.lua share/lua/${MODLUA_VERSION}/tabhistory.lua share/lua/${MODLUA_VERSION}/taborder.lua share/lua/${MODLUA_VERSION}/undoclose.lua share/lua/${MODLUA_VERSION}/userscripts.lua +share/lua/${MODLUA_VERSION}/viewpdf.lua share/lua/${MODLUA_VERSION}/webinspector.lua share/luakit/ share/luakit/lib/
