Sat Mar 12 07:37:42 2022 UTC ()
sysutils: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.


(nia)
diff -r1.3 -r1.4 pkgsrc/sysutils/gnome-characters/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/gnome-characters/hacks.mk
diff -r1.11 -r1.12 pkgsrc/sysutils/gnome-control-center/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/gnome-control-center/hacks.mk
diff -r1.4 -r1.5 pkgsrc/sysutils/gnome-font-viewer/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/gnome-font-viewer/hacks.mk
diff -r1.154 -r1.155 pkgsrc/sysutils/nautilus/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/nautilus/hacks.mk
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/gnome-characters/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-characters/Makefile 2021/12/08 16:06:29 1.3
+++ pkgsrc/sysutils/gnome-characters/Makefile 2022/03/12 07:37:42 1.4
@@ -1,28 +1,25 @@ @@ -1,28 +1,25 @@
1# $NetBSD: Makefile,v 1.3 2021/12/08 16:06:29 adam Exp $ 1# $NetBSD: Makefile,v 1.4 2022/03/12 07:37:42 nia Exp $
2 2
3DISTNAME= gnome-characters-3.34.0 3DISTNAME= gnome-characters-3.34.0
4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/} 4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= sysutils gnome 6CATEGORIES= sysutils gnome
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://wiki.gnome.org/Design/Apps/CharacterMap 10HOMEPAGE= https://wiki.gnome.org/Design/Apps/CharacterMap
11COMMENT= Utility application to find and insert unusual characters 11COMMENT= Utility application to find and insert unusual characters
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= pkg-config msgfmt xgettext 14USE_TOOLS+= pkg-config msgfmt xgettext
15 15
16# XXX msgfmt: unknown option -- desktop 
17_TOOLS_USE_PKGSRC.msgfmt= yes 
18 
19PYTHON_FOR_BUILD_ONLY= tool 16PYTHON_FOR_BUILD_ONLY= tool
20 17
21.include "../../devel/meson/build.mk" 18.include "../../devel/meson/build.mk"
22.include "../../devel/glib2/schemas.mk" 19.include "../../devel/glib2/schemas.mk"
23.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 20.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
24.include "../../lang/gjs/buildlink3.mk" 21.include "../../lang/gjs/buildlink3.mk"
25.include "../../sysutils/desktop-file-utils/desktopdb.mk" 22.include "../../sysutils/desktop-file-utils/desktopdb.mk"
26.include "../../textproc/libunistring/buildlink3.mk" 23.include "../../textproc/libunistring/buildlink3.mk"
27.include "../../x11/gtk3/buildlink3.mk" 24.include "../../x11/gtk3/buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/sysutils/gnome-characters/Attic/hacks.mk
# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:37:42 nia Exp $

.if !defined(GNOME_CHARACTERS_HACKS_MK)
GNOME_CHARACTERS_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_CHARACTERS_HACKS_MK
cvs diff -r1.11 -r1.12 pkgsrc/sysutils/gnome-control-center/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-control-center/Makefile 2021/12/08 16:06:29 1.11
+++ pkgsrc/sysutils/gnome-control-center/Makefile 2022/03/12 07:37:42 1.12
@@ -1,40 +1,33 @@ @@ -1,40 +1,33 @@
1# $NetBSD: Makefile,v 1.11 2021/12/08 16:06:29 adam Exp $ 1# $NetBSD: Makefile,v 1.12 2022/03/12 07:37:42 nia Exp $
2 2
3DISTNAME= gnome-control-center-40.0 3DISTNAME= gnome-control-center-40.0
4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/} 4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= sysutils gnome 6CATEGORIES= sysutils gnome
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://gitlab.gnome.org/GNOME/gnome-control-center 10HOMEPAGE= https://gitlab.gnome.org/GNOME/gnome-control-center
11COMMENT= Interface to configure various aspects of the GNOME desktop 11COMMENT= Interface to configure various aspects of the GNOME desktop
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= pkg-config msgfmt xgettext 14USE_TOOLS+= pkg-config msgfmt xgettext
15USE_TOOLS+= gdbus-codegen 15USE_TOOLS+= gdbus-codegen
16 16
17MESON_ARGS+= -Dcheese=false 17MESON_ARGS+= -Dcheese=false
18MESON_ARGS+= -Dtests=false 18MESON_ARGS+= -Dtests=false
19MESON_ARGS+= -Dwayland=false 19MESON_ARGS+= -Dwayland=false
20 20
21.include "../../mk/bsd.prefs.mk" 
22 
23# msgfmt: unknown option -- desktop 
24.if ${OPSYS} == "NetBSD" 
25TOOLS_PLATFORM.msgfmt= 
26.endif 
27 
28PYTHON_FOR_BUILD_ONLY= tool 21PYTHON_FOR_BUILD_ONLY= tool
29 22
30PKGCONFIG_OVERRIDE_STAGE= pre-install 23PKGCONFIG_OVERRIDE_STAGE= pre-install
31PKGCONFIG_OVERRIDE+= output/panels/keyboard/gnome-keybindings.pc 24PKGCONFIG_OVERRIDE+= output/panels/keyboard/gnome-keybindings.pc
32 25
33.include "../../devel/meson/build.mk" 26.include "../../devel/meson/build.mk"
34.include "../../devel/glib2/schemas.mk" 27.include "../../devel/glib2/schemas.mk"
35.include "../../audio/gsound/buildlink3.mk" 28.include "../../audio/gsound/buildlink3.mk"
36.include "../../audio/pulseaudio/buildlink3.mk" 29.include "../../audio/pulseaudio/buildlink3.mk"
37.include "../../devel/libhandy1/buildlink3.mk" 30.include "../../devel/libhandy1/buildlink3.mk"
38.include "../../graphics/colord/buildlink3.mk" 31.include "../../graphics/colord/buildlink3.mk"
39.include "../../graphics/colord-gtk/buildlink3.mk" 32.include "../../graphics/colord-gtk/buildlink3.mk"
40.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 33.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
File Added: pkgsrc/sysutils/gnome-control-center/Attic/hacks.mk
# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:37:42 nia Exp $

.if !defined(GNOME_CONTROL_CENTER_HACKS_MK)
GNOME_CONTROL_CENTER_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_CONTROL_CENTER_HACKS_MK
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/gnome-font-viewer/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-font-viewer/Makefile 2022/03/03 01:11:27 1.4
+++ pkgsrc/sysutils/gnome-font-viewer/Makefile 2022/03/12 07:37:42 1.5
@@ -1,31 +1,24 @@ @@ -1,31 +1,24 @@
1# $NetBSD: Makefile,v 1.4 2022/03/03 01:11:27 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.5 2022/03/12 07:37:42 nia Exp $
2 2
3DISTNAME= gnome-font-viewer-3.34.0 3DISTNAME= gnome-font-viewer-3.34.0
4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/} 4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= sysutils gnome 6CATEGORIES= sysutils gnome
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://gitlab.gnome.org/GNOME/gnome-font-viewer 10HOMEPAGE= https://gitlab.gnome.org/GNOME/gnome-font-viewer
11COMMENT= View fonts on your system 11COMMENT= View fonts on your system
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= pkg-config msgfmt xgettext 14USE_TOOLS+= pkg-config msgfmt xgettext
15 15
16.include "../../mk/bsd.prefs.mk" 
17 
18# msgfmt: unknown option -- xml 
19.if ${OPSYS} == "NetBSD" 
20TOOLS_PLATFORM.msgfmt= 
21.endif 
22 
23PYTHON_FOR_BUILD_ONLY= tool 16PYTHON_FOR_BUILD_ONLY= tool
24 17
25.include "../../devel/meson/build.mk" 18.include "../../devel/meson/build.mk"
26.include "../../devel/glib2/schemas.mk" 19.include "../../devel/glib2/schemas.mk"
27.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 20.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
28.include "../../sysutils/desktop-file-utils/desktopdb.mk" 21.include "../../sysutils/desktop-file-utils/desktopdb.mk"
29.include "../../x11/gnome-desktop3/buildlink3.mk" 22.include "../../x11/gnome-desktop3/buildlink3.mk"
30.include "../../x11/gtk3/buildlink3.mk" 23.include "../../x11/gtk3/buildlink3.mk"
31.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/sysutils/gnome-font-viewer/Attic/hacks.mk
# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:37:42 nia Exp $

.if !defined(GNOME_FONT_VIEWER_HACKS_MK)
GNOME_FONT_VIEWER_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_FONT_VIEWER_HACKS_MK
cvs diff -r1.154 -r1.155 pkgsrc/sysutils/nautilus/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/nautilus/Makefile 2021/12/08 16:06:34 1.154
+++ pkgsrc/sysutils/nautilus/Makefile 2022/03/12 07:37:42 1.155
@@ -1,34 +1,31 @@ @@ -1,34 +1,31 @@
1# $NetBSD: Makefile,v 1.154 2021/12/08 16:06:34 adam Exp $ 1# $NetBSD: Makefile,v 1.155 2022/03/12 07:37:42 nia Exp $
2 2
3DISTNAME= nautilus-3.38.1 3DISTNAME= nautilus-3.38.1
4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/} 4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
5PKGREVISION= 4 5PKGREVISION= 4
6CATEGORIES= sysutils gnome 6CATEGORIES= sysutils gnome
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://wiki.gnome.org/Apps/Files 10HOMEPAGE= https://wiki.gnome.org/Apps/Files
11COMMENT= Simple file manager for GNOME 11COMMENT= Simple file manager for GNOME
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= pkg-config msgfmt xgettext 14USE_TOOLS+= pkg-config msgfmt xgettext
15USE_TOOLS+= gdbus-codegen 15USE_TOOLS+= gdbus-codegen
16 16
17DEPENDS+= gnome-tracker-miners-[0-9]*:../../sysutils/gnome-tracker-miners 17DEPENDS+= gnome-tracker-miners-[0-9]*:../../sysutils/gnome-tracker-miners
18 18
19# XXX msgfmt: unknown option -- desktop 
20_TOOLS_USE_PKGSRC.msgfmt= yes 
21 
22PYTHON_FOR_BUILD_ONLY= tool 19PYTHON_FOR_BUILD_ONLY= tool
23 20
24PKGCONFIG_OVERRIDE_STAGE= pre-install 21PKGCONFIG_OVERRIDE_STAGE= pre-install
25PKGCONFIG_OVERRIDE+= output/meson-private/libnautilus-extension.pc 22PKGCONFIG_OVERRIDE+= output/meson-private/libnautilus-extension.pc
26 23
27.include "../../devel/meson/build.mk" 24.include "../../devel/meson/build.mk"
28.include "../../archivers/gnome-autoar/buildlink3.mk" 25.include "../../archivers/gnome-autoar/buildlink3.mk"
29.include "../../devel/glib2/schemas.mk" 26.include "../../devel/glib2/schemas.mk"
30.include "../../devel/gobject-introspection/buildlink3.mk" 27.include "../../devel/gobject-introspection/buildlink3.mk"
31.include "../../graphics/gexiv2/buildlink3.mk" 28.include "../../graphics/gexiv2/buildlink3.mk"
32.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 29.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
33.include "../../lang/python/tool.mk" 30.include "../../lang/python/tool.mk"
34.include "../../multimedia/gst-plugins1-base/buildlink3.mk" 31.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
File Added: pkgsrc/sysutils/nautilus/Attic/hacks.mk
# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:37:42 nia Exp $

.if !defined(NAUTILUS_HACKS_MK)
NAUTILUS_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 # NAUTILUS_HACKS_MK