diff -urN luakit/Makefile luakit21/Makefile
--- luakit/Makefile	2019-08-08 12:12:56.000000000 +0000
+++ luakit21/Makefile	2019-10-21 22:52:27.464752000 +0000
@@ -2,8 +2,8 @@
 # $FreeBSD: head/www/luakit/Makefile 508374 2019-08-08 12:12:56Z tobik $
 
 PORTNAME=	luakit
-PORTVERSION=	2017.08.10
-PORTREVISION=	2
+PORTVERSION=	2.1
+PORTEPOCH=	1
 CATEGORIES=	www
 
 MAINTAINER=	ports@FreeBSD.org
@@ -29,25 +29,20 @@
 USE_GITHUB=	yes
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30
 
-MAKE_ARGS+=	DEVELOPMENT_PATHS=0
-
 OPTIONS_DEFINE=	DOCS LUAJIT
 LUAJIT_DESC=	Use the Just-In-Time compiler for lua
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 LUAJIT_MAKE_ARGS=	USE_LUAJIT=1
 LUAJIT_MAKE_ARGS_OFF=	USE_LUAJIT=0
 
-post-patch:
+post-extract:
 	@${REINPLACE_CMD} -e \
 		's|share/man|man| ; s|luakit/doc|doc/luakit| ; \
-		s|/etc/xdg|${PREFIX}/etc/xdg| ; /MANPREFIX */s|?=|=|' \
+		s|/etc/xdg|${PREFIX}/etc/xdg| ; /MANPREFIX */s|?=|=| ; \
+		s|gnu99|gnu11| ; s|-ggdb||' \
 		${WRKSRC}/config.mk
 	@${REINPLACE_CMD} -e 's|bin/env lua|&${LUA_VER_STR}|' \
 		${WRKSRC}/build-utils/gentokens.lua
-	@${REINPLACE_CMD} -e 's|bin/env lua|&${LUA_VER_STR}|' \
-		${WRKSRC}/lib/markdown.lua
-	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' \
-		${WRKSRC}/config/window.lua
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/luakit
diff -urN luakit/distinfo luakit21/distinfo
--- luakit/distinfo	2017-08-19 09:25:30.000000000 +0000
+++ luakit21/distinfo	2019-10-21 21:49:30.947033000 +0000
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502384928
-SHA256 (luakit-luakit-2017.08.10_GH0.tar.gz) = 23d98b6b51b66c85b6823cd287e161e1093b80639f06f1da9b0a7290b0859d37
-SIZE (luakit-luakit-2017.08.10_GH0.tar.gz) = 399564
+TIMESTAMP = 1542897991
+SHA256 (luakit-luakit-2.1_GH0.tar.gz) = ecbfa23316712f444714387b2ffd846626dab6e40b444d3def4475c145d56f26
+SIZE (luakit-luakit-2.1_GH0.tar.gz) = 485605
diff -urN luakit/pkg-plist luakit21/pkg-plist
--- luakit/pkg-plist	2017-08-19 09:25:30.000000000 +0000
+++ luakit21/pkg-plist	2019-10-21 21:53:04.975711000 +0000
@@ -1,11 +1,7 @@
 bin/luakit
-etc/xdg/luakit/globals.lua
 etc/xdg/luakit/rc.lua
 etc/xdg/luakit/theme.lua
-etc/xdg/luakit/webview.lua
-etc/xdg/luakit/webview_wm.lua
-etc/xdg/luakit/window.lua
-man/man1/luakit.1.gz
+%%LUA_LIBDIR%%/luakit/luakit.so
 share/applications/luakit.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.GPLv3
@@ -37,6 +33,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/modules/adblock.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/adblock_chrome.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/binds.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/binds_chrome.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/bookmarks.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/bookmarks_chrome.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/chrome.html
@@ -60,6 +57,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/modules/image_css.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/introspector_chrome.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/ipc.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/keysym.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/log_chrome.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/lousy.bind.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/lousy.load.html
@@ -69,8 +67,21 @@
 %%PORTDOCS%%%%DOCSDIR%%/modules/lousy.theme.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/lousy.uri.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/lousy.util.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/lousy.widget.buf.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/lousy.widget.common.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/lousy.widget.hist.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/lousy.widget.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/lousy.widget.menu.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/lousy.widget.progress.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/lousy.widget.scroll.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/lousy.widget.ssl.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/lousy.widget.tab.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/lousy.widget.tabi.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/lousy.widget.tablist.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/lousy.widget.uri.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/lousy.widget.zoom.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/luakit.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/luakit.unique.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/modes.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/msg.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/newtab_chrome.html
@@ -78,11 +89,14 @@
 %%PORTDOCS%%%%DOCSDIR%%/modules/open_editor.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/proxy.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/quickmarks.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/readline.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/referer_control_wm.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/search.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/select.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/select_wm.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/session.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/settings.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/settings_chrome.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/soup.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/styles.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/tab_favicons.html
@@ -90,12 +104,15 @@
 %%PORTDOCS%%%%DOCSDIR%%/modules/taborder.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/tests.%%LUA_LIBDIR%%.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/undoclose.html
-%%PORTDOCS%%%%DOCSDIR%%/modules/unique.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/unique_instance.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/userscripts.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/utf8.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/vertical_tabs.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/view_source.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/viewpdf.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/webinspector.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/webview.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/window.html
 %%PORTDOCS%%%%DOCSDIR%%/modules/xdg.html
 %%PORTDOCS%%%%DOCSDIR%%/pages/01-authors.html
 %%PORTDOCS%%%%DOCSDIR%%/pages/02-faq.html
@@ -103,10 +120,12 @@
 %%PORTDOCS%%%%DOCSDIR%%/pages/04-migration-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/pages/05-configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/pages/06-tests.html
+%%PORTDOCS%%%%DOCSDIR%%/pages/07-build-debian-package.html
 %%DATADIR%%/%%LUA_LIBDIR%%/adblock.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/adblock_chrome.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/adblock_wm.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/binds.lua
+%%DATADIR%%/%%LUA_LIBDIR%%/binds_chrome.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/bookmarks.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/bookmarks_chrome.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/chrome.lua
@@ -135,7 +154,7 @@
 %%DATADIR%%/%%LUA_LIBDIR%%/image_css.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/image_css_wm.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/introspector_chrome.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/jquery.min.js
+%%DATADIR%%/%%LUA_LIBDIR%%/keysym.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/log_chrome.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/lousy/bind.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/lousy/init.lua
@@ -160,29 +179,34 @@
 %%DATADIR%%/%%LUA_LIBDIR%%/lousy/widget/uri.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/lousy/widget/zoom.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/markdown.lua
-%%DATADIR%%/%%LUA_LIBDIR%%/markdown.lua.bak
 %%DATADIR%%/%%LUA_LIBDIR%%/modes.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/newtab_chrome.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/noscript.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/open_editor.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/proxy.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/quickmarks.lua
+%%DATADIR%%/%%LUA_LIBDIR%%/readline.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/referer_control_wm.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/search.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/select.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/select_wm.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/session.lua
+%%DATADIR%%/%%LUA_LIBDIR%%/settings.lua
+%%DATADIR%%/%%LUA_LIBDIR%%/settings_chrome.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/styles.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/tab_favicons.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/tabhistory.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/taborder.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/undoclose.lua
+%%DATADIR%%/%%LUA_LIBDIR%%/unique_instance.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/userscripts.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/vertical_tabs.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/view_source.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/viewpdf.lua
 %%DATADIR%%/%%LUA_LIBDIR%%/webinspector.lua
-%%DATADIR%%/luakit.so
+%%DATADIR%%/%%LUA_LIBDIR%%/webview.lua
+%%DATADIR%%/%%LUA_LIBDIR%%/webview_wm.lua
+%%DATADIR%%/%%LUA_LIBDIR%%/window.lua
 %%DATADIR%%/resources/icons/COPYING
 %%DATADIR%%/resources/icons/tab-icon-chrome.png
 %%DATADIR%%/resources/icons/tab-icon-chrome@2x.png
@@ -196,4 +220,5 @@
 %%DATADIR%%/resources/icons/tab-icon-private@2x.png
 %%DATADIR%%/resources/icons/tab-icon-security-error.png
 %%DATADIR%%/resources/icons/tab-icon-security-error@2x.png
+man/man1/luakit.1.gz
 share/pixmaps/luakit.png