[pkgsrc/trunk]: pkgsrc mate*: remove unintentional linkage against pkgsrc get...

[gutteridge <gutteridge%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0803de533b13
branches:  trunk
changeset: 437420:0803de533b13
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Mon Aug 24 04:41:39 2020 +0000

description:
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.

diffstat:

 archivers/engrampa/Makefile                |  4 ++--
 audio/libmatemixer/Makefile                |  4 ++--
 devel/mate-common/Makefile                 |  4 ++--
 editors/pluma/Makefile                     |  4 ++--
 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 ++--
 meta-pkgs/mate/Makefile                    |  4 ++--
 meta-pkgs/mate/Makefile.common             |  9 +++++----
 misc/libmateweather/Makefile               |  4 ++--
 misc/mate-calc/Makefile                    |  4 ++--
 misc/mate-utils/Makefile                   |  4 ++--
 multimedia/mate-media/Makefile             |  4 ++--
 net/mate-user-share/Makefile               |  4 ++--
 print/atril/Makefile                       |  4 ++--
 security/mate-polkit/Makefile              |  4 ++--
 sysutils/caja-dropbox/Makefile             |  4 ++--
 sysutils/caja-extensions/Makefile          |  4 ++--
 sysutils/caja/Makefile                     |  4 ++--
 sysutils/mate-notification-daemon/Makefile |  4 ++--
 sysutils/mate-power-manager/Makefile       |  4 ++--
 sysutils/mate-sensors-applet/Makefile      |  4 ++--
 sysutils/mate-system-monitor/Makefile      |  4 ++--
 wm/marco/Makefile                          |  4 ++--
 wm/mate-netbook/Makefile                   |  4 ++--
 x11/libmatekbd/Makefile                    |  4 ++--
 x11/mate-applets/Makefile                  |  4 ++--
 x11/mate-control-center/Makefile           |  4 ++--
 x11/mate-desktop/Makefile                  |  4 ++--
 x11/mate-indicator-applet/Makefile         |  4 ++--
 x11/mate-menus/Makefile                    |  4 ++--
 x11/mate-panel/Makefile                    |  4 ++--
 x11/mate-screensaver/Makefile              |  4 ++--
 x11/mate-session-manager/Makefile          |  4 ++--
 x11/mate-settings-daemon/Makefile          |  4 ++--
 x11/mate-terminal/Makefile                 |  4 ++--
 x11/mozo/Makefile                          |  4 ++--
 39 files changed, 81 insertions(+), 80 deletions(-)

diffs (truncated from 505 to 300 lines):

diff -r 17ee8b1e8e7c -r 0803de533b13 archivers/engrampa/Makefile
--- a/archivers/engrampa/Makefile       Sun Aug 23 23:09:49 2020 +0000
+++ b/archivers/engrampa/Makefile       Mon Aug 24 04:41:39 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2020/08/17 20:18:02 leot Exp $
+# $NetBSD: Makefile,v 1.23 2020/08/24 04:41:39 gutteridge Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      engrampa-${VERSION}
diff -r 17ee8b1e8e7c -r 0803de533b13 audio/libmatemixer/Makefile
--- a/audio/libmatemixer/Makefile       Sun Aug 23 23:09:49 2020 +0000
+++ b/audio/libmatemixer/Makefile       Mon Aug 24 04:41:39 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2020/08/17 20:18:08 leot Exp $
+# $NetBSD: Makefile,v 1.22 2020/08/24 04:41:39 gutteridge Exp $
 
 .include "../../meta-pkgs/mate/Makefile.common"
 
-PKGREVISION=   2
+PKGREVISION=   3
 DISTNAME=      libmatemixer-${VERSION:R}.0
 CATEGORIES=    audio
 
diff -r 17ee8b1e8e7c -r 0803de533b13 devel/mate-common/Makefile
--- a/devel/mate-common/Makefile        Sun Aug 23 23:09:49 2020 +0000
+++ b/devel/mate-common/Makefile        Mon Aug 24 04:41:39 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2020/08/17 20:18:28 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-common-${VERSION:R}.1
diff -r 17ee8b1e8e7c -r 0803de533b13 editors/pluma/Makefile
--- a/editors/pluma/Makefile    Sun Aug 23 23:09:49 2020 +0000
+++ b/editors/pluma/Makefile    Mon Aug 24 04:41:39 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2020/08/17 20:18:35 leot Exp $
+# $NetBSD: Makefile,v 1.31 2020/08/24 04:41:39 gutteridge Exp $
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 DISTNAME=      pluma-${VERSION:R}.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    editors
 
 COMMENT=       Small and lightweight UTF-8 text editor for MATE
diff -r 17ee8b1e8e7c -r 0803de533b13 graphics/eom/Makefile
--- a/graphics/eom/Makefile     Sun Aug 23 23:09:49 2020 +0000
+++ b/graphics/eom/Makefile     Mon Aug 24 04:41:39 2020 +0000
@@ -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 -r 17ee8b1e8e7c -r 0803de533b13 graphics/mate-backgrounds/Makefile
--- a/graphics/mate-backgrounds/Makefile        Sun Aug 23 23:09:49 2020 +0000
+++ b/graphics/mate-backgrounds/Makefile        Mon Aug 24 04:41:39 2020 +0000
@@ -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 -r 17ee8b1e8e7c -r 0803de533b13 graphics/mate-icon-theme-faenza/Makefile
--- a/graphics/mate-icon-theme-faenza/Makefile  Sun Aug 23 23:09:49 2020 +0000
+++ b/graphics/mate-icon-theme-faenza/Makefile  Mon Aug 24 04:41:39 2020 +0000
@@ -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 -r 17ee8b1e8e7c -r 0803de533b13 graphics/mate-icon-theme/Makefile
--- a/graphics/mate-icon-theme/Makefile Sun Aug 23 23:09:49 2020 +0000
+++ b/graphics/mate-icon-theme/Makefile Mon Aug 24 04:41:39 2020 +0000
@@ -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 -r 17ee8b1e8e7c -r 0803de533b13 graphics/mate-themes/Makefile
--- a/graphics/mate-themes/Makefile     Sun Aug 23 23:09:49 2020 +0000
+++ b/graphics/mate-themes/Makefile     Mon Aug 24 04:41:39 2020 +0000
@@ -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
diff -r 17ee8b1e8e7c -r 0803de533b13 meta-pkgs/mate/Makefile
--- a/meta-pkgs/mate/Makefile   Sun Aug 23 23:09:49 2020 +0000
+++ b/meta-pkgs/mate/Makefile   Mon Aug 24 04:41:39 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2020/08/17 20:19:28 leot Exp $
+# $NetBSD: Makefile,v 1.34 2020/08/24 04:41:40 gutteridge Exp $
 
 PKGNAME=       mate-${VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    meta-pkgs
 
 COMMENT=       Meta-package for MATE desktop environment
diff -r 17ee8b1e8e7c -r 0803de533b13 meta-pkgs/mate/Makefile.common
--- a/meta-pkgs/mate/Makefile.common    Sun Aug 23 23:09:49 2020 +0000
+++ b/meta-pkgs/mate/Makefile.common    Mon Aug 24 04:41:39 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2020/04/05 16:05:39 bsiegert Exp $
+# $NetBSD: Makefile.common,v 1.11 2020/08/24 04:41:40 gutteridge Exp $
 # used by meta-pkgs/mate/Makefile
 # used by print/atril/Makefile
 # used by sysutils/caja/Makefile
@@ -44,7 +44,10 @@
 
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
-USE_TOOLS+=    gmake intltool msgfmt pkg-config
+USE_TOOLS+=    gmake msgfmt pkg-config
+
+# Fails without GNU msgfmt
+_TOOLS_USE_PKGSRC.msgfmt=      yes
 
 MAINTAINER=    youri%NetBSD.org@localhost
 LICENSE=       gnu-gpl-v3
@@ -52,8 +55,6 @@
 TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
 TOOL_DEPENDS+= ${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2
 
-# Fails without GNU msgfmt
-USE_BUILTIN.gettext=    no
 
 .include "../../lang/python/pyversion.mk"
 .include "../../x11/gtk3/buildlink3.mk"
diff -r 17ee8b1e8e7c -r 0803de533b13 misc/libmateweather/Makefile
--- a/misc/libmateweather/Makefile      Sun Aug 23 23:09:49 2020 +0000
+++ b/misc/libmateweather/Makefile      Mon Aug 24 04:41:39 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2020/08/17 20:19:33 leot Exp $
+# $NetBSD: Makefile,v 1.31 2020/08/24 04:41:40 gutteridge Exp $
 
-PKGREVISION= 3
+PKGREVISION= 4
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      libmateweather-${VERSION}
diff -r 17ee8b1e8e7c -r 0803de533b13 misc/mate-calc/Makefile
--- a/misc/mate-calc/Makefile   Sun Aug 23 23:09:49 2020 +0000
+++ b/misc/mate-calc/Makefile   Mon Aug 24 04:41:39 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2020/08/17 20:19:34 leot Exp $
+# $NetBSD: Makefile,v 1.14 2020/08/24 04:41:40 gutteridge Exp $
 
-PKGREVISION= 2
+PKGREVISION= 3
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      mate-calc-${VERSION}
diff -r 17ee8b1e8e7c -r 0803de533b13 misc/mate-utils/Makefile
--- a/misc/mate-utils/Makefile  Sun Aug 23 23:09:49 2020 +0000
+++ b/misc/mate-utils/Makefile  Mon Aug 24 04:41:39 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2020/08/17 20:19:34 leot Exp $
+# $NetBSD: Makefile,v 1.27 2020/08/24 04:41:40 gutteridge Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      mate-utils-${VERSION:R}.0
diff -r 17ee8b1e8e7c -r 0803de533b13 multimedia/mate-media/Makefile
--- a/multimedia/mate-media/Makefile    Sun Aug 23 23:09:49 2020 +0000
+++ b/multimedia/mate-media/Makefile    Mon Aug 24 04:41:39 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2020/08/17 20:19:40 leot Exp $
+# $NetBSD: Makefile,v 1.30 2020/08/24 04:41:40 gutteridge Exp $
 
-PKGREVISION= 2
+PKGREVISION= 3
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      mate-media-${VERSION:R}.0
diff -r 17ee8b1e8e7c -r 0803de533b13 net/mate-user-share/Makefile
--- a/net/mate-user-share/Makefile      Sun Aug 23 23:09:49 2020 +0000
+++ b/net/mate-user-share/Makefile      Mon Aug 24 04:41:39 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2020/08/17 20:19:48 leot Exp $
+# $NetBSD: Makefile,v 1.23 2020/08/24 04:41:40 gutteridge Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      mate-user-share-${VERSION:R}.0
diff -r 17ee8b1e8e7c -r 0803de533b13 print/atril/Makefile
--- a/print/atril/Makefile      Sun Aug 23 23:09:49 2020 +0000
+++ b/print/atril/Makefile      Mon Aug 24 04:41:39 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2020/08/17 20:19:54 leot Exp $
+# $NetBSD: Makefile,v 1.61 2020/08/24 04:41:40 gutteridge Exp $
 
-PKGREVISION= 2
+PKGREVISION= 3
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      atril-${VERSION}
diff -r 17ee8b1e8e7c -r 0803de533b13 security/mate-polkit/Makefile
--- a/security/mate-polkit/Makefile     Sun Aug 23 23:09:49 2020 +0000
+++ b/security/mate-polkit/Makefile     Mon Aug 24 04:41:39 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2020/08/17 20:19:59 leot Exp $
+# $NetBSD: Makefile,v 1.23 2020/08/24 04:41:40 gutteridge Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      mate-polkit-${VERSION:R}.0
diff -r 17ee8b1e8e7c -r 0803de533b13 sysutils/caja-dropbox/Makefile
--- a/sysutils/caja-dropbox/Makefile    Sun Aug 23 23:09:49 2020 +0000
+++ b/sysutils/caja-dropbox/Makefile    Mon Aug 24 04:41:39 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2020/08/17 20:20:03 leot Exp $
+# $NetBSD: Makefile,v 1.27 2020/08/24 04:41:41 gutteridge Exp $
 
 # Makefile.common already includes python .mk files, so need to set this here
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      caja-dropbox-${VERSION}
diff -r 17ee8b1e8e7c -r 0803de533b13 sysutils/caja-extensions/Makefile
--- a/sysutils/caja-extensions/Makefile Sun Aug 23 23:09:49 2020 +0000
+++ b/sysutils/caja-extensions/Makefile Mon Aug 24 04:41:39 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2020/08/17 20:20:03 leot Exp $
+# $NetBSD: Makefile,v 1.31 2020/08/24 04:41:41 gutteridge Exp $
 
-PKGREVISION= 3
+PKGREVISION= 4
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      caja-extensions-${VERSION}
diff -r 17ee8b1e8e7c -r 0803de533b13 sysutils/caja/Makefile
--- a/sysutils/caja/Makefile    Sun Aug 23 23:09:49 2020 +0000
+++ b/sysutils/caja/Makefile    Mon Aug 24 04:41:39 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2020/08/17 20:20:03 leot Exp $
+# $NetBSD: Makefile,v 1.29 2020/08/24 04:41:40 gutteridge Exp $
 
-PKGREVISION= 2
+PKGREVISION= 3
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      caja-${VERSION}
diff -r 17ee8b1e8e7c -r 0803de533b13 sysutils/mate-notification-daemon/Makefile
--- a/sysutils/mate-notification-daemon/Makefile        Sun Aug 23 23:09:49 2020 +0000
+++ b/sysutils/mate-notification-daemon/Makefile        Mon Aug 24 04:41:39 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2020/08/17 20:20:07 leot Exp $
+# $NetBSD: Makefile,v 1.21 2020/08/24 04:41:41 gutteridge Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      mate-notification-daemon-${VERSION:R}.0
diff -r 17ee8b1e8e7c -r 0803de533b13 sysutils/mate-power-manager/Makefile
--- a/sysutils/mate-power-manager/Makefile      Sun Aug 23 23:09:49 2020 +0000
+++ b/sysutils/mate-power-manager/Makefile      Mon Aug 24 04:41:39 2020 +0000