Hello!
This diff does a few things:
- Bump epoch because upstream has actual releases now.
- Regen WANTLIB.
- Stop trying to run tests that don't exist.
- Fix MAKE_FLAGS and include html docs.
Tests fine for me on amd64. OK?
Cheers,
Aaron
diff --git a/www/luakit/Makefile b/www/luakit/Makefile
index 4f5da1da286..338d2365aa9 100644
--- a/www/luakit/Makefile
+++ b/www/luakit/Makefile
@@ -6,11 +6,10 @@ COMMENT = fast, small, webkit based browser written in lua
# Date of the most recent upstream commit.
GH_ACCOUNT = luakit
-GH_TAGNAME = 2017.08.10
+GH_TAGNAME = 2.1
GH_PROJECT = luakit
-REVISION = 0
-EPOCH = 0
+EPOCH = 1
CATEGORIES = www
@@ -29,11 +28,14 @@ WANTLIB += ${COMPILER_LIBCXX}
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
+WANTLIB += soup-2.4 sqlite3 webkit2gtk-4.0
MODULES = lang/lua
-BUILD_DEPENDS = devel/help2man
+NO_TEST = Yes
+
+BUILD_DEPENDS = devel/help2man \
+ devel/luafs
RUN_DEPENDS = devel/desktop-file-utils \
devel/luafs \
@@ -47,11 +49,12 @@ RUN_DEPENDS += multimedia/gstreamer1/plugins-good \
multimedia/gstreamer1/plugins-libav
MAKE_FLAGS += LUA_BIN_NAME=${MODLUA_BIN} \
- MANPREFIX=${DESTDIR}/${PREFIX}/man \
- PIXMAPDIR=${DESTDIR}/${PREFIX}/share/pixmaps/ \
- APPDIR=${DESTDIR}/${PREFIX}/share/applications/ \
+ XDGPREFIX=${PREFIX}/share/examples \
+ DOCDIR=${PREFIX}/share/doc/luakit \
+ MANPREFIX=${PREFIX}/man \
+ PIXMAPDIR=${PREFIX}/share/pixmaps/ \
+ APPDIR=${PREFIX}/share/applications/ \
PREFIX=${PREFIX} \
- XDGPREFIX=${DESTDIR}/${PREFIX}/share/examples/ \
DEVELOPMENT_PATHS=0
.include <bsd.port.mk>
diff --git a/www/luakit/distinfo b/www/luakit/distinfo
index 2e264a77bce..d6d192e0ee5 100644
--- a/www/luakit/distinfo
+++ b/www/luakit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (luakit-2017.08.10.tar.gz) = I9mLa1G2bIW2gjzSh+Fh4Qk7gGOfBvHamwpykLCFnTc=
-SIZE (luakit-2017.08.10.tar.gz) = 399564
+SHA256 (luakit-2.1.tar.gz) = 7L+iMxZxL0RHFDh7L/2EZibatuQLRE0970R1wUXVbyY=
+SIZE (luakit-2.1.tar.gz) = 485605
diff --git a/www/luakit/patches/patch-Makefile b/www/luakit/patches/patch-Makefile
index dda67d82dcc..631c2a7c79d 100644
--- a/www/luakit/patches/patch-Makefile
+++ b/www/luakit/patches/patch-Makefile
@@ -2,16 +2,7 @@ $OpenBSD: patch-Makefile,v 1.3 2017/07/26 14:19:45 abieber Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -17,7 +17,7 @@ EXT_OBJS = $(foreach obj,$(EXT_SRCS:.c=.o),$(obj))
- # Must be kept in sync with doc/docgen.ld
- DOC_SRCS = $(filter-out lib/markdown.lua,$(shell for d in doc/luadoc lib common/clib; do find $$d -type f; done)) tests/lib.lua
-
--all: options newline luakit luakit.1.gz luakit.so apidoc
-+all: options newline luakit luakit.1 luakit.so
-
- options:
- @echo luakit build options:
-@@ -50,21 +50,21 @@ buildopts.h: buildopts.h.in
+@@ -56,21 +56,21 @@ buildopts.h: buildopts.h.in
$(filter-out $(EXT_OBJS),$(OBJS)) $(EXT_OBJS): $(HEADS) config.mk
$(filter-out $(EXT_OBJS),$(OBJS)) : %.o : %.c
@@ -33,40 +24,16 @@ Index: Makefile
luakit.so: $(EXT_OBJS)
- @echo $(CC) -o $@ $(EXT_OBJS)
-+ @echo $(CC) -o $@ $(EXT_OBJS) $(LDFLAGS)
++ @echo $(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
@$(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
luakit.1: luakit.1.in
-@@ -86,16 +86,12 @@ doc: buildopts.h $(THEAD) $(TSRC)
- doxygen -s doc/luakit.doxygen
-
- clean:
-- rm -rf doc/apidocs doc/html luakit $(OBJS) $(EXT_OBJS) $(TSRC) $(THEAD) buildopts.h luakit.1 luakit.1.gz luakit.so
-+ rm -rf doc/html luakit $(OBJS) $(EXT_OBJS) $(TSRC) $(THEAD) buildopts.h luakit.1 luakit.1.gz luakit.so
-
- install: all
- install -d $(INSTALLDIR)/share/luakit/
- install -d $(DOCDIR) $(DOCDIR)/classes $(DOCDIR)/modules $(DOCDIR)/pages
- install -m644 README.md AUTHORS COPYING.GPLv3 $(DOCDIR)
-- install -m644 doc/apidocs/classes/* $(DOCDIR)/classes
-- install -m644 doc/apidocs/modules/* $(DOCDIR)/modules
-- install -m644 doc/apidocs/pages/* $(DOCDIR)/pages
-- install -m644 doc/apidocs/*.html $(DOCDIR)
- install -d $(INSTALLDIR)/share/luakit/lib $(INSTALLDIR)/share/luakit/lib/lousy $(INSTALLDIR)/share/luakit/lib/lousy/widget
- install -m644 lib/*.* $(INSTALLDIR)/share/luakit/lib
- install -m644 lib/lousy/*.* $(INSTALLDIR)/share/luakit/lib/lousy
-@@ -110,7 +106,7 @@ install: all
- install -d $(APPDIR)
- install -m644 extras/luakit.desktop $(APPDIR)
- install -d $(MANPREFIX)/man1/
-- install -m644 luakit.1.gz $(MANPREFIX)/man1/
-+ install -m644 luakit.1 $(MANPREFIX)/man1/
+@@ -115,7 +115,7 @@ install: all
+ install -d $(DESTDIR)$(APPDIR)
+ install -m644 extras/luakit.desktop $(DESTDIR)$(APPDIR)
+ install -d $(DESTDIR)$(MANPREFIX)/man1/
+- install -m644 luakit.1.gz $(DESTDIR)$(MANPREFIX)/man1/
++ install -m644 luakit.1 $(DESTDIR)$(MANPREFIX)/man1/
mkdir -p resources
- find resources -type d -exec install -d $(INSTALLDIR)/share/luakit/'{}' \;
- find resources -type f -exec sh -c 'f="{}"; install -m644 "$$f" "$(INSTALLDIR)/share/luakit/$$(dirname $$f)"' \;
-@@ -127,4 +123,4 @@ run-tests: luakit luakit.so tests/util.so
- @$(LUA_BIN_NAME) tests/run_test.lua
-
- newline: options;@echo
--.PHONY: all clean options install newline apidoc doc default
-+.PHONY: all clean options install newline doc default
+ find resources -type d -exec install -d $(DESTDIR)$(PREFIX)/share/luakit/'{}' \;
+ find resources -type f -exec sh -c 'f="{}"; install -m644 "$$f" "$(DESTDIR)$(PREFIX)/share/luakit/$$(dirname $$f)"' \;
diff --git a/www/luakit/patches/patch-config_globals_lua b/www/luakit/patches/patch-config_globals_lua
deleted file mode 100644
index 58153ec6c9c..00000000000
--- a/www/luakit/patches/patch-config_globals_lua
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-config_globals_lua,v 1.1 2017/08/12 19:28:43 abieber Exp $
-
-Index: config/globals.lua
---- config/globals.lua.orig
-+++ config/globals.lua
-@@ -31,7 +31,7 @@ globals.search_engines = {
- }
-
- -- Set google as fallback search engine
--globals.search_engines.default = globals.search_engines.google
-+globals.search_engines.default = globals.search_engines.duckduckgo
- -- Use this instead to disable auto-searching
- --search_engines.default = "%s"
-
diff --git a/www/luakit/pkg/PLIST b/www/luakit/pkg/PLIST
index c9c1d6f0ee3..b09964a217e 100644
--- a/www/luakit/pkg/PLIST
+++ b/www/luakit/pkg/PLIST
@@ -1,35 +1,144 @@
@comment $OpenBSD: PLIST,v 1.6 2018/06/27 21:04:05 espie Exp $
@bin bin/luakit
+lib/luakit/
+lib/luakit/luakit.so
@man man/man1/luakit.1
share/applications/luakit.desktop
+share/doc/luakit/
+share/doc/luakit/AUTHORS
+share/doc/luakit/COPYING.GPLv3
+share/doc/luakit/README.md
+share/doc/luakit/classes/
+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/
+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/
+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/
-@sample ${SYSCONFDIR}/xdg/
@sample ${SYSCONFDIR}/xdg/luakit/
-share/examples/luakit/globals.lua
-@sample ${SYSCONFDIR}/xdg/luakit/globals.lua
share/examples/luakit/rc.lua
@sample ${SYSCONFDIR}/xdg/luakit/rc.lua
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_wm.lua
-@sample ${SYSCONFDIR}/xdg/luakit/webview_wm.lua
-share/examples/luakit/window.lua
-@sample ${SYSCONFDIR}/xdg/luakit/window.lua
share/luakit/
-share/luakit/doc/
-share/luakit/doc/AUTHORS
-share/luakit/doc/COPYING.GPLv3
-share/luakit/doc/README.md
-share/luakit/doc/classes/
-share/luakit/doc/modules/
-share/luakit/doc/pages/
share/luakit/lib/
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
@@ -58,7 +167,7 @@ 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/jquery.min.js
+share/luakit/lib/keysym.lua
share/luakit/lib/log_chrome.lua
share/luakit/lib/lousy/
share/luakit/lib/lousy/bind.lua
@@ -91,22 +200,28 @@ 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/luakit.so
+share/luakit/lib/webview.lua
+share/luakit/lib/webview_wm.lua
+share/luakit/lib/window.lua
share/luakit/resources/
share/luakit/resources/icons/
share/luakit/resources/icons/COPYING
--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
No comments:
Post a Comment