diff --git a/www/luakit/Makefile b/www/luakit/Makefile index 4c834a1c33433..6cc1c0190e240 100644 --- a/www/luakit/Makefile +++ b/www/luakit/Makefile @@ -1,6 +1,6 @@ PORTNAME= luakit DISTVERSION= 2.3.3 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www @@ -14,9 +14,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING.GPLv3 BUILD_DEPENDS= help2man:misc/help2man \ ${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR} LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ - libsoup-2.4.so:devel/libsoup \ + libsoup-3.0.so:devel/libsoup3 \ libfreetype.so:print/freetype2 \ - libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ + libwebkit2gtk-4.1.so:www/webkit2-gtk3 \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}luafilesystem>=0:devel/luafilesystem@${LUA_FLAVOR} @@ -25,7 +25,7 @@ USES= compiler:c++11-lang desktop-file-utils gettext-runtime gmake \ USE_GITHUB= yes USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 -MAKE_ARGS= MANPREFIX=${PREFIX}/share/man +MAKE_ARGS= XDGPREFIX=${PREFIX}/etc/xdg OPTIONS_DEFINE= DOCS LUAJIT LUAJIT_DESC= Use the Just-In-Time compiler for lua @@ -36,11 +36,6 @@ LUAJIT_MAKE_ARGS_OFF= USE_LUAJIT=0 CONFLICTS_INSTALL= luakit-devel post-extract: - @${REINPLACE_CMD} -e \ - 's|share/man|man| ; s|luakit/doc|doc/luakit| ; \ - s|/etc/xdg|${PREFIX}/etc/xdg| ; \ - s|gnu99|gnu11| ; s|-ggdb||' \ - ${WRKSRC}/config.mk @${REINPLACE_CMD} -e 's|bin/env lua|&${LUA_VER_STR}|' \ ${WRKSRC}/build-utils/gentokens.lua diff --git a/www/luakit/files/patch-config.mk b/www/luakit/files/patch-config.mk new file mode 100644 index 0000000000000..276c732125a92 --- /dev/null +++ b/www/luakit/files/patch-config.mk @@ -0,0 +1,35 @@ +--- config.mk.orig 2022-11-09 14:32:51 UTC ++++ config.mk +@@ -20,8 +20,8 @@ MANPREFIX ?= $(PREFIX)/share/man + + PREFIX ?= /usr/local + MANPREFIX ?= $(PREFIX)/share/man +-DOCDIR ?= $(PREFIX)/share/luakit/doc +-XDGPREFIX ?= /etc/xdg ++DOCDIR ?= $(PREFIX)/share/doc/luakit ++XDGPREFIX ?= /usr/local/etc/xdg + PIXMAPDIR ?= $(PREFIX)/share/pixmaps + APPDIR ?= $(PREFIX)/share/applications + LIBDIR ?= $(PREFIX)/lib/luakit +@@ -30,7 +30,7 @@ ifneq ($(DEVELOPMENT_PATHS),0) + # (Useful when running luakit from it's source directory, disable otherwise). + ifneq ($(DEVELOPMENT_PATHS),0) + CPPFLAGS += -DDEVELOPMENT_PATHS +- CFLAGS += -ggdb ++ CFLAGS += + endif + + # === Platform specific ====================================================== +@@ -98,10 +98,10 @@ PKGS += gthread-2.0 + # Packages required to build luakit. + PKGS += gtk+-3.0 + PKGS += gthread-2.0 +-PKGS += webkit2gtk-4.0 ++PKGS += webkit2gtk-4.1 + PKGS += sqlite3 + PKGS += $(LUA_PKG_NAME) +-PKGS += javascriptcoregtk-4.0 ++PKGS += javascriptcoregtk-4.1 + + # Check user has correct packages installed (and found by pkg-config). + PKGS_OK := $(shell $(PKG_CONFIG) --print-errors --exists $(PKGS) && echo 1)