From 4f7656b6e0ea0083fc833966f780dffa1e7b7408 Mon Sep 17 00:00:00 2001 From: gutteridge Date: Mon, 24 Aug 2020 04:41:39 +0000 Subject: mate*: remove unintentional linkage against pkgsrc gettext-libs As of 1.24, MATE requires GNU-specific msgfmt features. meta-pkgs/mate/ Makefile.common r. 1.10 expressed this tool dependency using USE_BUILTIN.gettext=no, but this exposed pkgsrc gettext-libs in the build environment as well, which some MATE packages then linked against, but gettext-libs didn't end up being declared as a run-time dependency, so binary package installations were broken (with the workaround of manually installing the undeclared gettext-libs dependency). Express this dependency differently, so GNU msgfmt is used as a tool without exposing pkgsrc gettext-libs. (The pkgsrc tooling infrastruture could be altered to provide a distinct "gmsgfmt" tool, same with "gxgettext", and perhaps others. Here I'm just immediately concerned with fixing this packaging issue.) Addresses PR pkg/55503 by Jay Patel. --- graphics/eom/Makefile | 4 ++-- graphics/mate-backgrounds/Makefile | 4 ++-- graphics/mate-icon-theme-faenza/Makefile | 4 ++-- graphics/mate-icon-theme/Makefile | 4 ++-- graphics/mate-themes/Makefile | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'graphics') diff --git a/graphics/eom/Makefile b/graphics/eom/Makefile index 6c399e2838b..57308c44672 100644 --- a/graphics/eom/Makefile +++ b/graphics/eom/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.24 2020/08/17 20:18:57 leot Exp $ +# $NetBSD: Makefile,v 1.25 2020/08/24 04:41:39 gutteridge Exp $ # XXX: meta-pkgs/mate/Makefile.common includes pyversion.mk which sets the # python version too early and clashes with PYTHON_VERSIONS_INCOMPATIBLE # from libpeas bl3, so we include it early to ensure a valid version is # chosen. This is not ideal, please fix it properly at some point. -PKGREVISION= 2 +PKGREVISION= 3 .include "../../devel/libpeas/buildlink3.mk" .include "../../meta-pkgs/mate/Makefile.common" diff --git a/graphics/mate-backgrounds/Makefile b/graphics/mate-backgrounds/Makefile index f5505724d6a..e9692b4b885 100644 --- a/graphics/mate-backgrounds/Makefile +++ b/graphics/mate-backgrounds/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2020/08/17 20:19:05 leot Exp $ +# $NetBSD: Makefile,v 1.19 2020/08/24 04:41:39 gutteridge Exp $ -PKGREVISION= 1 +PKGREVISION= 2 .include "../../meta-pkgs/mate/Makefile.common" DISTNAME= mate-backgrounds-${VERSION:R}.1 diff --git a/graphics/mate-icon-theme-faenza/Makefile b/graphics/mate-icon-theme-faenza/Makefile index cfe68c69768..ed374588866 100644 --- a/graphics/mate-icon-theme-faenza/Makefile +++ b/graphics/mate-icon-theme-faenza/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2020/08/17 20:19:05 leot Exp $ +# $NetBSD: Makefile,v 1.16 2020/08/24 04:41:39 gutteridge Exp $ .include "../../meta-pkgs/mate/Makefile.common" -PKGREVISION= 7 +PKGREVISION= 8 DISTNAME= mate-icon-theme-faenza-1.20.0 CATEGORIES= graphics MASTER_SITES+= http://pub.mate-desktop.org/releases/1.20/ diff --git a/graphics/mate-icon-theme/Makefile b/graphics/mate-icon-theme/Makefile index 00fb461af11..38b43149405 100644 --- a/graphics/mate-icon-theme/Makefile +++ b/graphics/mate-icon-theme/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2020/08/17 20:19:05 leot Exp $ +# $NetBSD: Makefile,v 1.19 2020/08/24 04:41:39 gutteridge Exp $ -PKGREVISION= 1 +PKGREVISION= 2 .include "../../meta-pkgs/mate/Makefile.common" DISTNAME= mate-icon-theme-${VERSION:R}.0 diff --git a/graphics/mate-themes/Makefile b/graphics/mate-themes/Makefile index 50f887ffa02..a0cd7dbdf60 100644 --- a/graphics/mate-themes/Makefile +++ b/graphics/mate-themes/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.21 2020/08/17 20:19:05 leot Exp $ +# $NetBSD: Makefile,v 1.22 2020/08/24 04:41:39 gutteridge Exp $ -PKGREVISION= 1 +PKGREVISION= 2 .include "../../meta-pkgs/mate/Makefile.common" VERSION= 3.22.21 -- cgit v1.2.3