Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 601651A9239 for ; Sat, 12 Mar 2022 07:06:29 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 04DD884EB5; Sat, 12 Mar 2022 07:06:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 408D784EAF for ; Sat, 12 Mar 2022 07:06:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id mvOk5bhvd-DU for ; Sat, 12 Mar 2022 07:06:27 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4057684D44 for ; Sat, 12 Mar 2022 07:06:27 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 39557FB24; Sat, 12 Mar 2022 07:06:27 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1647068787142510" MIME-Version: 1.0 Date: Sat, 12 Mar 2022 07:06:27 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/graphics To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20220312070627.39557FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1647068787142510 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sat Mar 12 07:06:27 UTC 2022 Modified Files: pkgsrc/graphics/cheese: Makefile pkgsrc/graphics/drawing: Makefile pkgsrc/graphics/eog: Makefile pkgsrc/graphics/gnome-screenshot: Makefile pkgsrc/graphics/inkscape: Makefile pkgsrc/graphics/viewnior: Makefile Added Files: pkgsrc/graphics/cheese: hacks.mk pkgsrc/graphics/drawing: hacks.mk pkgsrc/graphics/eog: hacks.mk pkgsrc/graphics/gnome-screenshot: hacks.mk pkgsrc/graphics/inkscape: hacks.mk pkgsrc/graphics/viewnior: hacks.mk Log Message: graphics: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 pkgsrc/graphics/cheese/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/cheese/hacks.mk cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/drawing/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/drawing/hacks.mk cvs rdiff -u -r1.113 -r1.114 pkgsrc/graphics/eog/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/eog/hacks.mk cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/gnome-screenshot/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/gnome-screenshot/hacks.mk cvs rdiff -u -r1.244 -r1.245 pkgsrc/graphics/inkscape/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/inkscape/hacks.mk cvs rdiff -u -r1.35 -r1.36 pkgsrc/graphics/viewnior/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/viewnior/hacks.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1647068787142510 Content-Disposition: inline Content-Length: 8208 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/cheese/Makefile diff -u pkgsrc/graphics/cheese/Makefile:1.100 pkgsrc/graphics/cheese/Makefile:1.101 --- pkgsrc/graphics/cheese/Makefile:1.100 Wed Dec 8 16:04:49 2021 +++ pkgsrc/graphics/cheese/Makefile Sat Mar 12 07:06:26 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.100 2021/12/08 16:04:49 adam Exp $ +# $NetBSD: Makefile,v 1.101 2022/03/12 07:06:26 nia Exp $ DISTNAME= cheese-3.34.0 PKGREVISION= 9 @@ -26,9 +26,6 @@ PYTHON_FOR_BUILD_ONLY= tool # https://gitlab.gnome.org/GNOME/json-glib/issues/35 MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libcheese -# XXX msgfmt: unknown option -- desktop -_TOOLS_USE_PKGSRC.msgfmt= yes - PKGCONFIG_OVERRIDE_STAGE= pre-install PKGCONFIG_OVERRIDE+= output/meson-private/cheese.pc PKGCONFIG_OVERRIDE+= output/meson-private/cheese-gtk.pc Index: pkgsrc/graphics/drawing/Makefile diff -u pkgsrc/graphics/drawing/Makefile:1.5 pkgsrc/graphics/drawing/Makefile:1.6 --- pkgsrc/graphics/drawing/Makefile:1.5 Fri Aug 13 12:08:58 2021 +++ pkgsrc/graphics/drawing/Makefile Sat Mar 12 07:06:26 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2021/08/13 12:08:58 nia Exp $ +# $NetBSD: Makefile,v 1.6 2022/03/12 07:06:26 nia Exp $ DISTNAME= drawing-0.8.3 CATEGORIES= graphics gnome @@ -15,13 +15,6 @@ DEPENDS+= gtk3+-[0-9]*:../../x11/gtk3 USE_TOOLS+= pkg-config msgfmt xgettext -.include "../../mk/bsd.prefs.mk" - -# XXX: msgfmt: unknown option -- desktop -.if ${OPSYS} == "NetBSD" -TOOLS_PLATFORM.msgfmt= -.endif - # Uses python3 command PYTHON_VERSIONS_INCOMPATIBLE= 27 Index: pkgsrc/graphics/eog/Makefile diff -u pkgsrc/graphics/eog/Makefile:1.113 pkgsrc/graphics/eog/Makefile:1.114 --- pkgsrc/graphics/eog/Makefile:1.113 Tue Mar 8 09:12:03 2022 +++ pkgsrc/graphics/eog/Makefile Sat Mar 12 07:06:26 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.113 2022/03/08 09:12:03 prlw1 Exp $ +# $NetBSD: Makefile,v 1.114 2022/03/12 07:06:26 nia Exp $ DISTNAME= eog-40.3 CATEGORIES= graphics gnome @@ -19,13 +19,6 @@ MESON_ARGS+= -Dlibportal=false LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/eog -.include "../../mk/bsd.prefs.mk" - -# msgfmt: unknown option -- desktop -.if ${OPSYS} == "NetBSD" -TOOLS_PLATFORM.msgfmt= -.endif - PYTHON_FOR_BUILD_ONLY= tool PKGCONFIG_OVERRIDE_STAGE= pre-install Index: pkgsrc/graphics/gnome-screenshot/Makefile diff -u pkgsrc/graphics/gnome-screenshot/Makefile:1.2 pkgsrc/graphics/gnome-screenshot/Makefile:1.3 --- pkgsrc/graphics/gnome-screenshot/Makefile:1.2 Wed Dec 8 16:04:55 2021 +++ pkgsrc/graphics/gnome-screenshot/Makefile Sat Mar 12 07:06:26 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2021/12/08 16:04:55 adam Exp $ +# $NetBSD: Makefile,v 1.3 2022/03/12 07:06:26 nia Exp $ DISTNAME= gnome-screenshot-3.38.0 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/} @@ -13,13 +13,6 @@ LICENSE= gnu-gpl-v2 USE_TOOLS+= pkg-config msgfmt xgettext -.include "../../mk/bsd.prefs.mk" - -# msgfmt: unknown option -- desktop -.if ${OPSYS} == "NetBSD" -TOOLS_PLATFORM.msgfmt= -.endif - PYTHON_FOR_BUILD_ONLY= tool .include "../../devel/meson/build.mk" Index: pkgsrc/graphics/inkscape/Makefile diff -u pkgsrc/graphics/inkscape/Makefile:1.244 pkgsrc/graphics/inkscape/Makefile:1.245 --- pkgsrc/graphics/inkscape/Makefile:1.244 Wed Mar 2 02:28:04 2022 +++ pkgsrc/graphics/inkscape/Makefile Sat Mar 12 07:06:26 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.244 2022/03/02 02:28:04 ryoon Exp $ +# $NetBSD: Makefile,v 1.245 2022/03/12 07:06:26 nia Exp $ DISTNAME= inkscape-1.1.2 CATEGORIES= graphics @@ -19,9 +19,6 @@ DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:. DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml DEPENDS+= ${PYPKGPREFIX}-serial-[0-9]*:../../comms/py-serial DEPENDS+= ${PYPKGPREFIX}-scour-[0-9]*:../../graphics/py-scour -# for desktop -TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools -TOOLS_PLATFORM.msgfmt= # empty WRKSRC= ${WRKDIR}/inkscape-1.1.2_2022-02-04_0a00cf5339 Index: pkgsrc/graphics/viewnior/Makefile diff -u pkgsrc/graphics/viewnior/Makefile:1.35 pkgsrc/graphics/viewnior/Makefile:1.36 --- pkgsrc/graphics/viewnior/Makefile:1.35 Wed Dec 8 16:05:07 2021 +++ pkgsrc/graphics/viewnior/Makefile Sat Mar 12 07:06:26 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2021/12/08 16:05:07 adam Exp $ +# $NetBSD: Makefile,v 1.36 2022/03/12 07:06:26 nia Exp $ DISTNAME= viewnior-1.7 PKGREVISION= 2 @@ -17,12 +17,6 @@ WRKSRC= ${WRKDIR}/Viewnior-${DISTNAME} USE_TOOLS+= pkg-config msgfmt xgettext USE_LANGUAGES= c c++ -.include "../../mk/bsd.prefs.mk" -# msgfmt: unknown option -- desktop -.if ${OPSYS} == "NetBSD" -TOOLS_PLATFORM.msgfmt= -.endif - PYTHON_FOR_BUILD_ONLY= tool .include "../../devel/meson/build.mk" Added files: Index: pkgsrc/graphics/cheese/hacks.mk diff -u /dev/null pkgsrc/graphics/cheese/hacks.mk:1.1 --- /dev/null Sat Mar 12 07:06:27 2022 +++ pkgsrc/graphics/cheese/hacks.mk Sat Mar 12 07:06:26 2022 @@ -0,0 +1,13 @@ +# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $ + +.if !defined(CHEESE_HACKS_MK) +CHEESE_HACKS_MK:= + +.include "../../mk/bsd.fast.prefs.mk" + +.if ${OPSYS} == "NetBSD" +# Old GPLv2 version of msgfmt in NetBSD does not support --desktop/--xml. +TOOLS_PLATFORM.msgfmt= # none +PKG_HACKS+= avoid-gplv2-msgfmt +.endif +.endif # CHEESE_HACKS_MK Index: pkgsrc/graphics/drawing/hacks.mk diff -u /dev/null pkgsrc/graphics/drawing/hacks.mk:1.1 --- /dev/null Sat Mar 12 07:06:27 2022 +++ pkgsrc/graphics/drawing/hacks.mk Sat Mar 12 07:06:26 2022 @@ -0,0 +1,13 @@ +# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $ + +.if !defined(DRAWING_HACKS_MK) +DRAWING_HACKS_MK:= + +.include "../../mk/bsd.fast.prefs.mk" + +.if ${OPSYS} == "NetBSD" +# Old GPLv2 version of msgfmt in NetBSD does not support --desktop/--xml. +TOOLS_PLATFORM.msgfmt= # none +PKG_HACKS+= avoid-gplv2-msgfmt +.endif +.endif # DRAWING_HACKS_MK Index: pkgsrc/graphics/eog/hacks.mk diff -u /dev/null pkgsrc/graphics/eog/hacks.mk:1.1 --- /dev/null Sat Mar 12 07:06:27 2022 +++ pkgsrc/graphics/eog/hacks.mk Sat Mar 12 07:06:26 2022 @@ -0,0 +1,13 @@ +# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $ + +.if !defined(EOG_HACKS_MK) +EOG_HACKS_MK:= + +.include "../../mk/bsd.fast.prefs.mk" + +.if ${OPSYS} == "NetBSD" +# Old GPLv2 version of msgfmt in NetBSD does not support --desktop/--xml. +TOOLS_PLATFORM.msgfmt= # none +PKG_HACKS+= avoid-gplv2-msgfmt +.endif +.endif # EOG_HACKS_MK Index: pkgsrc/graphics/gnome-screenshot/hacks.mk diff -u /dev/null pkgsrc/graphics/gnome-screenshot/hacks.mk:1.1 --- /dev/null Sat Mar 12 07:06:27 2022 +++ pkgsrc/graphics/gnome-screenshot/hacks.mk Sat Mar 12 07:06:26 2022 @@ -0,0 +1,13 @@ +# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $ + +.if !defined(GNOME_SCREENSHOT_HACKS_MK) +GNOME_SCREENSHOT_HACKS_MK:= + +.include "../../mk/bsd.fast.prefs.mk" + +.if ${OPSYS} == "NetBSD" +# Old GPLv2 version of msgfmt in NetBSD does not support --desktop/--xml. +TOOLS_PLATFORM.msgfmt= # none +PKG_HACKS+= avoid-gplv2-msgfmt +.endif +.endif # GNOME_SCREENSHOT_HACKS_MK Index: pkgsrc/graphics/inkscape/hacks.mk diff -u /dev/null pkgsrc/graphics/inkscape/hacks.mk:1.1 --- /dev/null Sat Mar 12 07:06:27 2022 +++ pkgsrc/graphics/inkscape/hacks.mk Sat Mar 12 07:06:26 2022 @@ -0,0 +1,13 @@ +# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $ + +.if !defined(INKSCAPE_HACKS_MK) +INKSCAPE_HACKS_MK:= + +.include "../../mk/bsd.fast.prefs.mk" + +.if ${OPSYS} == "NetBSD" +# Old GPLv2 version of msgfmt in NetBSD does not support --desktop/--xml. +TOOLS_PLATFORM.msgfmt= # none +PKG_HACKS+= avoid-gplv2-msgfmt +.endif +.endif # INKSCAPE_HACKS_MK Index: pkgsrc/graphics/viewnior/hacks.mk diff -u /dev/null pkgsrc/graphics/viewnior/hacks.mk:1.1 --- /dev/null Sat Mar 12 07:06:27 2022 +++ pkgsrc/graphics/viewnior/hacks.mk Sat Mar 12 07:06:26 2022 @@ -0,0 +1,13 @@ +# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $ + +.if !defined(VIEWNIOR_HACKS_MK) +VIEWNIOR_HACKS_MK:= + +.include "../../mk/bsd.fast.prefs.mk" + +.if ${OPSYS} == "NetBSD" +# Old GPLv2 version of msgfmt in NetBSD does not support --desktop/--xml. +TOOLS_PLATFORM.msgfmt= # none +PKG_HACKS+= avoid-gplv2-msgfmt +.endif +.endif # VIEWNIOR_HACKS_MK --_----------=_1647068787142510--