CVS commit: pkgsrc/www

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug 31 09:44:25 UTC 2026

Modified Files:
        pkgsrc/www/webkit-gtk41: Makefile Makefile.common
        pkgsrc/www/webkit-gtk60: Makefile

Log Message:
webkit-gtk*: force gettext-lib from pkgsrc

pkgsrc libintl is installed during the build, and the pkgsrc
version is preferred when linking, leading to missing library
errors when pkg_add(1)ing.

Force gettext-lib from pkgsrc to avoid this.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/webkit-gtk41/Makefile \
    pkgsrc/www/webkit-gtk41/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/webkit-gtk60/Makefile

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

Modified files:

Index: pkgsrc/www/webkit-gtk41/Makefile
diff -u pkgsrc/www/webkit-gtk41/Makefile:1.1 pkgsrc/www/webkit-gtk41/Makefile:1.2
--- pkgsrc/www/webkit-gtk41/Makefile:1.1        Sun Aug 30 14:25:04 2026
+++ pkgsrc/www/webkit-gtk41/Makefile    Mon Aug 31 09:44:25 2026
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2026/08/30 14:25:04 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2026/08/31 09:44:25 wiz Exp $
 
 PLIST_SRC=     PLIST
 
 .include "Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/webkitgtk/webkit-gtk41/}
+PKGREVISION=   1
 COMMENT=       GTK3 port of the WebKit browser engine (API 4.1)
 
 CMAKE_CONFIGURE_ARGS+=         -DUSE_GTK4=OFF
Index: pkgsrc/www/webkit-gtk41/Makefile.common
diff -u pkgsrc/www/webkit-gtk41/Makefile.common:1.1 pkgsrc/www/webkit-gtk41/Makefile.common:1.2
--- pkgsrc/www/webkit-gtk41/Makefile.common:1.1 Sun Aug 30 14:25:04 2026
+++ pkgsrc/www/webkit-gtk41/Makefile.common     Mon Aug 31 09:44:25 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2026/08/30 14:25:04 wiz Exp $
+# $NetBSD: Makefile.common,v 1.2 2026/08/31 09:44:25 wiz Exp $
 # used by www/webkit-gtk41/Makefile
 # used by www/webkit-gtk60/Makefile
 
@@ -176,6 +176,9 @@ CHECK_PORTABILITY_SKIP+=    Tools/TestWebKi
 .include "../../audio/flite/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/cmake/build.mk"
+# when gettext-lib is installed, it links against it,
+# so force dependency on it.
+PREFER.gettext=        pkgsrc
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"

Index: pkgsrc/www/webkit-gtk60/Makefile
diff -u pkgsrc/www/webkit-gtk60/Makefile:1.1 pkgsrc/www/webkit-gtk60/Makefile:1.2
--- pkgsrc/www/webkit-gtk60/Makefile:1.1        Sun Aug 30 14:25:39 2026
+++ pkgsrc/www/webkit-gtk60/Makefile    Mon Aug 31 09:44:25 2026
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2026/08/30 14:25:39 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2026/08/31 09:44:25 wiz Exp $
 
 PLIST_SRC=     PLIST
 
 .include "../../www/webkit-gtk41/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/webkitgtk/webkit-gtk60/}
-
+PKGREVISION=   1
 COMMENT=       GTK4 port of the WebKit browser engine (API 6.0)
 
 # this enables the 6.0 API