Sat Mar 12 08:01:53 2022 UTC ()
*: Replace per-package msgfmt hacks with msgfmt-desktop.mk


(nia)
diff -r1.167 -r1.168 pkgsrc/audio/pulseaudio/Makefile
diff -r1.1 -r0 pkgsrc/audio/pulseaudio/hacks.mk
diff -r1.16 -r1.17 pkgsrc/audio/quodlibet/Makefile
diff -r1.1 -r0 pkgsrc/audio/quodlibet/hacks.mk
diff -r1.122 -r1.123 pkgsrc/audio/sound-juicer/Makefile
diff -r1.1 -r0 pkgsrc/audio/sound-juicer/hacks.mk
diff -r1.23 -r1.24 pkgsrc/audio/speech-dispatcher/Makefile
diff -r1.62 -r1.63 pkgsrc/chat/gajim/Makefile
diff -r1.56 -r1.57 pkgsrc/chat/hexchat/Makefile
diff -r1.15 -r1.16 pkgsrc/chat/srain/Makefile
diff -r1.144 -r1.145 pkgsrc/devel/devhelp/Makefile
diff -r0 -r1.1 pkgsrc/devel/gettext-tools/msgfmt-desktop.mk
diff -r1.103 -r1.104 pkgsrc/devel/glade/Makefile
diff -r1.115 -r1.116 pkgsrc/devel/meld/Makefile
diff -r1.109 -r1.110 pkgsrc/editors/dasher/Makefile
diff -r1.1 -r0 pkgsrc/editors/dasher/hacks.mk
diff -r1.164 -r1.165 pkgsrc/editors/gedit/Makefile
diff -r1.1 -r0 pkgsrc/editors/gedit/hacks.mk
diff -r1.64 -r1.65 pkgsrc/editors/ghex/Makefile
diff -r1.1 -r0 pkgsrc/editors/ghex/hacks.mk
diff -r1.124 -r1.125 pkgsrc/fonts/fontforge/Makefile
diff -r1.4 -r0 pkgsrc/fonts/fontforge/hacks.mk
diff -r1.23 -r1.24 pkgsrc/games/chromium-bsu/Makefile
diff -r1.101 -r1.102 pkgsrc/graphics/cheese/Makefile
diff -r1.1 -r0 pkgsrc/graphics/cheese/hacks.mk
diff -r1.6 -r1.7 pkgsrc/graphics/drawing/Makefile
diff -r1.1 -r0 pkgsrc/graphics/drawing/hacks.mk
diff -r1.114 -r1.115 pkgsrc/graphics/eog/Makefile
diff -r1.1 -r0 pkgsrc/graphics/eog/hacks.mk
diff -r1.3 -r1.4 pkgsrc/graphics/gnome-screenshot/Makefile
diff -r1.1 -r0 pkgsrc/graphics/gnome-screenshot/hacks.mk
diff -r1.245 -r1.246 pkgsrc/graphics/inkscape/Makefile
diff -r1.1 -r0 pkgsrc/graphics/inkscape/hacks.mk
diff -r1.125 -r1.126 pkgsrc/graphics/shotwell/Makefile
diff -r1.36 -r1.37 pkgsrc/graphics/viewnior/Makefile
diff -r1.1 -r0 pkgsrc/graphics/viewnior/hacks.mk
diff -r1.83 -r1.84 pkgsrc/inputmethod/ibus/Makefile
diff -r1.1 -r0 pkgsrc/inputmethod/ibus/hacks.mk
diff -r1.26 -r1.27 pkgsrc/inputmethod/ibus-libpinyin/Makefile
diff -r1.1 -r0 pkgsrc/inputmethod/ibus-libpinyin/hacks.mk
diff -r1.59 -r1.60 pkgsrc/misc/orca/Makefile
diff -r1.1 -r0 pkgsrc/misc/orca/hacks.mk
diff -r1.79 -r1.80 pkgsrc/misc/yelp3/Makefile
diff -r1.1 -r0 pkgsrc/misc/yelp3/hacks.mk
diff -r1.3 -r1.4 pkgsrc/multimedia/gnome-video-effects/Makefile
diff -r1.1 -r0 pkgsrc/multimedia/gnome-video-effects/hacks.mk
diff -r1.73 -r1.74 pkgsrc/multimedia/handbrake/Makefile
diff -r1.1 -r0 pkgsrc/multimedia/handbrake/hacks.mk
diff -r1.121 -r1.122 pkgsrc/multimedia/totem/Makefile
diff -r1.1 -r0 pkgsrc/multimedia/totem/hacks.mk
diff -r1.112 -r1.113 pkgsrc/print/evince3/Makefile
diff -r1.1 -r0 pkgsrc/print/evince3/hacks.mk
diff -r1.22 -r1.23 pkgsrc/security/gcr/Makefile
diff -r1.1 -r0 pkgsrc/security/gcr/hacks.mk
diff -r1.40 -r1.41 pkgsrc/security/polkit/Makefile
diff -r1.1 -r0 pkgsrc/security/polkit/hacks.mk
diff -r1.170 -r1.171 pkgsrc/security/seahorse/Makefile
diff -r1.1 -r0 pkgsrc/security/seahorse/hacks.mk
diff -r1.4 -r1.5 pkgsrc/sysutils/gnome-characters/Makefile
diff -r1.1 -r0 pkgsrc/sysutils/gnome-characters/hacks.mk
diff -r1.12 -r1.13 pkgsrc/sysutils/gnome-control-center/Makefile
diff -r1.1 -r0 pkgsrc/sysutils/gnome-control-center/hacks.mk
diff -r1.5 -r1.6 pkgsrc/sysutils/gnome-font-viewer/Makefile
diff -r1.1 -r0 pkgsrc/sysutils/gnome-font-viewer/hacks.mk
diff -r1.155 -r1.156 pkgsrc/sysutils/nautilus/Makefile
diff -r1.1 -r0 pkgsrc/sysutils/nautilus/hacks.mk
diff -r1.7 -r1.8 pkgsrc/textproc/gnome-dictionary/Makefile
diff -r1.1 -r0 pkgsrc/textproc/gnome-dictionary/hacks.mk
diff -r1.12 -r1.13 pkgsrc/time/gnome-calendar/Makefile
diff -r1.1 -r0 pkgsrc/time/gnome-calendar/hacks.mk
diff -r1.7 -r1.8 pkgsrc/time/gnome-pomodoro/Makefile
diff -r1.1 -r0 pkgsrc/time/gnome-pomodoro/hacks.mk
diff -r1.208 -r1.209 pkgsrc/www/epiphany/Makefile
diff -r1.1 -r0 pkgsrc/www/epiphany/hacks.mk
diff -r1.207 -r1.208 pkgsrc/x11/gnome-session/Makefile
diff -r1.1 -r0 pkgsrc/x11/gnome-session/hacks.mk
diff -r1.16 -r1.17 pkgsrc/x11/gnome-shell/Makefile
diff -r1.1 -r0 pkgsrc/x11/gnome-shell/hacks.mk
diff -r1.99 -r1.100 pkgsrc/x11/gnome-terminal/Makefile
diff -r1.1 -r0 pkgsrc/x11/gnome-terminal/hacks.mk
diff -r1.42 -r1.43 pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile
diff -r1.1 -r0 pkgsrc/x11/xfce4-whiskermenu-plugin/hacks.mk
cvs diff -r1.167 -r1.168 pkgsrc/audio/pulseaudio/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/Makefile 2022/03/11 08:56:02 1.167
+++ pkgsrc/audio/pulseaudio/Makefile 2022/03/12 08:01:48 1.168
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.167 2022/03/11 08:56:02 nia Exp $ 1# $NetBSD: Makefile,v 1.168 2022/03/12 08:01:48 nia Exp $
2 2
3DISTNAME= pulseaudio-15.0 3DISTNAME= pulseaudio-15.0
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= https://freedesktop.org/software/pulseaudio/releases/ 6MASTER_SITES= https://freedesktop.org/software/pulseaudio/releases/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.freedesktop.org/wiki/Software/PulseAudio 10HOMEPAGE= https://www.freedesktop.org/wiki/Software/PulseAudio
11COMMENT= Sound server for POSIX and Win32 systems 11COMMENT= Sound server for POSIX and Win32 systems
12LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 12LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
13 13
14NOT_FOR_PLATFORM= DragonFly-*-* 14NOT_FOR_PLATFORM= DragonFly-*-*
@@ -134,19 +134,20 @@ PKG_GROUPS+= ${PULSE_GROUP_REALTIME} @@ -134,19 +134,20 @@ PKG_GROUPS+= ${PULSE_GROUP_REALTIME}
134PKG_GROUPS+= ${PULSE_GROUP_ACCESS} 134PKG_GROUPS+= ${PULSE_GROUP_ACCESS}
135PKG_USERS= ${PULSE_USER}:${PULSE_GROUP} 135PKG_USERS= ${PULSE_USER}:${PULSE_GROUP}
136 136
137BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-version-script=${WRKSRC}/src/pulse/map-file 137BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-version-script=${WRKSRC}/src/pulse/map-file
138 138
139.include "../../devel/meson/build.mk" 139.include "../../devel/meson/build.mk"
140.if ${OPSYS} != Linux && ${OPSYS} != "Darwin" 140.if ${OPSYS} != Linux && ${OPSYS} != "Darwin"
141.include "../../sysutils/consolekit/buildlink3.mk" 141.include "../../sysutils/consolekit/buildlink3.mk"
142.endif 142.endif
143.include "../../audio/libsndfile/buildlink3.mk" 143.include "../../audio/libsndfile/buildlink3.mk"
144.include "../../audio/speexdsp/buildlink3.mk" 144.include "../../audio/speexdsp/buildlink3.mk"
145.include "../../databases/tdb/buildlink3.mk" 145.include "../../databases/tdb/buildlink3.mk"
146.include "../../devel/check/buildlink3.mk" 146.include "../../devel/check/buildlink3.mk"
 147.include "../../devel/gettext-tools/msgfmt-desktop.mk"
147.include "../../devel/glib2/buildlink3.mk" 148.include "../../devel/glib2/buildlink3.mk"
148.include "../../devel/libltdl/buildlink3.mk" 149.include "../../devel/libltdl/buildlink3.mk"
149.include "../../security/openssl/buildlink3.mk" 150.include "../../security/openssl/buildlink3.mk"
150.include "../../sysutils/dbus/buildlink3.mk" 151.include "../../sysutils/dbus/buildlink3.mk"
151.include "../../mk/oss.buildlink3.mk" 152.include "../../mk/oss.buildlink3.mk"
152.include "../../mk/bsd.pkg.mk" 153.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/audio/pulseaudio/Attic/hacks.mk
cvs diff -r1.16 -r1.17 pkgsrc/audio/quodlibet/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/quodlibet/Makefile 2022/03/11 08:56:02 1.16
+++ pkgsrc/audio/quodlibet/Makefile 2022/03/12 08:01:48 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.16 2022/03/11 08:56:02 nia Exp $ 1# $NetBSD: Makefile,v 1.17 2022/03/12 08:01:48 nia Exp $
2 2
3DISTNAME= quodlibet-4.4.0 3DISTNAME= quodlibet-4.4.0
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_GITHUB:=quodlibet/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=quodlibet/}
7GITHUB_PROJECT= quodlibet 7GITHUB_PROJECT= quodlibet
8GITHUB_RELEASE= release-${PKGVERSION_NOREV} 8GITHUB_RELEASE= release-${PKGVERSION_NOREV}
9 9
10MAINTAINER= nia@NetBSD.org 10MAINTAINER= nia@NetBSD.org
11HOMEPAGE= https://quodlibet.readthedocs.io/ 11HOMEPAGE= https://quodlibet.readthedocs.io/
12COMMENT= Ex Falso / Quod Libet - Music Library / Editor / Player 12COMMENT= Ex Falso / Quod Libet - Music Library / Editor / Player
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -33,18 +33,19 @@ DEPENDS+= gst-plugins1-oss-[0-9]*:../../ @@ -33,18 +33,19 @@ DEPENDS+= gst-plugins1-oss-[0-9]*:../../
33.endif 33.endif
34 34
35USE_TOOLS+= msgfmt 35USE_TOOLS+= msgfmt
36 36
37INSTALLATION_DIRS+= ${PKGMANDIR}/man1 37INSTALLATION_DIRS+= ${PKGMANDIR}/man1
38 38
39# Requires Python 3.5 or higher 39# Requires Python 3.5 or higher
40PYTHON_VERSIONS_INCOMPATIBLE= 27 40PYTHON_VERSIONS_INCOMPATIBLE= 27
41 41
42post-install: 42post-install:
43 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/* ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 || ${TRUE} 43 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/* ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 || ${TRUE}
44 44
45.include "../../lang/python/egg.mk" 45.include "../../lang/python/egg.mk"
 46.include "../../devel/gettext-tools/msgfmt-desktop.mk"
46.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 47.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
47.include "../../multimedia/gst-plugins1-good/buildlink3.mk" 48.include "../../multimedia/gst-plugins1-good/buildlink3.mk"
48.include "../../net/libsoup/buildlink3.mk" 49.include "../../net/libsoup/buildlink3.mk"
49.include "../../sysutils/desktop-file-utils/desktopdb.mk" 50.include "../../sysutils/desktop-file-utils/desktopdb.mk"
50.include "../../mk/bsd.pkg.mk" 51.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/audio/quodlibet/Attic/hacks.mk
cvs diff -r1.122 -r1.123 pkgsrc/audio/sound-juicer/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/sound-juicer/Makefile 2022/03/11 08:56:02 1.122
+++ pkgsrc/audio/sound-juicer/Makefile 2022/03/12 08:01:48 1.123
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1# $NetBSD: Makefile,v 1.122 2022/03/11 08:56:02 nia Exp $ 1# $NetBSD: Makefile,v 1.123 2022/03/12 08:01:48 nia Exp $
2 2
3DISTNAME= sound-juicer-3.24.0 3DISTNAME= sound-juicer-3.24.0
4PKGREVISION= 12 4PKGREVISION= 12
5CATEGORIES= audio gnome 5CATEGORIES= audio gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/sound-juicer/3.24/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/sound-juicer/3.24/}
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/SoundJuicer 10HOMEPAGE= https://wiki.gnome.org/Apps/SoundJuicer
11COMMENT= CD ripping tool 11COMMENT= CD ripping tool
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 14TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
18USE_TOOLS+= pkg-config 18USE_TOOLS+= pkg-config
19USE_TOOLS+= msgfmt msgmerge xgettext itstool 19USE_TOOLS+= msgfmt msgmerge xgettext itstool
20USE_TOOLS+= gmake 20USE_TOOLS+= gmake
21 21
22.include "../../audio/libcanberra/buildlink3.mk" 22.include "../../audio/libcanberra/buildlink3.mk"
23.include "../../audio/libdiscid/buildlink3.mk" 23.include "../../audio/libdiscid/buildlink3.mk"
24.include "../../audio/libmusicbrainz5/buildlink3.mk" 24.include "../../audio/libmusicbrainz5/buildlink3.mk"
25.include "../../devel/gettext-lib/buildlink3.mk" 25.include "../../devel/gettext-lib/buildlink3.mk"
 26.include "../../devel/gettext-tools/msgfmt-desktop.mk"
26.include "../../devel/gobject-introspection/buildlink3.mk" 27.include "../../devel/gobject-introspection/buildlink3.mk"
27.include "../../devel/glib2/schemas.mk" 28.include "../../devel/glib2/schemas.mk"
28.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 29.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
29.include "../../multimedia/gstreamer1/buildlink3.mk" 30.include "../../multimedia/gstreamer1/buildlink3.mk"
30.include "../../multimedia/gst-plugins1-base/buildlink3.mk" 31.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
31.include "../../multimedia/gst-plugins1-good/buildlink3.mk" 32.include "../../multimedia/gst-plugins1-good/buildlink3.mk"
32.include "../../sysutils/brasero/buildlink3.mk" 33.include "../../sysutils/brasero/buildlink3.mk"
33.include "../../sysutils/desktop-file-utils/desktopdb.mk" 34.include "../../sysutils/desktop-file-utils/desktopdb.mk"
34.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" 35.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
35.include "../../textproc/iso-codes/buildlink3.mk" 36.include "../../textproc/iso-codes/buildlink3.mk"
36.include "../../x11/gtk3/buildlink3.mk" 37.include "../../x11/gtk3/buildlink3.mk"
37.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/audio/sound-juicer/Attic/hacks.mk
cvs diff -r1.23 -r1.24 pkgsrc/audio/speech-dispatcher/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/speech-dispatcher/Makefile 2022/03/11 08:56:02 1.23
+++ pkgsrc/audio/speech-dispatcher/Makefile 2022/03/12 08:01:52 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.23 2022/03/11 08:56:02 nia Exp $ 1# $NetBSD: Makefile,v 1.24 2022/03/12 08:01:52 nia Exp $
2 2
3DISTNAME= speech-dispatcher-0.10.2 3DISTNAME= speech-dispatcher-0.10.2
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_GITHUB:=brailcom/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=brailcom/}
7GITHUB_PROJECT= speechd 7GITHUB_PROJECT= speechd
8GITHUB_RELEASE= ${PKGVERSION_NOREV} 8GITHUB_RELEASE= ${PKGVERSION_NOREV}
9 9
10MAINTAINER= ryoon@NetBSD.org 10MAINTAINER= ryoon@NetBSD.org
11HOMEPAGE= https://devel.freebsoft.org/speechd 11HOMEPAGE= https://devel.freebsoft.org/speechd
12COMMENT= Common interface to speech synthesis library 12COMMENT= Common interface to speech synthesis library
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -71,20 +71,21 @@ REPLACE_PYTHON+= src/api/python/speechd_ @@ -71,20 +71,21 @@ REPLACE_PYTHON+= src/api/python/speechd_
71# temporary fix for GLib 2.68 breakage 71# temporary fix for GLib 2.68 breakage
72# # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1963 72# # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1963
73CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66 73CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66
74BUILDLINK_API_DEPENDS.glib2 += glib2>=2.66.0 74BUILDLINK_API_DEPENDS.glib2 += glib2>=2.66.0
75 75
76.if ${OPSYS} != "Darwin" 76.if ${OPSYS} != "Darwin"
77.include "../../audio/espeak/buildlink3.mk" 77.include "../../audio/espeak/buildlink3.mk"
78.endif 78.endif
79.include "../../audio/flite/buildlink3.mk" 79.include "../../audio/flite/buildlink3.mk"
80.include "../../audio/libao/buildlink3.mk" 80.include "../../audio/libao/buildlink3.mk"
81.include "../../audio/libsndfile/buildlink3.mk" 81.include "../../audio/libsndfile/buildlink3.mk"
82.include "../../devel/dotconf/buildlink3.mk" 82.include "../../devel/dotconf/buildlink3.mk"
83.include "../../devel/gettext-lib/buildlink3.mk" 83.include "../../devel/gettext-lib/buildlink3.mk"
 84.include "../../devel/gettext-tools/msgfmt-desktop.mk"
84.include "../../devel/glib2/buildlink3.mk" 85.include "../../devel/glib2/buildlink3.mk"
85.include "../../devel/libltdl/buildlink3.mk" 86.include "../../devel/libltdl/buildlink3.mk"
86.include "../../lang/python/application.mk" 87.include "../../lang/python/application.mk"
87.include "../../lang/python/extension.mk" 88.include "../../lang/python/extension.mk"
88.include "../../mk/dlopen.buildlink3.mk" 89.include "../../mk/dlopen.buildlink3.mk"
89BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} 90BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
90.include "../../mk/bsd.pkg.mk" 91.include "../../mk/bsd.pkg.mk"
cvs diff -r1.62 -r1.63 pkgsrc/chat/gajim/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/gajim/Makefile 2022/03/04 09:34:29 1.62
+++ pkgsrc/chat/gajim/Makefile 2022/03/12 08:01:53 1.63
@@ -1,48 +1,43 @@ @@ -1,48 +1,43 @@
1# $NetBSD: Makefile,v 1.62 2022/03/04 09:34:29 nia Exp $ 1# $NetBSD: Makefile,v 1.63 2022/03/12 08:01:53 nia Exp $
2 2
3DISTNAME= gajim-1.3.3 3DISTNAME= gajim-1.3.3
4CATEGORIES= chat 4CATEGORIES= chat
5MASTER_SITES= https://www.gajim.org/downloads/${PKGVERSION_NOREV:R}/ 5MASTER_SITES= https://www.gajim.org/downloads/${PKGVERSION_NOREV:R}/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.gajim.org/ 8HOMEPAGE= http://www.gajim.org/
9COMMENT= XMPP/Jabber chat client written in Python/GTK3 9COMMENT= XMPP/Jabber chat client written in Python/GTK3
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
11 11
12WRKSRC= ${WRKDIR}/gajim-gajim-${PKGVERSION_NOREV} 12WRKSRC= ${WRKDIR}/gajim-gajim-${PKGVERSION_NOREV}
13 13
14USE_TOOLS+= gettext 14USE_TOOLS+= gettext
15 15
16USE_PKG_RESOURCES= yes 16USE_PKG_RESOURCES= yes
17 17
18.include "../../mk/bsd.prefs.mk" 
19 
20.if ${OPSYS} == "NetBSD" 
21# needs --desktop 
22TOOLS_PLATFORM.msgfmt= 
23.endif 
24 
25MANCOMPRESSED= yes 18MANCOMPRESSED= yes
26MAKE_ENV+= PKGMANDIR=${PKGMANDIR} 19MAKE_ENV+= PKGMANDIR=${PKGMANDIR}
27 20
28PYTHON_VERSIONS_INCOMPATIBLE= 27 21PYTHON_VERSIONS_INCOMPATIBLE= 27
29 22
30DEPENDS+= ${PYPKGPREFIX}-cairo>=1.16.0:../../graphics/py-cairo 23DEPENDS+= ${PYPKGPREFIX}-cairo>=1.16.0:../../graphics/py-cairo
31DEPENDS+= ${PYPKGPREFIX}-css-parser-[0-9]*:../../textproc/py-css-parser 24DEPENDS+= ${PYPKGPREFIX}-css-parser-[0-9]*:../../textproc/py-css-parser
32DEPENDS+= ${PYPKGPREFIX}-keyring-[0-9]*:../../security/py-keyring 25DEPENDS+= ${PYPKGPREFIX}-keyring-[0-9]*:../../security/py-keyring
33DEPENDS+= ${PYPKGPREFIX}-nbxmpp>=2.0.1:../../chat/py-nbxmpp 26DEPENDS+= ${PYPKGPREFIX}-nbxmpp>=2.0.1:../../chat/py-nbxmpp
34DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging 27DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
35DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL 28DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
36DEPENDS+= ${PYPKGPREFIX}-precis-i18n-[0-9]*:../../textproc/py-precis-i18n 29DEPENDS+= ${PYPKGPREFIX}-precis-i18n-[0-9]*:../../textproc/py-precis-i18n
37DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 30DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
38 31
39.include "../../mk/bsd.prefs.mk" 32.include "../../mk/bsd.prefs.mk"
 33
40.if ${OPSYS} == "Darwin" 34.if ${OPSYS} == "Darwin"
41DEPENDS+= ${PYPKGPREFIX}-pyobjc-framework-Cocoa-[0-9]*:../../devel/py-pyobjc-framework-Cocoa 35DEPENDS+= ${PYPKGPREFIX}-pyobjc-framework-Cocoa-[0-9]*:../../devel/py-pyobjc-framework-Cocoa
42.endif 36.endif
43 37
44.include "options.mk" 38.include "options.mk"
 39.include "../../devel/gettext-tools/msgfmt-desktop.mk"
45.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 40.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
46.include "../../lang/python/egg.mk" 41.include "../../lang/python/egg.mk"
47.include "../../x11/gtk3/buildlink3.mk" 42.include "../../x11/gtk3/buildlink3.mk"
48.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"
cvs diff -r1.56 -r1.57 pkgsrc/chat/hexchat/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/hexchat/Makefile 2022/03/04 07:48:16 1.56
+++ pkgsrc/chat/hexchat/Makefile 2022/03/12 08:01:53 1.57
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.56 2022/03/04 07:48:16 nia Exp $ 1# $NetBSD: Makefile,v 1.57 2022/03/12 08:01:53 nia Exp $
2 2
3DISTNAME= hexchat-2.16.1 3DISTNAME= hexchat-2.16.1
4CATEGORIES= chat 4CATEGORIES= chat
5MASTER_SITES= https://dl.hexchat.net/hexchat/ 5MASTER_SITES= https://dl.hexchat.net/hexchat/
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://hexchat.github.io/ 9HOMEPAGE= https://hexchat.github.io/
10COMMENT= IRC client based on XChat 10COMMENT= IRC client based on XChat
11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit 11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit
12 12
13USE_TOOLS+= pkg-config msgfmt xgettext 13USE_TOOLS+= pkg-config msgfmt xgettext
14 14
@@ -17,34 +17,29 @@ USE_LANGUAGES= c c++ @@ -17,34 +17,29 @@ USE_LANGUAGES= c c++
17MESON_ARGS+= -Dtext-frontend=true 17MESON_ARGS+= -Dtext-frontend=true
18MESON_ARGS+= -Dinstall-appdata=false 18MESON_ARGS+= -Dinstall-appdata=false
19 19
20REPLACE_PYTHON+= plugins/perl/generate_header.py 20REPLACE_PYTHON+= plugins/perl/generate_header.py
21REPLACE_PYTHON+= src/common/make-te.py 21REPLACE_PYTHON+= src/common/make-te.py
22 22
23OPSYSVARS+= SOEXT 23OPSYSVARS+= SOEXT
24SOEXT.Darwin= dylib 24SOEXT.Darwin= dylib
25SOEXT.*= so 25SOEXT.*= so
26PLIST_SUBST+= SOEXT=${SOEXT} 26PLIST_SUBST+= SOEXT=${SOEXT}
27 27
28LDFLAGS.SunOS+= -lsocket -lnsl 28LDFLAGS.SunOS+= -lsocket -lnsl
29 29
30.include "../../mk/bsd.prefs.mk" 
31.if ${OPSYS} == "NetBSD" 
32# msgfmt: unknown option -- xml 
33TOOLS_PLATFORM.msgfmt= 
34.endif 
35 
36PKGCONFIG_OVERRIDE+= data/pkgconfig/hexchat-plugin.pc.in 30PKGCONFIG_OVERRIDE+= data/pkgconfig/hexchat-plugin.pc.in
37 31
38.include "options.mk" 32.include "options.mk"
39.include "../../devel/meson/build.mk" 33.include "../../devel/meson/build.mk"
40.include "../../converters/libiconv/buildlink3.mk" 34.include "../../converters/libiconv/buildlink3.mk"
 35.include "../../devel/gettext-tools/msgfmt-desktop.mk"
41.include "../../devel/glib2/buildlink3.mk" 36.include "../../devel/glib2/buildlink3.mk"
42.include "../../devel/pango/buildlink3.mk" 37.include "../../devel/pango/buildlink3.mk"
43# Whether Python is required strictly as a build tool or also at runtime is 38# Whether Python is required strictly as a build tool or also at runtime is
44# determined in options.mk, and PYTHON_FOR_BUILD_ONLY is set there, if needed. 39# determined in options.mk, and PYTHON_FOR_BUILD_ONLY is set there, if needed.
45.include "../../lang/python/tool.mk" 40.include "../../lang/python/tool.mk"
46.include "../../textproc/iso-codes/buildlink3.mk" 41.include "../../textproc/iso-codes/buildlink3.mk"
47.include "../../textproc/libxml2/buildlink3.mk" 42.include "../../textproc/libxml2/buildlink3.mk"
48.include "../../mk/dlopen.buildlink3.mk" 43.include "../../mk/dlopen.buildlink3.mk"
49.include "../../mk/pthread.buildlink3.mk" 44.include "../../mk/pthread.buildlink3.mk"
50.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/chat/srain/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/srain/Makefile 2022/03/04 08:10:10 1.15
+++ pkgsrc/chat/srain/Makefile 2022/03/12 08:01:53 1.16
@@ -1,51 +1,45 @@ @@ -1,51 +1,45 @@
1# $NetBSD: Makefile,v 1.15 2022/03/04 08:10:10 nia Exp $ 1# $NetBSD: Makefile,v 1.16 2022/03/12 08:01:53 nia Exp $
2 2
3DISTNAME= srain-1.3.2 3DISTNAME= srain-1.3.2
4CATEGORIES= chat 4CATEGORIES= chat
5MASTER_SITES= ${MASTER_SITE_GITHUB:=SrainApp/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=SrainApp/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://srain.im/ 8HOMEPAGE= https://srain.im/
9COMMENT= Modern IRC client written in GTK 9COMMENT= Modern IRC client written in GTK
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
11 11
12USE_TOOLS+= pkg-config 12USE_TOOLS+= pkg-config
13USE_TOOLS+= msgfmt msgmerge xgettext 13USE_TOOLS+= msgfmt msgmerge xgettext
14 14
15MESON_ARGS+= -Ddoc_builders=man 15MESON_ARGS+= -Ddoc_builders=man
16 16
17OWN_DIRS+= ${PKG_SYSCONFDIR}/srain 17OWN_DIRS+= ${PKG_SYSCONFDIR}/srain
18 18
19EGDIR= ${PREFIX}/share/examples/srain 19EGDIR= ${PREFIX}/share/examples/srain
20CONF_FILES= ${EGDIR}/builtin.cfg ${PKG_SYSCONFDIR}/srain/builtin.cfg 20CONF_FILES= ${EGDIR}/builtin.cfg ${PKG_SYSCONFDIR}/srain/builtin.cfg
21 21
22.include "../../mk/bsd.prefs.mk" 
23 
24# msgfmt: unknown option -- desktop 
25.if ${OPSYS} == "NetBSD" 
26TOOLS_PLATFORM.msgfmt= 
27.endif 
28 
29SUBST_CLASSES+= sphinx 22SUBST_CLASSES+= sphinx
30SUBST_STAGE.sphinx= pre-configure 23SUBST_STAGE.sphinx= pre-configure
31SUBST_FILES.sphinx= doc/meson.build 24SUBST_FILES.sphinx= doc/meson.build
32SUBST_MESSAGE.sphinx= Fixing sphinx binary name. 25SUBST_MESSAGE.sphinx= Fixing sphinx binary name.
33SUBST_SED.sphinx+= -e "s,sphinx-build,sphinx-build-${PYVERSSUFFIX}," 26SUBST_SED.sphinx+= -e "s,sphinx-build,sphinx-build-${PYVERSSUFFIX},"
34 27
35PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool 28PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
36 29
37PYTHON_FOR_BUILD_ONLY= tool 30PYTHON_FOR_BUILD_ONLY= tool
38 31
39post-install: 32post-install:
40 ${RM} -f ${DESTDIR}${PREFIX}/share/srain/themes/meson.build 33 ${RM} -f ${DESTDIR}${PREFIX}/share/srain/themes/meson.build
41 34
42.include "../../devel/meson/build.mk" 35.include "../../devel/meson/build.mk"
 36.include "../../devel/gettext-tools/msgfmt-desktop.mk"
43.include "../../devel/libconfig/buildlink3.mk" 37.include "../../devel/libconfig/buildlink3.mk"
44.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 38.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
45.include "../../lang/python/versioned_dependencies.mk" 39.include "../../lang/python/versioned_dependencies.mk"
46.include "../../net/libsoup/buildlink3.mk" 40.include "../../net/libsoup/buildlink3.mk"
47.include "../../security/libsecret/buildlink3.mk" 41.include "../../security/libsecret/buildlink3.mk"
48.include "../../security/openssl/buildlink3.mk" 42.include "../../security/openssl/buildlink3.mk"
49.include "../../sysutils/desktop-file-utils/desktopdb.mk" 43.include "../../sysutils/desktop-file-utils/desktopdb.mk"
50.include "../../x11/gtk3/buildlink3.mk" 44.include "../../x11/gtk3/buildlink3.mk"
51.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"
cvs diff -r1.144 -r1.145 pkgsrc/devel/devhelp/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/devhelp/Makefile 2021/12/08 16:03:55 1.144
+++ pkgsrc/devel/devhelp/Makefile 2022/03/12 08:01:52 1.145
@@ -1,37 +1,35 @@ @@ -1,37 +1,35 @@
1# $NetBSD: Makefile,v 1.144 2021/12/08 16:03:55 adam Exp $ 1# $NetBSD: Makefile,v 1.145 2022/03/12 08:01:52 nia Exp $
2 2
3DISTNAME= devhelp-3.34.0 3DISTNAME= devhelp-3.34.0
4PKGREVISION= 9 4PKGREVISION= 9
5CATEGORIES= devel gnome 5CATEGORIES= devel gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/devhelp/3.34/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/devhelp/3.34/}
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/Devhelp 10HOMEPAGE= https://wiki.gnome.org/Apps/Devhelp
11COMMENT= Tool for browsing and searching API documentation from GNOME 11COMMENT= Tool for browsing and searching API documentation from GNOME
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14USE_TOOLS+= pkg-config msgfmt xgettext itstool 14USE_TOOLS+= pkg-config msgfmt xgettext itstool
15 15
16# workaround for build failure 16# workaround for build failure
17# https://gitlab.gnome.org/GNOME/json-glib/issues/35 17# https://gitlab.gnome.org/GNOME/json-glib/issues/35
18MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/devhelp 18MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/devhelp
19 19
20PYTHON_FOR_BUILD_ONLY= tool 20PYTHON_FOR_BUILD_ONLY= tool
21 21
22# XXX msgfmt: unknown option -- xml 
23_TOOLS_USE_PKGSRC.msgfmt= yes 
24 
25PKGCONFIG_OVERRIDE_STAGE= pre-install 22PKGCONFIG_OVERRIDE_STAGE= pre-install
26PKGCONFIG_OVERRIDE+= output/meson-private/libdevhelp-3.0.pc 23PKGCONFIG_OVERRIDE+= output/meson-private/libdevhelp-3.0.pc
27 24
28.include "../../devel/meson/build.mk" 25.include "../../devel/meson/build.mk"
29.include "../../devel/amtk/buildlink3.mk" 26.include "../../devel/amtk/buildlink3.mk"
 27.include "../../devel/gettext-tools/msgfmt-desktop.mk"
30.include "../../devel/gobject-introspection/buildlink3.mk" 28.include "../../devel/gobject-introspection/buildlink3.mk"
31.include "../../devel/glib2/schemas.mk" 29.include "../../devel/glib2/schemas.mk"
32.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 30.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
33.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" 31.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
34.include "../../sysutils/desktop-file-utils/desktopdb.mk" 32.include "../../sysutils/desktop-file-utils/desktopdb.mk"
35.include "../../www/webkit-gtk/buildlink3.mk" 33.include "../../www/webkit-gtk/buildlink3.mk"
36.include "../../x11/gtk3/buildlink3.mk" 34.include "../../x11/gtk3/buildlink3.mk"
37.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/devel/gettext-tools/msgfmt-desktop.mk
# $NetBSD: msgfmt-desktop.mk,v 1.1 2022/03/12 08:01:48 nia Exp $

.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
.endif
cvs diff -r1.103 -r1.104 pkgsrc/devel/glade/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/glade/Makefile 2021/12/08 16:01:52 1.103
+++ pkgsrc/devel/glade/Makefile 2022/03/12 08:01:53 1.104
@@ -1,31 +1,29 @@ @@ -1,31 +1,29 @@
1# $NetBSD: Makefile,v 1.103 2021/12/08 16:01:52 adam Exp $ 1# $NetBSD: Makefile,v 1.104 2022/03/12 08:01:53 nia Exp $
2 2
3DISTNAME= glade-3.36.0 3DISTNAME= glade-3.36.0
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glade/3.36/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glade/3.36/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://glade.gnome.org/ 10HOMEPAGE= https://glade.gnome.org/
11COMMENT= User interface builder for the GTK3+ toolkit 11COMMENT= User interface builder for the GTK3+ toolkit
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 14TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
15BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 15BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= pkg-config intltool gmake msgfmt 19USE_TOOLS+= pkg-config intltool gmake msgfmt
20USE_TOOLS+= itstool 20USE_TOOLS+= itstool
21 21
22# Requires --xml in msgfmt. 
23_TOOLS_USE_PKGSRC.msgfmt= yes 
24 
25PKGCONFIG_OVERRIDE+= data/gladeui-2.0.pc.in 22PKGCONFIG_OVERRIDE+= data/gladeui-2.0.pc.in
26 23
 24.include "../../devel/gettext-tools/msgfmt-desktop.mk"
27.include "../../x11/gtk3/buildlink3.mk" 25.include "../../x11/gtk3/buildlink3.mk"
28.include "../../textproc/libxml2/buildlink3.mk" 26.include "../../textproc/libxml2/buildlink3.mk"
29.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 27.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
30.include "../../sysutils/desktop-file-utils/desktopdb.mk" 28.include "../../sysutils/desktop-file-utils/desktopdb.mk"
31.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.115 -r1.116 pkgsrc/devel/meld/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/meld/Makefile 2022/01/10 08:21:09 1.115
+++ pkgsrc/devel/meld/Makefile 2022/03/12 08:01:53 1.116
@@ -1,37 +1,34 @@ @@ -1,37 +1,34 @@
1# $NetBSD: Makefile,v 1.115 2022/01/10 08:21:09 wiz Exp $ 1# $NetBSD: Makefile,v 1.116 2022/03/12 08:01:53 nia Exp $
2 2
3DISTNAME= meld-3.21.1 3DISTNAME= meld-3.21.1
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/${PKGVERSION_NOREV:R}/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/${PKGVERSION_NOREV:R}/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= wiz@NetBSD.org 8MAINTAINER= wiz@NetBSD.org
9HOMEPAGE= https://meldmerge.org/ 9HOMEPAGE= https://meldmerge.org/
10COMMENT= Visual diff and merge tool 10COMMENT= Visual diff and merge tool
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13BUILD_DEPENDS+= ${PYPKGPREFIX}-distro-[0-9]*:../../devel/py-distro 13BUILD_DEPENDS+= ${PYPKGPREFIX}-distro-[0-9]*:../../devel/py-distro
14DEPENDS+= ${PYPKGPREFIX}-gobject3>=3.30:../../devel/py-gobject3 14DEPENDS+= ${PYPKGPREFIX}-gobject3>=3.30:../../devel/py-gobject3
15DEPENDS+= gsettings-desktop-schemas-[0-9]*:../../sysutils/gsettings-desktop-schemas 15DEPENDS+= gsettings-desktop-schemas-[0-9]*:../../sysutils/gsettings-desktop-schemas
16DEPENDS+= dconf-[0-9]*:../../devel/dconf 16DEPENDS+= dconf-[0-9]*:../../devel/dconf
17 17
18USE_TOOLS+= msgfmt pkg-config itstool 18USE_TOOLS+= msgfmt pkg-config itstool
19# only used when building the python way (not meson) 19# only used when building the python way (not meson)
20USE_TOOLS+= intltool 20USE_TOOLS+= intltool
21 21
22# Requires --desktop in msgfmt. 
23_TOOLS_USE_PKGSRC.msgfmt= yes 
24 
25SUBST_CLASSES+= python3 22SUBST_CLASSES+= python3
26SUBST_FILES.python3= meson.build 23SUBST_FILES.python3= meson.build
27SUBST_SED.python3= -e "s,python.find_installation('python3',python.find_installation('${PYTHONBIN}'," 24SUBST_SED.python3= -e "s,python.find_installation('python3',python.find_installation('${PYTHONBIN}',"
28SUBST_SED.python3+= -e "s,'python3','python-${PYVERSSUFFIX}'," 25SUBST_SED.python3+= -e "s,'python3','python-${PYVERSSUFFIX}',"
29SUBST_STAGE.python3= pre-configure 26SUBST_STAGE.python3= pre-configure
30SUBST_MESSAGE.python3= Fix python binary name. 27SUBST_MESSAGE.python3= Fix python binary name.
31 28
32# Compiled files are not installed, see 29# Compiled files are not installed, see
33# https://gitlab.gnome.org/GNOME/meld/-/issues/456 30# https://gitlab.gnome.org/GNOME/meld/-/issues/456
34# post-install: 31# post-install:
35# something like: 32# something like:
36# python -m compileall "$pkgdir"/path/to/python3/files 33# python -m compileall "$pkgdir"/path/to/python3/files
37 34
@@ -41,25 +38,26 @@ REPLACE_PYTHON+= bin/meld @@ -41,25 +38,26 @@ REPLACE_PYTHON+= bin/meld
41 38
42SUBST_CLASSES+= man 39SUBST_CLASSES+= man
43SUBST_FILES.man= setup.py 40SUBST_FILES.man= setup.py
44SUBST_SED.man+= -e "s,share/man/man1,${PKGMANDIR}/man1," 41SUBST_SED.man+= -e "s,share/man/man1,${PKGMANDIR}/man1,"
45SUBST_STAGE.man= pre-build 42SUBST_STAGE.man= pre-build
46SUBST_MESSAGE.man= Fixing man page installation path. 43SUBST_MESSAGE.man= Fixing man page installation path.
47 44
48.include "../../devel/py-gobject3-common/buildlink3.mk" 45.include "../../devel/py-gobject3-common/buildlink3.mk"
49.include "../../graphics/adwaita-icon-theme/buildlink3.mk" 46.include "../../graphics/adwaita-icon-theme/buildlink3.mk"
50.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 47.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
51BUILDLINK_API_DEPENDS.py-cairo+= ${PYPKGPREFIX}-cairo>=1.15.0 48BUILDLINK_API_DEPENDS.py-cairo+= ${PYPKGPREFIX}-cairo>=1.15.0
52.include "../../graphics/py-cairo/buildlink3.mk" 49.include "../../graphics/py-cairo/buildlink3.mk"
53.include "../../sysutils/desktop-file-utils/desktopdb.mk" 50.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 51.include "../../devel/gettext-tools/msgfmt-desktop.mk"
54BUILDLINK_API_DEPENDS.glib2+= glib2>=2.48.0 52BUILDLINK_API_DEPENDS.glib2+= glib2>=2.48.0
55.include "../../devel/glib2/buildlink3.mk" 53.include "../../devel/glib2/buildlink3.mk"
56.include "../../devel/glib2/schemas.mk" 54.include "../../devel/glib2/schemas.mk"
57BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.20 55BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.20
58.include "../../lang/python/application.mk" 56.include "../../lang/python/application.mk"
59.include "../../x11/gtk3/buildlink3.mk" 57.include "../../x11/gtk3/buildlink3.mk"
60BUILDLINK_API_DEPENDS.gtksourceview4?= gtksourceview4>=4.6.0nb1 58BUILDLINK_API_DEPENDS.gtksourceview4?= gtksourceview4>=4.6.0nb1
61.include "../../x11/gtksourceview4/buildlink3.mk" 59.include "../../x11/gtksourceview4/buildlink3.mk"
62.include "../../lang/python/egg.mk" 60.include "../../lang/python/egg.mk"
63# not ready yet as of 3.21.0 61# not ready yet as of 3.21.0
64#.include "../../devel/meson/build.mk" 62#.include "../../devel/meson/build.mk"
65.include "../../mk/bsd.pkg.mk" 63.include "../../mk/bsd.pkg.mk"
cvs diff -r1.109 -r1.110 pkgsrc/editors/dasher/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/dasher/Makefile 2022/03/11 08:59:27 1.109
+++ pkgsrc/editors/dasher/Makefile 2022/03/12 08:01:48 1.110
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.109 2022/03/11 08:59:27 nia Exp $ 1# $NetBSD: Makefile,v 1.110 2022/03/12 08:01:48 nia Exp $
2 2
3DISTNAME= dasher-5.0.0.b20200225 3DISTNAME= dasher-5.0.0.b20200225
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= editors gnome 5CATEGORIES= editors gnome
6MASTER_SITES= ${MASTER_SITE_GITHUB:=dasher-project/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=dasher-project/}
7GITHUB_TAG= e03b0dbf1f1132e83645ff78c92efd63fca5a812 7GITHUB_TAG= e03b0dbf1f1132e83645ff78c92efd63fca5a812
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.inference.phy.cam.ac.uk/dasher/ 10HOMEPAGE= http://www.inference.phy.cam.ac.uk/dasher/
11COMMENT= Easy typing without using keyboard 11COMMENT= Easy typing without using keyboard
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14TOOL_DEPENDS+= yelp-tools-[0-9]*:../../textproc/yelp-tools 14TOOL_DEPENDS+= yelp-tools-[0-9]*:../../textproc/yelp-tools
@@ -19,17 +19,18 @@ USE_LANGUAGES= c c++ @@ -19,17 +19,18 @@ USE_LANGUAGES= c c++
19 19
20USE_TOOLS+= autoreconf autoconf automake autopoint msgfmt 20USE_TOOLS+= autoreconf autoconf automake autopoint msgfmt
21USE_TOOLS+= pkg-config 21USE_TOOLS+= pkg-config
22 22
23# Workaround for glib2-2.68.0 c++ fallout. 23# Workaround for glib2-2.68.0 c++ fallout.
24CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66 24CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66
25 25
26pre-configure: 26pre-configure:
27 # tries to invoke git for something, probably fetching the ref 27 # tries to invoke git for something, probably fetching the ref
28 ${ECHO} "true" > ${WRKSRC}/build-aux/mkversion 28 ${ECHO} "true" > ${WRKSRC}/build-aux/mkversion
29 cd ${WRKSRC} && autoreconf -fi 29 cd ${WRKSRC} && autoreconf -fi
30 30
31.include "../../audio/speech-dispatcher/buildlink3.mk" 31.include "../../audio/speech-dispatcher/buildlink3.mk"
 32.include "../../devel/gettext-tools/msgfmt-desktop.mk"
32.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 33.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
33.include "../../sysutils/desktop-file-utils/buildlink3.mk" 34.include "../../sysutils/desktop-file-utils/buildlink3.mk"
34.include "../../x11/gtk3/buildlink3.mk" 35.include "../../x11/gtk3/buildlink3.mk"
35.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/editors/dasher/Attic/hacks.mk
cvs diff -r1.164 -r1.165 pkgsrc/editors/gedit/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/gedit/Makefile 2022/03/11 08:59:27 1.164
+++ pkgsrc/editors/gedit/Makefile 2022/03/12 08:01:49 1.165
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.164 2022/03/11 08:59:27 nia Exp $ 1# $NetBSD: Makefile,v 1.165 2022/03/12 08:01:49 nia Exp $
2 2
3DISTNAME= gedit-3.36.2 3DISTNAME= gedit-3.36.2
4PKGREVISION= 7 4PKGREVISION= 7
5CATEGORIES= editors gnome 5CATEGORIES= editors gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gedit/${PKGVERSION_NOREV:R}/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gedit/${PKGVERSION_NOREV:R}/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= prlw1@cam.ac.uk 9MAINTAINER= prlw1@cam.ac.uk
10HOMEPAGE= https://wiki.gnome.org/Apps/Gedit 10HOMEPAGE= https://wiki.gnome.org/Apps/Gedit
11COMMENT= Lightweight GNOME UTF-8 text editor 11COMMENT= Lightweight GNOME UTF-8 text editor
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PREV_PKGPATH= editors/gedit3 14PREV_PKGPATH= editors/gedit3
@@ -22,26 +22,27 @@ REPLACE_PYTHON+= plugins/externaltools/ @@ -22,26 +22,27 @@ REPLACE_PYTHON+= plugins/externaltools/
22REPLACE_PYTHON+= build-aux/meson/post_install.py 22REPLACE_PYTHON+= build-aux/meson/post_install.py
23 23
24MESON_ARGS+= -Dvapi=false 24MESON_ARGS+= -Dvapi=false
25MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gedit 25MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gedit
26 26
27DEPENDS+= adwaita-icon-theme-[0-9]*:../../graphics/adwaita-icon-theme 27DEPENDS+= adwaita-icon-theme-[0-9]*:../../graphics/adwaita-icon-theme
28DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 28DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
29 29
30pre-configure: 30pre-configure:
31 ${FIND} ${WRKSRC}/help -type f -exec ${CHMOD} 644 {} \; 31 ${FIND} ${WRKSRC}/help -type f -exec ${CHMOD} 644 {} \;
32 32
33 33
34.include "../../devel/gobject-introspection/buildlink3.mk" 34.include "../../devel/gobject-introspection/buildlink3.mk"
 35.include "../../devel/gettext-tools/msgfmt-desktop.mk"
35BUILDLINK_API_DEPENDS.libpeas+= libpeas>=1.14.1 36BUILDLINK_API_DEPENDS.libpeas+= libpeas>=1.14.1
36.include "../../devel/libpeas/buildlink3.mk" 37.include "../../devel/libpeas/buildlink3.mk"
37BUILDLINK_API_DEPENDS.glib2+= glib2>=2.52 38BUILDLINK_API_DEPENDS.glib2+= glib2>=2.52
38.include "../../devel/glib2/schemas.mk" 39.include "../../devel/glib2/schemas.mk"
39.include "../../devel/meson/build.mk" 40.include "../../devel/meson/build.mk"
40.include "../../editors/tepl4/buildlink3.mk" 41.include "../../editors/tepl4/buildlink3.mk"
41.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 42.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
42.include "../../sysutils/desktop-file-utils/desktopdb.mk" 43.include "../../sysutils/desktop-file-utils/desktopdb.mk"
43.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" 44.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
44.include "../../textproc/gspell/buildlink3.mk" 45.include "../../textproc/gspell/buildlink3.mk"
45BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.22 46BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.22
46.include "../../x11/gtk3/buildlink3.mk" 47.include "../../x11/gtk3/buildlink3.mk"
47BUILDLINK_API_DEPENDS.gtksourceview4+= gtksourceview4>=4.0.2 48BUILDLINK_API_DEPENDS.gtksourceview4+= gtksourceview4>=4.0.2
File Deleted: pkgsrc/editors/gedit/Attic/hacks.mk
cvs diff -r1.64 -r1.65 pkgsrc/editors/ghex/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/ghex/Makefile 2022/03/11 08:59:27 1.64
+++ pkgsrc/editors/ghex/Makefile 2022/03/12 08:01:49 1.65
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.64 2022/03/11 08:59:27 nia Exp $ 1# $NetBSD: Makefile,v 1.65 2022/03/12 08:01:49 nia Exp $
2 2
3DISTNAME= ghex-3.18.4 3DISTNAME= ghex-3.18.4
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= editors gnome 5CATEGORIES= editors gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ghex/3.18/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ghex/3.18/}
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/Ghex 10HOMEPAGE= https://wiki.gnome.org/Apps/Ghex
11COMMENT= Hex editor 11COMMENT= Hex editor
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= pkg-config msgfmt itstool 14USE_TOOLS+= pkg-config msgfmt itstool
15 15
16PYTHON_FOR_BUILD_ONLY= tool 16PYTHON_FOR_BUILD_ONLY= tool
17 17
18PKGCONFIG_OVERRIDE_STAGE= pre-install 18PKGCONFIG_OVERRIDE_STAGE= pre-install
19PKGCONFIG_OVERRIDE+= output/data/gtkhex-3.pc 19PKGCONFIG_OVERRIDE+= output/data/gtkhex-3.pc
20 20
21.include "../../devel/meson/build.mk" 21.include "../../devel/meson/build.mk"
 22.include "../../devel/gettext-tools/msgfmt-desktop.mk"
22.include "../../devel/glib2/schemas.mk" 23.include "../../devel/glib2/schemas.mk"
23.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 24.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
24.include "../../sysutils/desktop-file-utils/desktopdb.mk" 25.include "../../sysutils/desktop-file-utils/desktopdb.mk"
25.include "../../x11/gtk3/buildlink3.mk" 26.include "../../x11/gtk3/buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/editors/ghex/Attic/hacks.mk
cvs diff -r1.124 -r1.125 pkgsrc/fonts/fontforge/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/fontforge/Makefile 2022/03/11 09:01:02 1.124
+++ pkgsrc/fonts/fontforge/Makefile 2022/03/12 08:01:49 1.125
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.124 2022/03/11 09:01:02 nia Exp $ 1# $NetBSD: Makefile,v 1.125 2022/03/12 08:01:49 nia Exp $
2 2
3DISTNAME= fontforge-20201107 3DISTNAME= fontforge-20201107
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= fonts editors 5CATEGORIES= fonts editors
6MASTER_SITES= ${MASTER_SITE_GITHUB:=fontforge/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=fontforge/}
7GITHUB_PROJECT= fontforge 7GITHUB_PROJECT= fontforge
8GITHUB_RELEASE= ${PKGVERSION_NOREV} 8GITHUB_RELEASE= ${PKGVERSION_NOREV}
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= adam@NetBSD.org 11MAINTAINER= adam@NetBSD.org
12HOMEPAGE= https://fontforge.github.io/ 12HOMEPAGE= https://fontforge.github.io/
13COMMENT= Postscript font editor 13COMMENT= Postscript font editor
14LICENSE= modified-bsd 14LICENSE= modified-bsd
@@ -27,26 +27,27 @@ CMAKE_ARGS+= -DENABLE_DOCS=NO @@ -27,26 +27,27 @@ CMAKE_ARGS+= -DENABLE_DOCS=NO
27PY_PATCHPLIST= yes 27PY_PATCHPLIST= yes
28 28
29CHECK_PORTABILITY_SKIP+= osx/FontForge.app/Contents/MacOS/* 29CHECK_PORTABILITY_SKIP+= osx/FontForge.app/Contents/MacOS/*
30 30
31PYTHON_VERSIONS_INCOMPATIBLE= 27 31PYTHON_VERSIONS_INCOMPATIBLE= 27
32 32
33pre-configure: 33pre-configure:
34 ${MKDIR} ${WRKSRC}/build 34 ${MKDIR} ${WRKSRC}/build
35 35
36.include "../../lang/python/application.mk" 36.include "../../lang/python/application.mk"
37.include "../../converters/libiconv/buildlink3.mk" 37.include "../../converters/libiconv/buildlink3.mk"
38.include "../../databases/shared-mime-info/mimedb.mk" 38.include "../../databases/shared-mime-info/mimedb.mk"
39.include "../../devel/gettext-lib/buildlink3.mk" 39.include "../../devel/gettext-lib/buildlink3.mk"
 40.include "../../devel/gettext-tools/msgfmt-desktop.mk"
40.include "../../devel/glib2/buildlink3.mk" 41.include "../../devel/glib2/buildlink3.mk"
41.include "../../devel/libltdl/buildlink3.mk" 42.include "../../devel/libltdl/buildlink3.mk"
42.include "../../devel/pango/buildlink3.mk" 43.include "../../devel/pango/buildlink3.mk"
43.include "../../devel/zlib/buildlink3.mk" 44.include "../../devel/zlib/buildlink3.mk"
44.include "../../fonts/woff2/buildlink3.mk" 45.include "../../fonts/woff2/buildlink3.mk"
45.include "../../graphics/cairo/buildlink3.mk" 46.include "../../graphics/cairo/buildlink3.mk"
46.include "../../graphics/giflib/buildlink3.mk" 47.include "../../graphics/giflib/buildlink3.mk"
47.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 48.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
48.include "../../graphics/freetype2/buildlink3.mk" 49.include "../../graphics/freetype2/buildlink3.mk"
49.include "../../graphics/libspiro/buildlink3.mk" 50.include "../../graphics/libspiro/buildlink3.mk"
50.include "../../graphics/png/buildlink3.mk" 51.include "../../graphics/png/buildlink3.mk"
51.include "../../graphics/potrace/buildlink3.mk" 52.include "../../graphics/potrace/buildlink3.mk"
52.include "../../graphics/tiff/buildlink3.mk" 53.include "../../graphics/tiff/buildlink3.mk"
File Deleted: pkgsrc/fonts/fontforge/Attic/hacks.mk
cvs diff -r1.23 -r1.24 pkgsrc/games/chromium-bsu/Makefile (expand / switch to unified diff)

--- pkgsrc/games/chromium-bsu/Makefile 2021/12/08 16:04:26 1.23
+++ pkgsrc/games/chromium-bsu/Makefile 2022/03/12 08:01:53 1.24
@@ -1,47 +1,45 @@ @@ -1,47 +1,45 @@
1# $NetBSD: Makefile,v 1.23 2021/12/08 16:04:26 adam Exp $ 1# $NetBSD: Makefile,v 1.24 2022/03/12 08:01:53 nia Exp $
2 2
3DISTNAME= chromium-bsu-0.9.16.1 3DISTNAME= chromium-bsu-0.9.16.1
4PKGREVISION= 5 4PKGREVISION= 5
5CATEGORIES= games 5CATEGORIES= games
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=chromium-bsu/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=chromium-bsu/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://chromium-bsu.sourceforge.net/ 9HOMEPAGE= http://chromium-bsu.sourceforge.net/
10COMMENT= Fast paced, arcade-style, top-scrolling space shooter 10COMMENT= Fast paced, arcade-style, top-scrolling space shooter
11 11
12DEPENDS= uralic-ttf-[0-9]*:../../fonts/uralic-ttf 12DEPENDS= uralic-ttf-[0-9]*:../../fonts/uralic-ttf
13 13
14USE_PKGLOCALEDIR= yes 14USE_PKGLOCALEDIR= yes
15USE_LANGUAGES= c c++03 15USE_LANGUAGES= c c++03
16USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
17USE_TOOLS+= msgfmt msgmerge xgettext 17USE_TOOLS+= msgfmt msgmerge xgettext
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19 19
20# XXX needs gnu msgfmt for desktop file creation 
21_TOOLS_USE_PKGSRC.msgfmt= yes 
22 
23LDFLAGS+= ${BUILDLINK_LDADD.gettext} 20LDFLAGS+= ${BUILDLINK_LDADD.gettext}
24LDFLAGS.DragonFly= -lSDL2 21LDFLAGS.DragonFly= -lSDL2
25LDFLAGS.SunOS= -lSDL2 22LDFLAGS.SunOS= -lSDL2
26 23
27CONFIGURE_ARGS+= --disable-ftgl 24CONFIGURE_ARGS+= --disable-ftgl
28CONFIGURE_ARGS+= --disable-glut 25CONFIGURE_ARGS+= --disable-glut
29# detection fails 26# detection fails
30CONFIGURE_ARGS+= --disable-glpng 27CONFIGURE_ARGS+= --disable-glpng
31# we don't want SDL1. 28# we don't want SDL1.
32CONFIGURE_ARGS+= --disable-sdl 29CONFIGURE_ARGS+= --disable-sdl
33CONFIGURE_ARGS+= --disable-sdlmixer 30CONFIGURE_ARGS+= --disable-sdlmixer
34CONFIGURE_ARGS+= --disable-sdlimage 31CONFIGURE_ARGS+= --disable-sdlimage
35CONFIGURE_ARGS+= --disable-openal 32CONFIGURE_ARGS+= --disable-openal
36 33
37CFLAGS+= -DWITH_JOYSTICK 34CFLAGS+= -DWITH_JOYSTICK
38 35
39.include "../../audio/SDL2_mixer/buildlink3.mk" 36.include "../../audio/SDL2_mixer/buildlink3.mk"
40.include "../../devel/SDL2/buildlink3.mk" 37.include "../../devel/SDL2/buildlink3.mk"
41.include "../../devel/gettext-lib/buildlink3.mk" 38.include "../../devel/gettext-lib/buildlink3.mk"
 39.include "../../devel/gettext-tools/msgfmt-desktop.mk"
42.include "../../graphics/MesaLib/buildlink3.mk" 40.include "../../graphics/MesaLib/buildlink3.mk"
43.include "../../graphics/SDL2_image/buildlink3.mk" 41.include "../../graphics/SDL2_image/buildlink3.mk"
44.include "../../graphics/glu/buildlink3.mk" 42.include "../../graphics/glu/buildlink3.mk"
45.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 43.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
46.include "../../graphics/quesoglc/buildlink3.mk" 44.include "../../graphics/quesoglc/buildlink3.mk"
47.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"
cvs diff -r1.101 -r1.102 pkgsrc/graphics/cheese/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/cheese/Makefile 2022/03/12 07:06:26 1.101
+++ pkgsrc/graphics/cheese/Makefile 2022/03/12 08:01:49 1.102
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.101 2022/03/12 07:06:26 nia Exp $ 1# $NetBSD: Makefile,v 1.102 2022/03/12 08:01:49 nia Exp $
2 2
3DISTNAME= cheese-3.34.0 3DISTNAME= cheese-3.34.0
4PKGREVISION= 9 4PKGREVISION= 9
5CATEGORIES= graphics gnome 5CATEGORIES= graphics gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/cheese/3.34/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/cheese/3.34/}
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/Cheese 10HOMEPAGE= https://wiki.gnome.org/Apps/Cheese
11COMMENT= Use your webcam to take photos and videos 11COMMENT= Use your webcam to take photos and videos
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DEPENDS+= gst-plugins1-v4l2-[0-9]*:../../multimedia/gst-plugins1-v4l2 14DEPENDS+= gst-plugins1-v4l2-[0-9]*:../../multimedia/gst-plugins1-v4l2
@@ -23,26 +23,27 @@ MESON_ARGS+= -Dman=false @@ -23,26 +23,27 @@ MESON_ARGS+= -Dman=false
23PYTHON_FOR_BUILD_ONLY= tool 23PYTHON_FOR_BUILD_ONLY= tool
24 24
25# workaround for build failure 25# workaround for build failure
26# https://gitlab.gnome.org/GNOME/json-glib/issues/35 26# https://gitlab.gnome.org/GNOME/json-glib/issues/35
27MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libcheese 27MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libcheese
28 28
29PKGCONFIG_OVERRIDE_STAGE= pre-install 29PKGCONFIG_OVERRIDE_STAGE= pre-install
30PKGCONFIG_OVERRIDE+= output/meson-private/cheese.pc 30PKGCONFIG_OVERRIDE+= output/meson-private/cheese.pc
31PKGCONFIG_OVERRIDE+= output/meson-private/cheese-gtk.pc 31PKGCONFIG_OVERRIDE+= output/meson-private/cheese-gtk.pc
32 32
33.include "../../devel/meson/build.mk" 33.include "../../devel/meson/build.mk"
34.include "../../devel/glib2/schemas.mk" 34.include "../../devel/glib2/schemas.mk"
35.include "../../audio/libcanberra/buildlink3.mk" 35.include "../../audio/libcanberra/buildlink3.mk"
 36.include "../../devel/gettext-tools/msgfmt-desktop.mk"
36BUILDLINK_DEPMETHOD.gobject-introspection?= build 37BUILDLINK_DEPMETHOD.gobject-introspection?= build
37.include "../../devel/gobject-introspection/buildlink3.mk" 38.include "../../devel/gobject-introspection/buildlink3.mk"
38.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 39.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
39.include "../../graphics/clutter-gtk/buildlink3.mk" 40.include "../../graphics/clutter-gtk/buildlink3.mk"
40BUILDLINK_DEPMETHOD.vala?= build 41BUILDLINK_DEPMETHOD.vala?= build
41.include "../../lang/vala/buildlink3.mk" 42.include "../../lang/vala/buildlink3.mk"
42.include "../../multimedia/clutter-gst/buildlink3.mk" 43.include "../../multimedia/clutter-gst/buildlink3.mk"
43.include "../../multimedia/gstreamer1/buildlink3.mk" 44.include "../../multimedia/gstreamer1/buildlink3.mk"
44.include "../../multimedia/gst-plugins1-good/buildlink3.mk" 45.include "../../multimedia/gst-plugins1-good/buildlink3.mk"
45.include "../../multimedia/gst-plugins1-bad/buildlink3.mk" 46.include "../../multimedia/gst-plugins1-bad/buildlink3.mk"
46.include "../../multimedia/gnome-video-effects/buildlink3.mk" 47.include "../../multimedia/gnome-video-effects/buildlink3.mk"
47.include "../../sysutils/desktop-file-utils/desktopdb.mk" 48.include "../../sysutils/desktop-file-utils/desktopdb.mk"
48.include "../../x11/gnome-desktop3/buildlink3.mk" 49.include "../../x11/gnome-desktop3/buildlink3.mk"
File Deleted: pkgsrc/graphics/cheese/Attic/hacks.mk
cvs diff -r1.6 -r1.7 pkgsrc/graphics/drawing/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/drawing/Makefile 2022/03/12 07:06:26 1.6
+++ pkgsrc/graphics/drawing/Makefile 2022/03/12 08:01:49 1.7
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.6 2022/03/12 07:06:26 nia Exp $ 1# $NetBSD: Makefile,v 1.7 2022/03/12 08:01:49 nia Exp $
2 2
3DISTNAME= drawing-0.8.3 3DISTNAME= drawing-0.8.3
4CATEGORIES= graphics gnome 4CATEGORIES= graphics gnome
5MASTER_SITES= ${MASTER_SITE_GITHUB:=maoschanz/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=maoschanz/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://github.com/maoschanz/drawing 8HOMEPAGE= https://github.com/maoschanz/drawing
9COMMENT= Basic image editor, similar to Microsoft Paint 9COMMENT= Basic image editor, similar to Microsoft Paint
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
11 11
12TOOL_DEPENDS+= appstream-glib-[0-9]*:../../devel/appstream-glib 12TOOL_DEPENDS+= appstream-glib-[0-9]*:../../devel/appstream-glib
13DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 13DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
14DEPENDS+= gtk3+-[0-9]*:../../x11/gtk3 14DEPENDS+= gtk3+-[0-9]*:../../x11/gtk3
15 15
16USE_TOOLS+= pkg-config msgfmt xgettext 16USE_TOOLS+= pkg-config msgfmt xgettext
17 17
18# Uses python3 command 18# Uses python3 command
19PYTHON_VERSIONS_INCOMPATIBLE= 27 19PYTHON_VERSIONS_INCOMPATIBLE= 27
20 20
21.include "../../devel/meson/build.mk" 21.include "../../devel/meson/build.mk"
 22.include "../../devel/gettext-tools/msgfmt-desktop.mk"
22.include "../../devel/glib2/schemas.mk" 23.include "../../devel/glib2/schemas.mk"
23.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 24.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
24.include "../../lang/python/tool.mk" 25.include "../../lang/python/tool.mk"
25.include "../../sysutils/desktop-file-utils/desktopdb.mk" 26.include "../../sysutils/desktop-file-utils/desktopdb.mk"
26.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/graphics/drawing/Attic/hacks.mk
cvs diff -r1.114 -r1.115 pkgsrc/graphics/eog/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/eog/Makefile 2022/03/12 07:06:26 1.114
+++ pkgsrc/graphics/eog/Makefile 2022/03/12 08:01:49 1.115
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: Makefile,v 1.114 2022/03/12 07:06:26 nia Exp $ 1# $NetBSD: Makefile,v 1.115 2022/03/12 08:01:49 nia Exp $
2 2
3DISTNAME= eog-40.3 3DISTNAME= eog-40.3
4CATEGORIES= graphics gnome 4CATEGORIES= graphics gnome
5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/eog/${PKGVERSION_NOREV:R}/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/eog/${PKGVERSION_NOREV:R}/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= prlw1@cam.ac.uk 8MAINTAINER= prlw1@cam.ac.uk
9HOMEPAGE= https://www.gnome.org/ 9HOMEPAGE= https://www.gnome.org/
10COMMENT= Eye of GNOME: an image viewing and cataloging program 10COMMENT= Eye of GNOME: an image viewing and cataloging program
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13PREV_PKGPATH= graphics/eog3 13PREV_PKGPATH= graphics/eog3
14 14
15USE_TOOLS+= msgfmt pkg-config xgettext itstool 15USE_TOOLS+= msgfmt pkg-config xgettext itstool
16 16
17# some linux-only packaging thing 17# some linux-only packaging thing
18MESON_ARGS+= -Dlibportal=false 18MESON_ARGS+= -Dlibportal=false
19 19
20LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/eog 20LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/eog
21 21
22PYTHON_FOR_BUILD_ONLY= tool 22PYTHON_FOR_BUILD_ONLY= tool
23 23
24PKGCONFIG_OVERRIDE_STAGE= pre-install 24PKGCONFIG_OVERRIDE_STAGE= pre-install
25PKGCONFIG_OVERRIDE+= output/meson-private/eog.pc 25PKGCONFIG_OVERRIDE+= output/meson-private/eog.pc
26 26
27.include "../../devel/meson/build.mk" 27.include "../../devel/meson/build.mk"
 28.include "../../devel/gettext-tools/msgfmt-desktop.mk"
28BUILDLINK_API_DEPENDS.glib2+= glib2>=2.42.0 29BUILDLINK_API_DEPENDS.glib2+= glib2>=2.42.0
29.include "../../devel/glib2/schemas.mk" 30.include "../../devel/glib2/schemas.mk"
30.include "../../devel/gobject-introspection/buildlink3.mk" 31.include "../../devel/gobject-introspection/buildlink3.mk"
31.include "../../devel/libpeas/buildlink3.mk" 32.include "../../devel/libpeas/buildlink3.mk"
32.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 33.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
33.include "../../sysutils/desktop-file-utils/desktopdb.mk" 34.include "../../sysutils/desktop-file-utils/desktopdb.mk"
34.include "../../textproc/libxml2/buildlink3.mk" 35.include "../../textproc/libxml2/buildlink3.mk"
35.include "../../x11/gnome-desktop3/buildlink3.mk" 36.include "../../x11/gnome-desktop3/buildlink3.mk"
36BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.22.0 37BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.22.0
37.include "../../x11/gtk3/buildlink3.mk" 38.include "../../x11/gtk3/buildlink3.mk"
38 39
39# "semi-optional": 40# "semi-optional":
40.include "../../mk/jpeg.buildlink3.mk" 41.include "../../mk/jpeg.buildlink3.mk"
File Deleted: pkgsrc/graphics/eog/Attic/hacks.mk
cvs diff -r1.3 -r1.4 pkgsrc/graphics/gnome-screenshot/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gnome-screenshot/Makefile 2022/03/12 07:06:26 1.3
+++ pkgsrc/graphics/gnome-screenshot/Makefile 2022/03/12 08:01:49 1.4
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.3 2022/03/12 07:06:26 nia Exp $ 1# $NetBSD: Makefile,v 1.4 2022/03/12 08:01:49 nia Exp $
2 2
3DISTNAME= gnome-screenshot-3.38.0 3DISTNAME= gnome-screenshot-3.38.0
4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/} 4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= graphics gnome 6CATEGORIES= graphics 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-screenshot 10HOMEPAGE= https://gitlab.gnome.org/GNOME/gnome-screenshot
11COMMENT= Screenshot capture utility for GNOME 11COMMENT= Screenshot capture utility for GNOME
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= pkg-config msgfmt xgettext 14USE_TOOLS+= pkg-config msgfmt xgettext
15 15
16PYTHON_FOR_BUILD_ONLY= tool 16PYTHON_FOR_BUILD_ONLY= tool
17 17
18.include "../../devel/meson/build.mk" 18.include "../../devel/meson/build.mk"
 19.include "../../devel/gettext-tools/msgfmt-desktop.mk"
19.include "../../devel/glib2/schemas.mk" 20.include "../../devel/glib2/schemas.mk"
20.include "../../audio/libcanberra/buildlink3.mk" 21.include "../../audio/libcanberra/buildlink3.mk"
21.include "../../devel/libhandy1/buildlink3.mk" 22.include "../../devel/libhandy1/buildlink3.mk"
22.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 23.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
23.include "../../lang/python/tool.mk" 24.include "../../lang/python/tool.mk"
24.include "../../sysutils/desktop-file-utils/desktopdb.mk" 25.include "../../sysutils/desktop-file-utils/desktopdb.mk"
25.include "../../x11/gtk3/buildlink3.mk" 26.include "../../x11/gtk3/buildlink3.mk"
26.include "../../x11/libX11/buildlink3.mk" 27.include "../../x11/libX11/buildlink3.mk"
27.include "../../x11/libXext/buildlink3.mk" 28.include "../../x11/libXext/buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/graphics/gnome-screenshot/Attic/hacks.mk
cvs diff -r1.245 -r1.246 pkgsrc/graphics/inkscape/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/inkscape/Makefile 2022/03/12 07:06:26 1.245
+++ pkgsrc/graphics/inkscape/Makefile 2022/03/12 08:01:49 1.246
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.245 2022/03/12 07:06:26 nia Exp $ 1# $NetBSD: Makefile,v 1.246 2022/03/12 08:01:49 nia Exp $
2 2
3DISTNAME= inkscape-1.1.2 3DISTNAME= inkscape-1.1.2
4CATEGORIES= graphics 4CATEGORIES= graphics
5MASTER_SITES= https://media.inkscape.org/dl/resources/file/ 5MASTER_SITES= https://media.inkscape.org/dl/resources/file/
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= reed@reedmedia.net 8MAINTAINER= reed@reedmedia.net
9HOMEPAGE= https://www.inkscape.org/ 9HOMEPAGE= https://www.inkscape.org/
10COMMENT= Scalable Vector Graphics (SVG) editor 10COMMENT= Scalable Vector Graphics (SVG) editor
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13.if !exists(/usr/bin/iconv) 13.if !exists(/usr/bin/iconv)
14BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv 14BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv
@@ -88,26 +88,27 @@ post-install: fix-darwin-install-name @@ -88,26 +88,27 @@ post-install: fix-darwin-install-name
88fix-darwin-install-name: 88fix-darwin-install-name:
89 install_name_tool -change ${PREFIX}/lib/libinkscape_base.dylib \ 89 install_name_tool -change ${PREFIX}/lib/libinkscape_base.dylib \
90 ${PREFIX}/lib/inkscape/libinkscape_base.dylib \ 90 ${PREFIX}/lib/inkscape/libinkscape_base.dylib \
91 ${DESTDIR}${PREFIX}/bin/inkscape 91 ${DESTDIR}${PREFIX}/bin/inkscape
92.endif 92.endif
93 93
94BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=7.4 94BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=7.4
95.include "../../converters/libcdr/buildlink3.mk" 95.include "../../converters/libcdr/buildlink3.mk"
96.include "../../converters/librevenge/buildlink3.mk" 96.include "../../converters/librevenge/buildlink3.mk"
97.include "../../converters/libvisio/buildlink3.mk" 97.include "../../converters/libvisio/buildlink3.mk"
98.include "../../converters/libwpg/buildlink3.mk" 98.include "../../converters/libwpg/buildlink3.mk"
99.include "../../devel/boehm-gc/buildlink3.mk" 99.include "../../devel/boehm-gc/buildlink3.mk"
100.include "../../devel/boost-headers/buildlink3.mk" 100.include "../../devel/boost-headers/buildlink3.mk"
 101.include "../../devel/gettext-tools/msgfmt-desktop.mk"
101.include "../../devel/googletest/buildlink3.mk" 102.include "../../devel/googletest/buildlink3.mk"
102BUILDLINK_API_DEPENDS.libsigcpp+= libsigc++>=2.0.12 103BUILDLINK_API_DEPENDS.libsigcpp+= libsigc++>=2.0.12
103.include "../../devel/libsigc++/buildlink3.mk" 104.include "../../devel/libsigc++/buildlink3.mk"
104BUILDLINK_API_DEPENDS.pango+= pango>=1.42 105BUILDLINK_API_DEPENDS.pango+= pango>=1.42
105.include "../../devel/pango/buildlink3.mk" 106.include "../../devel/pango/buildlink3.mk"
106BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=2.2 107BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=2.2
107.include "../../fonts/harfbuzz/buildlink3.mk" 108.include "../../fonts/harfbuzz/buildlink3.mk"
108.include "../../graphics/freetype2/buildlink3.mk" 109.include "../../graphics/freetype2/buildlink3.mk"
109.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 110.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
110.include "../../graphics/lcms2/buildlink3.mk" 111.include "../../graphics/lcms2/buildlink3.mk"
111.include "../../graphics/png/buildlink3.mk" 112.include "../../graphics/png/buildlink3.mk"
112.include "../../graphics/potrace/buildlink3.mk" 113.include "../../graphics/potrace/buildlink3.mk"
113.include "../../math/gsl/buildlink3.mk" 114.include "../../math/gsl/buildlink3.mk"
File Deleted: pkgsrc/graphics/inkscape/Attic/hacks.mk
cvs diff -r1.125 -r1.126 pkgsrc/graphics/shotwell/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/shotwell/Makefile 2021/12/08 16:05:06 1.125
+++ pkgsrc/graphics/shotwell/Makefile 2022/03/12 08:01:53 1.126
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1# $NetBSD: Makefile,v 1.125 2021/12/08 16:05:06 adam Exp $ 1# $NetBSD: Makefile,v 1.126 2022/03/12 08:01:53 nia Exp $
2 2
3DISTNAME= shotwell-0.30.8 3DISTNAME= shotwell-0.30.8
4PKGREVISION= 18 4PKGREVISION= 18
5CATEGORIES= graphics gnome 5CATEGORIES= graphics gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/shotwell/0.30/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/shotwell/0.30/}
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/Shotwell 10HOMEPAGE= https://wiki.gnome.org/Apps/Shotwell
11COMMENT= Photo organizer for the GNOME desktop 11COMMENT= Photo organizer for the GNOME desktop
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14USE_TOOLS+= pkg-config msgfmt xgettext itstool 14USE_TOOLS+= pkg-config msgfmt xgettext itstool
15 15
16MESON_ARGS+= -Dudev=false 16MESON_ARGS+= -Dudev=false
17 17
18# uses python3 18# uses python3
19PYTHON_VERSIONS_INCOMPATIBLE= 27 19PYTHON_VERSIONS_INCOMPATIBLE= 27
20 20
21# XXX msgfmt: unknown option -- desktop 21# XXX msgfmt: unknown option -- desktop
22_TOOLS_USE_PKGSRC.msgfmt= yes 22_TOOLS_USE_PKGSRC.msgfmt= yes
23 23
24.include "../../devel/meson/build.mk" 24.include "../../devel/meson/build.mk"
 25.include "../../devel/gettext-tools/msgfmt-desktop.mk"
25.include "../../devel/glib2/schemas.mk" 26.include "../../devel/glib2/schemas.mk"
26.include "../../devel/libgee/buildlink3.mk" 27.include "../../devel/libgee/buildlink3.mk"
27.include "../../devel/libgphoto2/buildlink3.mk" 28.include "../../devel/libgphoto2/buildlink3.mk"
28.include "../../graphics/gexiv2/buildlink3.mk" 29.include "../../graphics/gexiv2/buildlink3.mk"
29.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 30.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
30.include "../../graphics/libraw/buildlink3.mk" 31.include "../../graphics/libraw/buildlink3.mk"
31.include "../../lang/python/tool.mk" 32.include "../../lang/python/tool.mk"
32.include "../../lang/vala/buildlink3.mk" 33.include "../../lang/vala/buildlink3.mk"
33.include "../../net/libgdata/buildlink3.mk" 34.include "../../net/libgdata/buildlink3.mk"
34.include "../../security/gcr/buildlink3.mk" 35.include "../../security/gcr/buildlink3.mk"
35.include "../../sysutils/desktop-file-utils/desktopdb.mk" 36.include "../../sysutils/desktop-file-utils/desktopdb.mk"
36.include "../../textproc/json-glib/buildlink3.mk" 37.include "../../textproc/json-glib/buildlink3.mk"
37.include "../../www/webkit-gtk/buildlink3.mk" 38.include "../../www/webkit-gtk/buildlink3.mk"
cvs diff -r1.36 -r1.37 pkgsrc/graphics/viewnior/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/viewnior/Makefile 2022/03/12 07:06:26 1.36
+++ pkgsrc/graphics/viewnior/Makefile 2022/03/12 08:01:49 1.37
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.36 2022/03/12 07:06:26 nia Exp $ 1# $NetBSD: Makefile,v 1.37 2022/03/12 08:01:49 nia Exp $
2 2
3DISTNAME= viewnior-1.7 3DISTNAME= viewnior-1.7
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_GITHUB:=hellosiyan/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=hellosiyan/}
7GITHUB_PROJECT= Viewnior 7GITHUB_PROJECT= Viewnior
8GITHUB_TAG= ${DISTNAME} 8GITHUB_TAG= ${DISTNAME}
9 9
10MAINTAINER= ryoon@NetBSD.org 10MAINTAINER= ryoon@NetBSD.org
11HOMEPAGE= http://siyanpanayotov.com/project/viewnior 11HOMEPAGE= http://siyanpanayotov.com/project/viewnior
12COMMENT= Viewnior is a fast and simple image viewer 12COMMENT= Viewnior is a fast and simple image viewer
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15WRKSRC= ${WRKDIR}/Viewnior-${DISTNAME} 15WRKSRC= ${WRKDIR}/Viewnior-${DISTNAME}
16 16
17USE_TOOLS+= pkg-config msgfmt xgettext 17USE_TOOLS+= pkg-config msgfmt xgettext
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19 19
20PYTHON_FOR_BUILD_ONLY= tool 20PYTHON_FOR_BUILD_ONLY= tool
21 21
22.include "../../devel/meson/build.mk" 22.include "../../devel/meson/build.mk"
 23.include "../../devel/gettext-tools/msgfmt-desktop.mk"
23.include "../../databases/shared-mime-info/buildlink3.mk" 24.include "../../databases/shared-mime-info/buildlink3.mk"
24.include "../../devel/glib2/buildlink3.mk" 25.include "../../devel/glib2/buildlink3.mk"
25.include "../../graphics/exiv2/buildlink3.mk" 26.include "../../graphics/exiv2/buildlink3.mk"
26.include "../../sysutils/desktop-file-utils/desktopdb.mk" 27.include "../../sysutils/desktop-file-utils/desktopdb.mk"
27.include "../../x11/gtk2/buildlink3.mk" 28.include "../../x11/gtk2/buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/graphics/viewnior/Attic/hacks.mk
cvs diff -r1.83 -r1.84 pkgsrc/inputmethod/ibus/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/Makefile 2022/03/12 07:11:13 1.83
+++ pkgsrc/inputmethod/ibus/Makefile 2022/03/12 08:01:50 1.84
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.83 2022/03/12 07:11:13 nia Exp $ 1# $NetBSD: Makefile,v 1.84 2022/03/12 08:01:50 nia Exp $
2 2
3PKGREVISION= 2 3PKGREVISION= 2
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6COMMENT= Intelligent Input Bus 6COMMENT= Intelligent Input Bus
7 7
8DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject32 8DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject32
9BUILD_DEPENDS+= cldr-emoji-annotation>=37.0.13.0.0.2:../../textproc/cldr-emoji-annotation 9BUILD_DEPENDS+= cldr-emoji-annotation>=37.0.13.0.0.2:../../textproc/cldr-emoji-annotation
10BUILD_DEPENDS+= unicode-character-database>=13.0.0:../../textproc/unicode-character-database 10BUILD_DEPENDS+= unicode-character-database>=13.0.0:../../textproc/unicode-character-database
11BUILD_DEPENDS+= unicode-emoji>=13.1:../../textproc/unicode-emoji 11BUILD_DEPENDS+= unicode-emoji>=13.1:../../textproc/unicode-emoji
12 12
13PYTHON_VERSIONS_ACCEPTED= 27 13PYTHON_VERSIONS_ACCEPTED= 27
14 14
@@ -47,26 +47,27 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR}/dconf/pro @@ -47,26 +47,27 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR}/dconf/pro
47CONF_FILES+= ${PREFIX}/share/examples/ibus/dconf/db/ibus.d/00-upstream-settings \ 47CONF_FILES+= ${PREFIX}/share/examples/ibus/dconf/db/ibus.d/00-upstream-settings \
48 ${PKG_SYSCONFDIR}/dconf/db/ibus.d/00-upstream-settings 48 ${PKG_SYSCONFDIR}/dconf/db/ibus.d/00-upstream-settings
49CONF_FILES+= ${PREFIX}/share/examples/ibus/dconf/profile/ibus \ 49CONF_FILES+= ${PREFIX}/share/examples/ibus/dconf/profile/ibus \
50 ${PKG_SYSCONFDIR}/dconf/profile/ibus 50 ${PKG_SYSCONFDIR}/dconf/profile/ibus
51 51
52.include "../../mk/compiler.mk" 52.include "../../mk/compiler.mk"
53.if !empty(CC_VERSION:Mgcc-4.1.[0-9]*) 53.if !empty(CC_VERSION:Mgcc-4.1.[0-9]*)
54BUILDLINK_TRANSFORM+= rm:-Wno-unused-but-set-variable 54BUILDLINK_TRANSFORM+= rm:-Wno-unused-but-set-variable
55.endif 55.endif
56 56
57.include "../../devel/glib2/schemas.mk" 57.include "../../devel/glib2/schemas.mk"
58.include "../../devel/dconf/database.mk" 58.include "../../devel/dconf/database.mk"
59.include "../../devel/dconf/buildlink3.mk" 59.include "../../devel/dconf/buildlink3.mk"
 60.include "../../devel/gettext-tools/msgfmt-desktop.mk"
60BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.6 61BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.6
61BUILDLINK_DEPMETHOD.gobject-introspection+= build 62BUILDLINK_DEPMETHOD.gobject-introspection+= build
62.include "../../devel/gobject-introspection/buildlink3.mk" 63.include "../../devel/gobject-introspection/buildlink3.mk"
63.include "../../devel/gettext-lib/buildlink3.mk" 64.include "../../devel/gettext-lib/buildlink3.mk"
64BUILDLINK_API_DEPENDS.glib2+= glib2>=2.46.0 65BUILDLINK_API_DEPENDS.glib2+= glib2>=2.46.0
65.include "../../devel/glib2/buildlink3.mk" 66.include "../../devel/glib2/buildlink3.mk"
66.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 67.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
67BUILDLINK_DEPMETHOD.vala+= build 68BUILDLINK_DEPMETHOD.vala+= build
68.include "../../lang/vala/buildlink3.mk" 69.include "../../lang/vala/buildlink3.mk"
69PY_PATCHPLIST= yes 70PY_PATCHPLIST= yes
70.include "../../sysutils/dbus/buildlink3.mk" 71.include "../../sysutils/dbus/buildlink3.mk"
71.include "../../sysutils/libnotify/buildlink3.mk" 72.include "../../sysutils/libnotify/buildlink3.mk"
72.include "../../textproc/iso-codes/buildlink3.mk" 73.include "../../textproc/iso-codes/buildlink3.mk"
File Deleted: pkgsrc/inputmethod/ibus/Attic/hacks.mk
cvs diff -r1.26 -r1.27 pkgsrc/inputmethod/ibus-libpinyin/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus-libpinyin/Makefile 2022/03/12 07:11:14 1.26
+++ pkgsrc/inputmethod/ibus-libpinyin/Makefile 2022/03/12 08:01:50 1.27
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.26 2022/03/12 07:11:14 nia Exp $ 1# $NetBSD: Makefile,v 1.27 2022/03/12 08:01:50 nia Exp $
2 2
3DISTNAME= ibus-libpinyin-1.12.0 3DISTNAME= ibus-libpinyin-1.12.0
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= inputmethod chinese 5CATEGORIES= inputmethod chinese
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpinyin/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpinyin/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/libpinyin/ibus-libpinyin/ 9HOMEPAGE= https://github.com/libpinyin/ibus-libpinyin/
10COMMENT= Intelligent Pinyin engine based on libpinyin for IBus 10COMMENT= Intelligent Pinyin engine based on libpinyin for IBus
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_TOOLS+= gmake intltool msgfmt pkg-config 14USE_TOOLS+= gmake intltool msgfmt pkg-config
@@ -28,18 +28,19 @@ PLIST_SUBST+= PYVERSION_DIGIT=${PYVERS @@ -28,18 +28,19 @@ PLIST_SUBST+= PYVERSION_DIGIT=${PYVERS
28. include "../../devel/libuuid/buildlink3.mk" 28. include "../../devel/libuuid/buildlink3.mk"
29.endif 29.endif
30 30
31.if (!empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*)) || !empty(PKGSRC_COMPILER:Mclang) 31.if (!empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*)) || !empty(PKGSRC_COMPILER:Mclang)
32CONFIGURE_ARGS+= --disable-boost 32CONFIGURE_ARGS+= --disable-boost
33.else 33.else
34CONFIGURE_ARGS+= --enable-boost 34CONFIGURE_ARGS+= --enable-boost
35CONFIGURE_ARGS+= --with-boost=${BUILDLINK_PREFIX.boost-headers} 35CONFIGURE_ARGS+= --with-boost=${BUILDLINK_PREFIX.boost-headers}
36.include "../../devel/boost-headers/buildlink3.mk" 36.include "../../devel/boost-headers/buildlink3.mk"
37.endif 37.endif
38 38
39.include "../../devel/glib2/schemas.mk" 39.include "../../devel/glib2/schemas.mk"
40.include "../../devel/gettext-lib/buildlink3.mk" 40.include "../../devel/gettext-lib/buildlink3.mk"
 41.include "../../devel/gettext-tools/msgfmt-desktop.mk"
41.include "../../databases/sqlite3/buildlink3.mk" 42.include "../../databases/sqlite3/buildlink3.mk"
42.include "../../inputmethod/ibus/buildlink3.mk" 43.include "../../inputmethod/ibus/buildlink3.mk"
43.include "../../textproc/libpinyin/buildlink3.mk" 44.include "../../textproc/libpinyin/buildlink3.mk"
44.include "../../lang/python/application.mk" 45.include "../../lang/python/application.mk"
45.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/inputmethod/ibus-libpinyin/Attic/hacks.mk
cvs diff -r1.59 -r1.60 pkgsrc/misc/orca/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/orca/Makefile 2022/03/12 07:14:17 1.59
+++ pkgsrc/misc/orca/Makefile 2022/03/12 08:01:50 1.60
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.59 2022/03/12 07:14:17 nia Exp $ 1# $NetBSD: Makefile,v 1.60 2022/03/12 08:01:50 nia Exp $
2 2
3DISTNAME= orca-3.34.1 3DISTNAME= orca-3.34.1
4PKGREVISION= 6 4PKGREVISION= 6
5CATEGORIES= misc gnome 5CATEGORIES= misc gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/orca/3.34/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/orca/3.34/}
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/Projects/Orca 10HOMEPAGE= https://wiki.gnome.org/Projects/Orca
11COMMENT= Screen reader 11COMMENT= Screen reader
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 14DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
@@ -19,22 +19,23 @@ DEPENDS+= ${PYPKGPREFIX}-gstreamer1-[0-9 @@ -19,22 +19,23 @@ DEPENDS+= ${PYPKGPREFIX}-gstreamer1-[0-9
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20PY_PATCHPLIST= yes 20PY_PATCHPLIST= yes
21 21
22USE_TOOLS+= pkg-config gmake itstool 22USE_TOOLS+= pkg-config gmake itstool
23USE_TOOLS+= msgfmt msgmerge xgettext 23USE_TOOLS+= msgfmt msgmerge xgettext
24 24
25# Python 3 only 25# Python 3 only
26PYTHON_VERSIONS_INCOMPATIBLE= 27 26PYTHON_VERSIONS_INCOMPATIBLE= 27
27 27
28CHECK_PORTABILITY_SKIP+= run_pylint.sh.in 28CHECK_PORTABILITY_SKIP+= run_pylint.sh.in
29 29
30.include "../../devel/glib2/schemas.mk" 30.include "../../devel/glib2/schemas.mk"
31.include "../../audio/speech-dispatcher/buildlink3.mk" 31.include "../../audio/speech-dispatcher/buildlink3.mk"
 32.include "../../devel/gettext-tools/msgfmt-desktop.mk"
32.include "../../devel/libwnck3/buildlink3.mk" 33.include "../../devel/libwnck3/buildlink3.mk"
33.include "../../devel/py-gobject3-common/buildlink3.mk" 34.include "../../devel/py-gobject3-common/buildlink3.mk"
34.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 35.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
35.include "../../multimedia/gstreamer1/buildlink3.mk" 36.include "../../multimedia/gstreamer1/buildlink3.mk"
36.include "../../sysutils/desktop-file-utils/desktopdb.mk" 37.include "../../sysutils/desktop-file-utils/desktopdb.mk"
37.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" 38.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
38.include "../../lang/python/extension.mk" 39.include "../../lang/python/extension.mk"
39.include "../../x11/gtk3/buildlink3.mk" 40.include "../../x11/gtk3/buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/misc/orca/Attic/hacks.mk
cvs diff -r1.79 -r1.80 pkgsrc/misc/yelp3/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/yelp3/Makefile 2022/03/12 07:14:17 1.79
+++ pkgsrc/misc/yelp3/Makefile 2022/03/12 08:01:50 1.80
@@ -1,34 +1,33 @@ @@ -1,34 +1,33 @@
1# $NetBSD: Makefile,v 1.79 2022/03/12 07:14:17 nia Exp $ 1# $NetBSD: Makefile,v 1.80 2022/03/12 08:01:50 nia Exp $
2 2
3DISTNAME= yelp-3.32.0 3DISTNAME= yelp-3.32.0
4PKGREVISION= 11 4PKGREVISION= 11
5CATEGORIES= misc gnome 5CATEGORIES= misc gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/yelp/${PKGVERSION_NOREV:R}/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/yelp/${PKGVERSION_NOREV:R}/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= prlw1@cam.ac.uk 9MAINTAINER= prlw1@cam.ac.uk
10HOMEPAGE= https://www.gnome.org/ 10HOMEPAGE= https://www.gnome.org/
11COMMENT= Mallard capable help browser 11COMMENT= Mallard capable help browser
12LICENSE= gnu-gpl-v2 AND apache-2.0 12LICENSE= gnu-gpl-v2 AND apache-2.0
13 13
14USE_TOOLS+= gmake intltool msgfmt pkg-config itstool 14USE_TOOLS+= gmake intltool msgfmt pkg-config itstool
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18 18
19BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38.0 19BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38.0
20BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.13.3 20BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.13.3
21BUILDLINK_API_DEPENDS.libxslt+= libxslt>=1.1.4 21BUILDLINK_API_DEPENDS.libxslt+= libxslt>=1.1.4
22 22
23.include "../../archivers/bzip2/buildlink3.mk" 23.include "../../archivers/bzip2/buildlink3.mk"
 24.include "../../devel/gettext-tools/msgfmt-desktop.mk"
24.include "../../devel/glib2/schemas.mk" 25.include "../../devel/glib2/schemas.mk"
25.include "../../x11/gtk3/buildlink3.mk" 26.include "../../x11/gtk3/buildlink3.mk"
26.include "../../textproc/libxml2/buildlink3.mk" 27.include "../../textproc/libxml2/buildlink3.mk"
27.include "../../textproc/libxslt/buildlink3.mk" 28.include "../../textproc/libxslt/buildlink3.mk"
28.include "../../databases/sqlite3/buildlink3.mk" 29.include "../../databases/sqlite3/buildlink3.mk"
29.include "../../www/webkit-gtk/buildlink3.mk" 30.include "../../www/webkit-gtk/buildlink3.mk"
30.include "../../textproc/yelp-xsl/buildlink3.mk" 31.include "../../textproc/yelp-xsl/buildlink3.mk"
31 
32.include "../../sysutils/desktop-file-utils/desktopdb.mk" 32.include "../../sysutils/desktop-file-utils/desktopdb.mk"
33 
34.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/misc/yelp3/Attic/hacks.mk
cvs diff -r1.3 -r1.4 pkgsrc/multimedia/gnome-video-effects/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/gnome-video-effects/Makefile 2022/03/12 07:17:19 1.3
+++ pkgsrc/multimedia/gnome-video-effects/Makefile 2022/03/12 08:01:50 1.4
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1# $NetBSD: Makefile,v 1.3 2022/03/12 07:17:19 nia Exp $ 1# $NetBSD: Makefile,v 1.4 2022/03/12 08:01:50 nia Exp $
2 2
3DISTNAME= gnome-video-effects-0.5.0 3DISTNAME= gnome-video-effects-0.5.0
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= multimedia gnome 5CATEGORIES= multimedia gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-video-effects/0.5/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-video-effects/0.5/}
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/Projects/GnomeVideoEffects 10HOMEPAGE= https://wiki.gnome.org/Projects/GnomeVideoEffects
11COMMENT= Collection of GStreamer effects for GNOME 11COMMENT= Collection of GStreamer effects for GNOME
12LICENSE= gnu-lgpl-v2 12LICENSE= gnu-lgpl-v2
13 13
14USE_TOOLS+= pkg-config msgfmt xgettext 14USE_TOOLS+= pkg-config msgfmt xgettext
15 15
16PYTHON_FOR_BUILD_ONLY= tool 16PYTHON_FOR_BUILD_ONLY= tool
17 17
18PKGCONFIG_OVERRIDE+= gnome-video-effects.pc.in 18PKGCONFIG_OVERRIDE+= gnome-video-effects.pc.in
19 19
20.include "../../devel/meson/build.mk" 20.include "../../devel/meson/build.mk"
 21.include "../../devel/gettext-tools/msgfmt-desktop.mk"
21.include "../../multimedia/frei0r/buildlink3.mk" 22.include "../../multimedia/frei0r/buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/multimedia/gnome-video-effects/Attic/hacks.mk
cvs diff -r1.73 -r1.74 pkgsrc/multimedia/handbrake/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/handbrake/Makefile 2022/03/12 07:17:19 1.73
+++ pkgsrc/multimedia/handbrake/Makefile 2022/03/12 08:01:50 1.74
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.73 2022/03/12 07:17:19 nia Exp $ 1# $NetBSD: Makefile,v 1.74 2022/03/12 08:01:50 nia Exp $
2# 2#
3 3
4DISTNAME= HandBrake-1.3.3-source 4DISTNAME= HandBrake-1.3.3-source
5PKGNAME= ${DISTNAME:tl:S/-source//} 5PKGNAME= ${DISTNAME:tl:S/-source//}
6PKGREVISION= 4 6PKGREVISION= 4
7CATEGORIES= multimedia 7CATEGORIES= multimedia
8MASTER_SITES= ${MASTER_SITE_GITHUB:=HandBrake/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=HandBrake/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10GITHUB_PROJECT= HandBrake 10GITHUB_PROJECT= HandBrake
11GITHUB_RELEASE= 1.3.3 11GITHUB_RELEASE= 1.3.3
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://handbrake.fr/ 14HOMEPAGE= https://handbrake.fr/
@@ -75,23 +75,24 @@ post-extract: @@ -75,23 +75,24 @@ post-extract:
75.for distfile in ${CDISTFILES} 75.for distfile in ${CDISTFILES}
76 cp ${DISTDIR}/${DIST_SUBDIR}/${distfile} \ 76 cp ${DISTDIR}/${DIST_SUBDIR}/${distfile} \
77 ${WRKSRC}/download/ 77 ${WRKSRC}/download/
78.endfor 78.endfor
79 cp ${DISTDIR}/${DIST_SUBDIR}/${MESON_DISTFILE} ${WRKSRC}/download/ 79 cp ${DISTDIR}/${DIST_SUBDIR}/${MESON_DISTFILE} ${WRKSRC}/download/
80 (cd ${WRKSRC}/contrib; tar zxf ${WRKSRC}/download/${MESON_DISTFILE}) 80 (cd ${WRKSRC}/contrib; tar zxf ${WRKSRC}/download/${MESON_DISTFILE})
81 81
82.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 82.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
83.include "../../audio/lame/buildlink3.mk" 83.include "../../audio/lame/buildlink3.mk"
84.include "../../audio/libopus/buildlink3.mk" 84.include "../../audio/libopus/buildlink3.mk"
85.include "../../audio/libsamplerate/buildlink3.mk" 85.include "../../audio/libsamplerate/buildlink3.mk"
86.include "../../audio/speex/buildlink3.mk" 86.include "../../audio/speex/buildlink3.mk"
87.include "../../devel/gettext-lib/buildlink3.mk" 87.include "../../devel/gettext-lib/buildlink3.mk"
 88.include "../../devel/gettext-tools/msgfmt-desktop.mk"
88.include "../../multimedia/gstreamer1/buildlink3.mk" 89.include "../../multimedia/gstreamer1/buildlink3.mk"
89.include "../../multimedia/libass/buildlink3.mk" 90.include "../../multimedia/libass/buildlink3.mk"
90.include "../../multimedia/libtheora/buildlink3.mk" 91.include "../../multimedia/libtheora/buildlink3.mk"
91.include "../../multimedia/libvpx/buildlink3.mk" 92.include "../../multimedia/libvpx/buildlink3.mk"
92.include "../../multimedia/x264-devel/buildlink3.mk" 93.include "../../multimedia/x264-devel/buildlink3.mk"
93.include "../../textproc/libxml2/buildlink3.mk" 94.include "../../textproc/libxml2/buildlink3.mk"
94.include "../../x11/gtk3/buildlink3.mk" 95.include "../../x11/gtk3/buildlink3.mk"
95.include "../../textproc/jansson/buildlink3.mk" 96.include "../../textproc/jansson/buildlink3.mk"
96.include "../../sysutils/desktop-file-utils/desktopdb.mk" 97.include "../../sysutils/desktop-file-utils/desktopdb.mk"
97.include "../../mk/bsd.pkg.mk" 98.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/multimedia/handbrake/Attic/hacks.mk
cvs diff -r1.121 -r1.122 pkgsrc/multimedia/totem/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/totem/Makefile 2022/03/12 07:17:19 1.121
+++ pkgsrc/multimedia/totem/Makefile 2022/03/12 08:01:50 1.122
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: Makefile,v 1.121 2022/03/12 07:17:19 nia Exp $ 1# $NetBSD: Makefile,v 1.122 2022/03/12 08:01:50 nia Exp $
2 2
3DISTNAME= totem-3.34.1 3DISTNAME= totem-3.34.1
4PKGREVISION= 13 4PKGREVISION= 13
5CATEGORIES= multimedia gnome 5CATEGORIES= multimedia gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/totem/3.34/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/totem/3.34/}
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/Videos 10HOMEPAGE= https://wiki.gnome.org/Apps/Videos
11COMMENT= Movie player designed for GNOME 11COMMENT= Movie player designed for GNOME
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= pkg-config msgfmt xgettext itstool 14USE_TOOLS+= pkg-config msgfmt xgettext itstool
15USE_TOOLS+= pod2man 15USE_TOOLS+= pod2man
16 16
17MESON_ARGS+= -Denable-python=no 17MESON_ARGS+= -Denable-python=no
18 18
19PYTHON_FOR_BUILD_ONLY= tool 19PYTHON_FOR_BUILD_ONLY= tool
20 20
21PKGCONFIG_OVERRIDE+= data/totem.pc.in 21PKGCONFIG_OVERRIDE+= data/totem.pc.in
22 22
23# workaround for build failure 23# workaround for build failure
24# https://gitlab.gnome.org/GNOME/json-glib/issues/35 24# https://gitlab.gnome.org/GNOME/json-glib/issues/35
25MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/src 25MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/src
26 26
27.include "../../devel/meson/build.mk" 27.include "../../devel/meson/build.mk"
 28.include "../../devel/gettext-tools/msgfmt-desktop.mk"
28.include "../../devel/glib2/schemas.mk" 29.include "../../devel/glib2/schemas.mk"
29.include "../../devel/libpeas/buildlink3.mk" 30.include "../../devel/libpeas/buildlink3.mk"
30.include "../../graphics/clutter-gtk/buildlink3.mk" 31.include "../../graphics/clutter-gtk/buildlink3.mk"
31.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 32.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
32.include "../../lang/python/tool.mk" 33.include "../../lang/python/tool.mk"
33.include "../../net/grilo/buildlink3.mk" 34.include "../../net/grilo/buildlink3.mk"
34.include "../../multimedia/clutter-gst/buildlink3.mk" 35.include "../../multimedia/clutter-gst/buildlink3.mk"
35.include "../../multimedia/gstreamer1/buildlink3.mk" 36.include "../../multimedia/gstreamer1/buildlink3.mk"
36.include "../../multimedia/gst-plugins1-bad/buildlink3.mk" 37.include "../../multimedia/gst-plugins1-bad/buildlink3.mk"
37.include "../../multimedia/gst-plugins1-good/buildlink3.mk" 38.include "../../multimedia/gst-plugins1-good/buildlink3.mk"
38.include "../../multimedia/totem-pl-parser/buildlink3.mk" 39.include "../../multimedia/totem-pl-parser/buildlink3.mk"
39.include "../../sysutils/desktop-file-utils/desktopdb.mk" 40.include "../../sysutils/desktop-file-utils/desktopdb.mk"
40.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" 41.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
File Deleted: pkgsrc/multimedia/totem/Attic/hacks.mk
cvs diff -r1.112 -r1.113 pkgsrc/print/evince3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/print/evince3/Attic/Makefile 2021/12/08 16:02:32 1.112
+++ pkgsrc/print/evince3/Attic/Makefile 2022/03/12 08:01:50 1.113
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.112 2021/12/08 16:02:32 adam Exp $ 1# $NetBSD: Makefile,v 1.113 2022/03/12 08:01:50 nia Exp $
2 2
3PKGREVISION= 17 3PKGREVISION= 17
4.include "../../print/evince3/Makefile.common" 4.include "../../print/evince3/Makefile.common"
5 5
6COMMENT= Document viewer 6COMMENT= Document viewer
7 7
8.include "options.mk" 8.include "options.mk"
9 9
10CONFIGURE_ARGS+= --enable-comics 10CONFIGURE_ARGS+= --enable-comics
11CONFIGURE_ARGS+= --disable-nautilus 11CONFIGURE_ARGS+= --disable-nautilus
12 12
13USE_TOOLS+= gsed 13USE_TOOLS+= gsed
14 14
15CONFIGURE_ARGS+= --disable-compile-warnings 15CONFIGURE_ARGS+= --disable-compile-warnings
16 16
 17.include "../../devel/gettext-tools/msgfmt-desktop.mk"
17.include "../../devel/glib2/schemas.mk" 18.include "../../devel/glib2/schemas.mk"
18.include "../../graphics/librsvg/buildlink3.mk" 19.include "../../graphics/librsvg/buildlink3.mk"
19.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 20.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
20.include "../../security/libsecret/buildlink3.mk" 21.include "../../security/libsecret/buildlink3.mk"
21BUILDLINK_DEPMETHOD.libXt= build 22BUILDLINK_DEPMETHOD.libXt= build
22.include "../../x11/libXt/buildlink3.mk" 23.include "../../x11/libXt/buildlink3.mk"
23.include "../../x11/libSM/buildlink3.mk" 24.include "../../x11/libSM/buildlink3.mk"
24 
25.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/print/evince3/Attic/hacks.mk
cvs diff -r1.22 -r1.23 pkgsrc/security/gcr/Makefile (expand / switch to unified diff)

--- pkgsrc/security/gcr/Makefile 2022/03/12 07:28:19 1.22
+++ pkgsrc/security/gcr/Makefile 2022/03/12 08:01:51 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.22 2022/03/12 07:28:19 nia Exp $ 1# $NetBSD: Makefile,v 1.23 2022/03/12 08:01:51 nia Exp $
2 2
3DISTNAME= gcr-3.38.1 3DISTNAME= gcr-3.38.1
4CATEGORIES= security 4CATEGORIES= security
5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gcr/${PKGVERSION_NOREV:R}/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gcr/${PKGVERSION_NOREV:R}/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.gnome.org/ 9HOMEPAGE= https://www.gnome.org/
10COMMENT= Library for crypto UI and related tasks 10COMMENT= Library for crypto UI and related tasks
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13BUILD_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4 13BUILD_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
14 14
@@ -20,25 +20,26 @@ GNU_CONFIGURE= yes @@ -20,25 +20,26 @@ GNU_CONFIGURE= yes
20CONFIGURE_ARGS+= --enable-gtk-doc 20CONFIGURE_ARGS+= --enable-gtk-doc
21CONFIGURE_ARGS+= --enable-vala 21CONFIGURE_ARGS+= --enable-vala
22 22
23PKGCONFIG_OVERRIDE+= gck-1.pc.in 23PKGCONFIG_OVERRIDE+= gck-1.pc.in
24PKGCONFIG_OVERRIDE+= gcr-base-3.pc.in 24PKGCONFIG_OVERRIDE+= gcr-base-3.pc.in
25PKGCONFIG_OVERRIDE+= gcr-ui.pc.in 25PKGCONFIG_OVERRIDE+= gcr-ui.pc.in
26PKGCONFIG_OVERRIDE+= gcr-3.pc.in 26PKGCONFIG_OVERRIDE+= gcr-3.pc.in
27 27
28TEST_TARGET= check 28TEST_TARGET= check
29 29
30pre-configure: 30pre-configure:
31 cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh 31 cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
32 32
 33.include "../../devel/gettext-tools/msgfmt-desktop.mk"
33BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38 34BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38
34.include "../../devel/glib2/buildlink3.mk" 35.include "../../devel/glib2/buildlink3.mk"
35.include "../../devel/gobject-introspection/buildlink3.mk" 36.include "../../devel/gobject-introspection/buildlink3.mk"
36.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 37.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
37.include "../../lang/vala/buildlink3.mk" 38.include "../../lang/vala/buildlink3.mk"
38.include "../../security/libgcrypt/buildlink3.mk" 39.include "../../security/libgcrypt/buildlink3.mk"
39.include "../../security/p11-kit/buildlink3.mk" 40.include "../../security/p11-kit/buildlink3.mk"
40.include "../../sysutils/desktop-file-utils/desktopdb.mk" 41.include "../../sysutils/desktop-file-utils/desktopdb.mk"
41.include "../../textproc/gnome-doc-utils/buildlink3.mk" 42.include "../../textproc/gnome-doc-utils/buildlink3.mk"
42.include "../../textproc/gtk-doc/buildlink3.mk" 43.include "../../textproc/gtk-doc/buildlink3.mk"
43.include "../../x11/gtk3/buildlink3.mk" 44.include "../../x11/gtk3/buildlink3.mk"
44.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/security/gcr/Attic/hacks.mk
cvs diff -r1.40 -r1.41 pkgsrc/security/polkit/Makefile (expand / switch to unified diff)

--- pkgsrc/security/polkit/Makefile 2022/03/12 07:28:19 1.40
+++ pkgsrc/security/polkit/Makefile 2022/03/12 08:01:51 1.41
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.40 2022/03/12 07:28:19 nia Exp $ 1# $NetBSD: Makefile,v 1.41 2022/03/12 08:01:51 nia Exp $
2 2
3DISTNAME= polkit-0.120 3DISTNAME= polkit-0.120
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= http://www.freedesktop.org/software/polkit/releases/ 6MASTER_SITES= http://www.freedesktop.org/software/polkit/releases/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.freedesktop.org/wiki/Software/polkit 9HOMEPAGE= https://www.freedesktop.org/wiki/Software/polkit
10COMMENT= Authorization Manager 10COMMENT= Authorization Manager
11LICENSE= gnu-lgpl-v2 11LICENSE= gnu-lgpl-v2
12 12
13TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4 13TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
14TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools 14TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
@@ -72,16 +72,17 @@ CONF_FILES+= ${PREFIX}/share/examples/po @@ -72,16 +72,17 @@ CONF_FILES+= ${PREFIX}/share/examples/po
72.include "options.mk" 72.include "options.mk"
73 73
74SUBST_CLASSES+= paths 74SUBST_CLASSES+= paths
75SUBST_STAGE.paths= pre-configure 75SUBST_STAGE.paths= pre-configure
76SUBST_FILES.paths+= docs/man/pkexec.xml 76SUBST_FILES.paths+= docs/man/pkexec.xml
77SUBST_FILES.paths+= src/examples/org.freedesktop.policykit.examples.pkexec.policy.in 77SUBST_FILES.paths+= src/examples/org.freedesktop.policykit.examples.pkexec.policy.in
78SUBST_SED.paths+= -e 's,/usr/bin/,${PREFIX}/bin/,g' 78SUBST_SED.paths+= -e 's,/usr/bin/,${PREFIX}/bin/,g'
79 79
80pre-configure: 80pre-configure:
81 cd ${WRKSRC} && autoreconf -fi 81 cd ${WRKSRC} && autoreconf -fi
82 82
83.include "../../lang/libduktape/buildlink3.mk" 83.include "../../lang/libduktape/buildlink3.mk"
84.include "../../devel/gettext-lib/buildlink3.mk" 84.include "../../devel/gettext-lib/buildlink3.mk"
 85.include "../../devel/gettext-tools/msgfmt-desktop.mk"
85.include "../../devel/glib2/buildlink3.mk" 86.include "../../devel/glib2/buildlink3.mk"
86.include "../../textproc/expat/buildlink3.mk" 87.include "../../textproc/expat/buildlink3.mk"
87.include "../../mk/bsd.pkg.mk" 88.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/security/polkit/Attic/hacks.mk
cvs diff -r1.170 -r1.171 pkgsrc/security/seahorse/Makefile (expand / switch to unified diff)

--- pkgsrc/security/seahorse/Makefile 2022/03/12 07:28:19 1.170
+++ pkgsrc/security/seahorse/Makefile 2022/03/12 08:01:51 1.171
@@ -1,35 +1,36 @@ @@ -1,35 +1,36 @@
1# $NetBSD: Makefile,v 1.170 2022/03/12 07:28:19 nia Exp $ 1# $NetBSD: Makefile,v 1.171 2022/03/12 08:01:51 nia Exp $
2 2
3DISTNAME= seahorse-3.38.0.1 3DISTNAME= seahorse-3.38.0.1
4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/3.38/} 4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/3.38/}
5PKGREVISION= 4 5PKGREVISION= 4
6CATEGORIES= security gnome 6CATEGORIES= security 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/Seahorse 10HOMEPAGE= https://wiki.gnome.org/Apps/Seahorse
11COMMENT= GNOME encryption interface 11COMMENT= GNOME encryption interface
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= pkg-config msgfmt xgettext itstool 14USE_TOOLS+= pkg-config msgfmt xgettext itstool
15USE_TOOLS+= gdbus-codegen 15USE_TOOLS+= gdbus-codegen
16 16
17# Why does it want specific point releases? 17# Why does it want specific point releases?
18MESON_ARGS+= -Dcheck-compatible-gpg=false 18MESON_ARGS+= -Dcheck-compatible-gpg=false
19 19
20PYTHON_FOR_BUILD_ONLY= tool 20PYTHON_FOR_BUILD_ONLY= tool
21 21
22.include "../../devel/meson/build.mk" 22.include "../../devel/meson/build.mk"
 23.include "../../devel/gettext-tools/msgfmt-desktop.mk"
23.include "../../devel/glib2/schemas.mk" 24.include "../../devel/glib2/schemas.mk"
24.include "../../devel/gobject-introspection/buildlink3.mk" 25.include "../../devel/gobject-introspection/buildlink3.mk"
25.include "../../devel/libhandy1/buildlink3.mk" 26.include "../../devel/libhandy1/buildlink3.mk"
26.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 27.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
27.include "../../lang/python/tool.mk" 28.include "../../lang/python/tool.mk"
28.include "../../lang/vala/buildlink3.mk" 29.include "../../lang/vala/buildlink3.mk"
29.include "../../net/avahi/buildlink3.mk" 30.include "../../net/avahi/buildlink3.mk"
30.include "../../net/libsoup/buildlink3.mk" 31.include "../../net/libsoup/buildlink3.mk"
31.include "../../security/gcr/buildlink3.mk" 32.include "../../security/gcr/buildlink3.mk"
32.include "../../security/gpgme/buildlink3.mk" 33.include "../../security/gpgme/buildlink3.mk"
33.include "../../security/libpwquality/buildlink3.mk" 34.include "../../security/libpwquality/buildlink3.mk"
34.include "../../security/libsecret/buildlink3.mk" 35.include "../../security/libsecret/buildlink3.mk"
35.include "../../sysutils/desktop-file-utils/desktopdb.mk" 36.include "../../sysutils/desktop-file-utils/desktopdb.mk"
File Deleted: pkgsrc/security/seahorse/Attic/hacks.mk
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/gnome-characters/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-characters/Makefile 2022/03/12 07:37:42 1.4
+++ pkgsrc/sysutils/gnome-characters/Makefile 2022/03/12 08:01:51 1.5
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1# $NetBSD: Makefile,v 1.4 2022/03/12 07:37:42 nia Exp $ 1# $NetBSD: Makefile,v 1.5 2022/03/12 08:01:51 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
16PYTHON_FOR_BUILD_ONLY= tool 16PYTHON_FOR_BUILD_ONLY= tool
17 17
18.include "../../devel/meson/build.mk" 18.include "../../devel/meson/build.mk"
 19.include "../../devel/gettext-tools/msgfmt-desktop.mk"
19.include "../../devel/glib2/schemas.mk" 20.include "../../devel/glib2/schemas.mk"
20.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 21.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
21.include "../../lang/gjs/buildlink3.mk" 22.include "../../lang/gjs/buildlink3.mk"
22.include "../../sysutils/desktop-file-utils/desktopdb.mk" 23.include "../../sysutils/desktop-file-utils/desktopdb.mk"
23.include "../../textproc/libunistring/buildlink3.mk" 24.include "../../textproc/libunistring/buildlink3.mk"
24.include "../../x11/gtk3/buildlink3.mk" 25.include "../../x11/gtk3/buildlink3.mk"
25.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/sysutils/gnome-characters/Attic/hacks.mk
cvs diff -r1.12 -r1.13 pkgsrc/sysutils/gnome-control-center/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-control-center/Makefile 2022/03/12 07:37:42 1.12
+++ pkgsrc/sysutils/gnome-control-center/Makefile 2022/03/12 08:01:51 1.13
@@ -1,39 +1,40 @@ @@ -1,39 +1,40 @@
1# $NetBSD: Makefile,v 1.12 2022/03/12 07:37:42 nia Exp $ 1# $NetBSD: Makefile,v 1.13 2022/03/12 08:01:51 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
21PYTHON_FOR_BUILD_ONLY= tool 21PYTHON_FOR_BUILD_ONLY= tool
22 22
23PKGCONFIG_OVERRIDE_STAGE= pre-install 23PKGCONFIG_OVERRIDE_STAGE= pre-install
24PKGCONFIG_OVERRIDE+= output/panels/keyboard/gnome-keybindings.pc 24PKGCONFIG_OVERRIDE+= output/panels/keyboard/gnome-keybindings.pc
25 25
26.include "../../devel/meson/build.mk" 26.include "../../devel/meson/build.mk"
 27.include "../../devel/gettext-tools/msgfmt-desktop.mk"
27.include "../../devel/glib2/schemas.mk" 28.include "../../devel/glib2/schemas.mk"
28.include "../../audio/gsound/buildlink3.mk" 29.include "../../audio/gsound/buildlink3.mk"
29.include "../../audio/pulseaudio/buildlink3.mk" 30.include "../../audio/pulseaudio/buildlink3.mk"
30.include "../../devel/libhandy1/buildlink3.mk" 31.include "../../devel/libhandy1/buildlink3.mk"
31.include "../../graphics/colord/buildlink3.mk" 32.include "../../graphics/colord/buildlink3.mk"
32.include "../../graphics/colord-gtk/buildlink3.mk" 33.include "../../graphics/colord-gtk/buildlink3.mk"
33.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 34.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
34.include "../../inputmethod/ibus/buildlink3.mk" 35.include "../../inputmethod/ibus/buildlink3.mk"
35.include "../../lang/python/tool.mk" 36.include "../../lang/python/tool.mk"
36.include "../../net/gnome-online-accounts/buildlink3.mk" 37.include "../../net/gnome-online-accounts/buildlink3.mk"
37.include "../../net/grilo/buildlink3.mk" 38.include "../../net/grilo/buildlink3.mk"
38.include "../../net/samba4/buildlink3.mk" 39.include "../../net/samba4/buildlink3.mk"
39.include "../../print/libcups/buildlink3.mk" 40.include "../../print/libcups/buildlink3.mk"
File Deleted: pkgsrc/sysutils/gnome-control-center/Attic/hacks.mk
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/gnome-font-viewer/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-font-viewer/Makefile 2022/03/12 07:37:42 1.5
+++ pkgsrc/sysutils/gnome-font-viewer/Makefile 2022/03/12 08:01:51 1.6
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1# $NetBSD: Makefile,v 1.5 2022/03/12 07:37:42 nia Exp $ 1# $NetBSD: Makefile,v 1.6 2022/03/12 08:01:51 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
16PYTHON_FOR_BUILD_ONLY= tool 16PYTHON_FOR_BUILD_ONLY= tool
17 17
18.include "../../devel/meson/build.mk" 18.include "../../devel/meson/build.mk"
 19.include "../../devel/gettext-tools/msgfmt-desktop.mk"
19.include "../../devel/glib2/schemas.mk" 20.include "../../devel/glib2/schemas.mk"
20.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 21.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
21.include "../../sysutils/desktop-file-utils/desktopdb.mk" 22.include "../../sysutils/desktop-file-utils/desktopdb.mk"
22.include "../../x11/gnome-desktop3/buildlink3.mk" 23.include "../../x11/gnome-desktop3/buildlink3.mk"
23.include "../../x11/gtk3/buildlink3.mk" 24.include "../../x11/gtk3/buildlink3.mk"
24.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/sysutils/gnome-font-viewer/Attic/hacks.mk
cvs diff -r1.155 -r1.156 pkgsrc/sysutils/nautilus/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/nautilus/Makefile 2022/03/12 07:37:42 1.155
+++ pkgsrc/sysutils/nautilus/Makefile 2022/03/12 08:01:51 1.156
@@ -1,36 +1,37 @@ @@ -1,36 +1,37 @@
1# $NetBSD: Makefile,v 1.155 2022/03/12 07:37:42 nia Exp $ 1# $NetBSD: Makefile,v 1.156 2022/03/12 08:01:51 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
19PYTHON_FOR_BUILD_ONLY= tool 19PYTHON_FOR_BUILD_ONLY= tool
20 20
21PKGCONFIG_OVERRIDE_STAGE= pre-install 21PKGCONFIG_OVERRIDE_STAGE= pre-install
22PKGCONFIG_OVERRIDE+= output/meson-private/libnautilus-extension.pc 22PKGCONFIG_OVERRIDE+= output/meson-private/libnautilus-extension.pc
23 23
24.include "../../devel/meson/build.mk" 24.include "../../devel/meson/build.mk"
25.include "../../archivers/gnome-autoar/buildlink3.mk" 25.include "../../archivers/gnome-autoar/buildlink3.mk"
 26.include "../../devel/gettext-tools/msgfmt-desktop.mk"
26.include "../../devel/glib2/schemas.mk" 27.include "../../devel/glib2/schemas.mk"
27.include "../../devel/gobject-introspection/buildlink3.mk" 28.include "../../devel/gobject-introspection/buildlink3.mk"
28.include "../../graphics/gexiv2/buildlink3.mk" 29.include "../../graphics/gexiv2/buildlink3.mk"
29.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 30.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
30.include "../../lang/python/tool.mk" 31.include "../../lang/python/tool.mk"
31.include "../../multimedia/gst-plugins1-base/buildlink3.mk" 32.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
32.include "../../sysutils/desktop-file-utils/buildlink3.mk" 33.include "../../sysutils/desktop-file-utils/buildlink3.mk"
33.include "../../sysutils/gnome-tracker/buildlink3.mk" 34.include "../../sysutils/gnome-tracker/buildlink3.mk"
34.include "../../x11/gnome-desktop3/buildlink3.mk" 35.include "../../x11/gnome-desktop3/buildlink3.mk"
35.include "../../x11/gtk3/buildlink3.mk" 36.include "../../x11/gtk3/buildlink3.mk"
36.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/sysutils/nautilus/Attic/hacks.mk
cvs diff -r1.7 -r1.8 pkgsrc/textproc/gnome-dictionary/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/gnome-dictionary/Makefile 2022/03/12 07:40:48 1.7
+++ pkgsrc/textproc/gnome-dictionary/Makefile 2022/03/12 08:01:51 1.8
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1# $NetBSD: Makefile,v 1.7 2022/03/12 07:40:48 nia Exp $ 1# $NetBSD: Makefile,v 1.8 2022/03/12 08:01:51 nia Exp $
2 2
3DISTNAME= gnome-dictionary-3.26.1 3DISTNAME= gnome-dictionary-3.26.1
4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/} 4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= textproc gnome 6CATEGORIES= textproc 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/Dictionary 10HOMEPAGE= https://wiki.gnome.org/Apps/Dictionary
11COMMENT= GNOME application to look up definitions 11COMMENT= GNOME application to look up definitions
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 14TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
15TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 15TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
16 16
17USE_TOOLS+= pkg-config msgfmt xgettext itstool 17USE_TOOLS+= pkg-config msgfmt xgettext itstool
18 18
19PYTHON_FOR_BUILD_ONLY= tool 19PYTHON_FOR_BUILD_ONLY= tool
20 20
21LDFLAGS.SunOS+= -lnsl 21LDFLAGS.SunOS+= -lnsl
22 22
23.include "../../devel/meson/build.mk" 23.include "../../devel/meson/build.mk"
 24.include "../../devel/gettext-tools/msgfmt-desktop.mk"
24.include "../../devel/glib2/schemas.mk" 25.include "../../devel/glib2/schemas.mk"
25.include "../../sysutils/desktop-file-utils/desktopdb.mk" 26.include "../../sysutils/desktop-file-utils/desktopdb.mk"
26.include "../../x11/gtk3/buildlink3.mk" 27.include "../../x11/gtk3/buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/textproc/gnome-dictionary/Attic/hacks.mk
cvs diff -r1.12 -r1.13 pkgsrc/time/gnome-calendar/Makefile (expand / switch to unified diff)

--- pkgsrc/time/gnome-calendar/Makefile 2022/03/12 07:42:32 1.12
+++ pkgsrc/time/gnome-calendar/Makefile 2022/03/12 08:01:52 1.13
@@ -1,32 +1,33 @@ @@ -1,32 +1,33 @@
1# $NetBSD: Makefile,v 1.12 2022/03/12 07:42:32 nia Exp $ 1# $NetBSD: Makefile,v 1.13 2022/03/12 08:01:52 nia Exp $
2 2
3DISTNAME= gnome-calendar-40.0 3DISTNAME= gnome-calendar-40.0
4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/} 4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= time gnome 6CATEGORIES= time 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/Calendar/ 10HOMEPAGE= https://wiki.gnome.org/Apps/Calendar/
11COMMENT= Calendar application for GNOME 11COMMENT= Calendar application for GNOME
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14USE_TOOLS+= pkg-config msgfmt xgettext 14USE_TOOLS+= pkg-config msgfmt xgettext
15USE_TOOLS+= gdbus-codegen 15USE_TOOLS+= gdbus-codegen
16 16
17PYTHON_FOR_BUILD_ONLY= tool 17PYTHON_FOR_BUILD_ONLY= tool
18 18
19.include "../../devel/meson/build.mk" 19.include "../../devel/meson/build.mk"
 20.include "../../devel/gettext-tools/msgfmt-desktop.mk"
20.include "../../devel/glib2/schemas.mk" 21.include "../../devel/glib2/schemas.mk"
21.include "../../devel/libdazzle/buildlink3.mk" 22.include "../../devel/libdazzle/buildlink3.mk"
22.include "../../devel/libgweather/buildlink3.mk" 23.include "../../devel/libgweather/buildlink3.mk"
23.include "../../devel/libhandy1/buildlink3.mk" 24.include "../../devel/libhandy1/buildlink3.mk"
24.include "../../geography/geoclue/buildlink3.mk" 25.include "../../geography/geoclue/buildlink3.mk"
25.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 26.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
26.include "../../mail/evolution-data-server/buildlink3.mk" 27.include "../../mail/evolution-data-server/buildlink3.mk"
27.include "../../time/libical/buildlink3.mk" 28.include "../../time/libical/buildlink3.mk"
28.include "../../net/gnome-online-accounts/buildlink3.mk" 29.include "../../net/gnome-online-accounts/buildlink3.mk"
29.include "../../net/libsoup/buildlink3.mk" 30.include "../../net/libsoup/buildlink3.mk"
30.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" 31.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
31.include "../../sysutils/desktop-file-utils/desktopdb.mk" 32.include "../../sysutils/desktop-file-utils/desktopdb.mk"
32.include "../../x11/gtk3/buildlink3.mk" 33.include "../../x11/gtk3/buildlink3.mk"
File Deleted: pkgsrc/time/gnome-calendar/Attic/hacks.mk
cvs diff -r1.7 -r1.8 pkgsrc/time/gnome-pomodoro/Makefile (expand / switch to unified diff)

--- pkgsrc/time/gnome-pomodoro/Makefile 2022/03/12 07:42:32 1.7
+++ pkgsrc/time/gnome-pomodoro/Makefile 2022/03/12 08:01:52 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.7 2022/03/12 07:42:32 nia Exp $ 1# $NetBSD: Makefile,v 1.8 2022/03/12 08:01:52 nia Exp $
2 2
3DISTNAME= gnome-pomodoro-0.17.0 3DISTNAME= gnome-pomodoro-0.17.0
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= time 5CATEGORIES= time
6MASTER_SITES= ${MASTER_SITE_GITHUB:=codito/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=codito/}
7GITHUB_PROJECT= gnome-pomodoro 7GITHUB_PROJECT= gnome-pomodoro
8GITHUB_TAG= ${PKGVERSION_NOREV} 8GITHUB_TAG= ${PKGVERSION_NOREV}
9 9
10MAINTAINER= ryoon@NetBSD.org 10MAINTAINER= ryoon@NetBSD.org
11HOMEPAGE= https://gnomepomodoro.org/ 11HOMEPAGE= https://gnomepomodoro.org/
12COMMENT= Pomodoro timer for Gnome 12COMMENT= Pomodoro timer for Gnome
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
@@ -21,21 +21,22 @@ CFLAGS+= -Wno-return-type @@ -21,21 +21,22 @@ CFLAGS+= -Wno-return-type
21 21
22USE_LIBTOOL= yes 22USE_LIBTOOL= yes
23USE_PKGLOCALEDIR= yes 23USE_PKGLOCALEDIR= yes
24USE_LANGUAGES= c 24USE_LANGUAGES= c
25 25
26USE_TOOLS+= automake autopoint gmake pkg-config 26USE_TOOLS+= automake autopoint gmake pkg-config
27GNU_CONFIGURE= yes 27GNU_CONFIGURE= yes
28CONFIGURE_SCRIPT= autogen.sh 28CONFIGURE_SCRIPT= autogen.sh
29 29
30.include "../../audio/libcanberra/buildlink3.mk" 30.include "../../audio/libcanberra/buildlink3.mk"
31.include "../../databases/gom/buildlink3.mk" 31.include "../../databases/gom/buildlink3.mk"
32.include "../../databases/sqlite3/buildlink3.mk" 32.include "../../databases/sqlite3/buildlink3.mk"
33.include "../../devel/appstream-glib/buildlink3.mk" 33.include "../../devel/appstream-glib/buildlink3.mk"
 34.include "../../devel/gettext-tools/msgfmt-desktop.mk"
34.include "../../devel/glib2/schemas.mk" 35.include "../../devel/glib2/schemas.mk"
35.include "../../devel/gobject-introspection/buildlink3.mk" 36.include "../../devel/gobject-introspection/buildlink3.mk"
36.include "../../devel/libpeas/buildlink3.mk" 37.include "../../devel/libpeas/buildlink3.mk"
37.include "../../multimedia/gstreamer1/buildlink3.mk" 38.include "../../multimedia/gstreamer1/buildlink3.mk"
38.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" 39.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
39.include "../../x11/gtk3/buildlink3.mk" 40.include "../../x11/gtk3/buildlink3.mk"
40.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 41.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
41.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/time/gnome-pomodoro/Attic/hacks.mk
cvs diff -r1.208 -r1.209 pkgsrc/www/epiphany/Makefile (expand / switch to unified diff)

--- pkgsrc/www/epiphany/Makefile 2022/03/12 07:44:12 1.208
+++ pkgsrc/www/epiphany/Makefile 2022/03/12 08:01:52 1.209
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1# $NetBSD: Makefile,v 1.208 2022/03/12 07:44:12 nia Exp $ 1# $NetBSD: Makefile,v 1.209 2022/03/12 08:01:52 nia Exp $
2 2
3DISTNAME= epiphany-40.6 3DISTNAME= epiphany-40.6
4CATEGORIES= www gnome 4CATEGORIES= www gnome
5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/${PKGVERSION_NOREV:R}/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/${PKGVERSION_NOREV:R}/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://wiki.gnome.org/Apps/Web 9HOMEPAGE= https://wiki.gnome.org/Apps/Web
10COMMENT= Web browser for the GNOME desktop 10COMMENT= Web browser for the GNOME desktop
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13USE_TOOLS+= pkg-config msgfmt xgettext itstool 13USE_TOOLS+= pkg-config msgfmt xgettext itstool
14USE_TOOLS+= gdbus-codegen 14USE_TOOLS+= gdbus-codegen
15 15
16MESON_ARGS+= -Dlibportal=disabled 16MESON_ARGS+= -Dlibportal=disabled
17MESON_ARGS+= -Dunit_tests=disabled 17MESON_ARGS+= -Dunit_tests=disabled
18 18
19LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/epiphany 19LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/epiphany
20 20
21PYTHON_FOR_BUILD_ONLY= tool 21PYTHON_FOR_BUILD_ONLY= tool
22 22
23.include "../../devel/meson/build.mk" 23.include "../../devel/meson/build.mk"
24.include "../../archivers/libarchive/buildlink3.mk" 24.include "../../archivers/libarchive/buildlink3.mk"
 25.include "../../devel/gettext-tools/msgfmt-desktop.mk"
25BUILDLINK_API_DEPENDS.glib2+= glib2>=2.64.0 26BUILDLINK_API_DEPENDS.glib2+= glib2>=2.64.0
26.include "../../devel/glib2/schemas.mk" 27.include "../../devel/glib2/schemas.mk"
27BUILDLINK_API_DEPENDS.libdazzle+= libdazzle>=3.37.1 28BUILDLINK_API_DEPENDS.libdazzle+= libdazzle>=3.37.1
28.include "../../devel/libdazzle/buildlink3.mk" 29.include "../../devel/libdazzle/buildlink3.mk"
29BUILDLINK_API_DEPENDS.libhandy+= libhandy>=1.1.0 30BUILDLINK_API_DEPENDS.libhandy+= libhandy>=1.1.0
30.include "../../devel/libhandy/buildlink3.mk" 31.include "../../devel/libhandy/buildlink3.mk"
31.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 32.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
32.include "../../security/gcr/buildlink3.mk" 33.include "../../security/gcr/buildlink3.mk"
33.include "../../security/nettle/buildlink3.mk" 34.include "../../security/nettle/buildlink3.mk"
34.include "../../sysutils/desktop-file-utils/desktopdb.mk" 35.include "../../sysutils/desktop-file-utils/desktopdb.mk"
35.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" 36.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
36.include "../../textproc/iso-codes/buildlink3.mk" 37.include "../../textproc/iso-codes/buildlink3.mk"
37BUILDLINK_API_DEPENDS.json-glib+= json-glib>=1.6 38BUILDLINK_API_DEPENDS.json-glib+= json-glib>=1.6
File Deleted: pkgsrc/www/epiphany/Attic/hacks.mk
cvs diff -r1.207 -r1.208 pkgsrc/x11/gnome-session/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gnome-session/Makefile 2022/03/12 07:48:52 1.207
+++ pkgsrc/x11/gnome-session/Makefile 2022/03/12 08:01:52 1.208
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.207 2022/03/12 07:48:52 nia Exp $ 1# $NetBSD: Makefile,v 1.208 2022/03/12 08:01:52 nia Exp $
2 2
3DISTNAME= gnome-session-40.1.1 3DISTNAME= gnome-session-40.1.1
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= x11 gnome 5CATEGORIES= x11 gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R:R}/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R:R}/}
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-session 10HOMEPAGE= https://gitlab.gnome.org/GNOME/gnome-session
11COMMENT= GNOME3 session management utilities 11COMMENT= GNOME3 session management utilities
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 14TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
@@ -26,26 +26,27 @@ MESON_ARGS+= -Dgles2=false @@ -26,26 +26,27 @@ MESON_ARGS+= -Dgles2=false
26PLIST.gles2= yes 26PLIST.gles2= yes
27.endif 27.endif
28 28
29MESON_ARGS+= -Dsystemd=false 29MESON_ARGS+= -Dsystemd=false
30MESON_ARGS+= -Dsystemd_session=disable 30MESON_ARGS+= -Dsystemd_session=disable
31MESON_ARGS+= -Dsystemd_journal=false 31MESON_ARGS+= -Dsystemd_journal=false
32MESON_ARGS+= -Dconsolekit=true 32MESON_ARGS+= -Dconsolekit=true
33 33
34PYTHON_FOR_BUILD_ONLY= tool 34PYTHON_FOR_BUILD_ONLY= tool
35 35
36.include "../../devel/meson/build.mk" 36.include "../../devel/meson/build.mk"
37.include "../../graphics/MesaLib/buildlink3.mk" 37.include "../../graphics/MesaLib/buildlink3.mk"
38.include "../../devel/gettext-lib/buildlink3.mk" 38.include "../../devel/gettext-lib/buildlink3.mk"
 39.include "../../devel/gettext-tools/msgfmt-desktop.mk"
39BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 40BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0
40.include "../../devel/glib2/schemas.mk" 41.include "../../devel/glib2/schemas.mk"
41.include "../../devel/pango/buildlink3.mk" 42.include "../../devel/pango/buildlink3.mk"
42.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 43.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
43.include "../../graphics/libepoxy/buildlink3.mk" 44.include "../../graphics/libepoxy/buildlink3.mk"
44.include "../../textproc/libxslt/buildlink3.mk" 45.include "../../textproc/libxslt/buildlink3.mk"
45.include "../../sysutils/dbus/buildlink3.mk" 46.include "../../sysutils/dbus/buildlink3.mk"
46BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.76 47BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.76
47.include "../../sysutils/dbus-glib/buildlink3.mk" 48.include "../../sysutils/dbus-glib/buildlink3.mk"
48.include "../../sysutils/desktop-file-utils/desktopdb.mk" 49.include "../../sysutils/desktop-file-utils/desktopdb.mk"
49.include "../../devel/dconf/database.mk" 50.include "../../devel/dconf/database.mk"
50.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" 51.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
51.include "../../sysutils/gnome-settings-daemon/buildlink3.mk" 52.include "../../sysutils/gnome-settings-daemon/buildlink3.mk"
File Deleted: pkgsrc/x11/gnome-session/Attic/hacks.mk
cvs diff -r1.16 -r1.17 pkgsrc/x11/gnome-shell/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gnome-shell/Makefile 2022/03/12 07:48:52 1.16
+++ pkgsrc/x11/gnome-shell/Makefile 2022/03/12 08:01:52 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.16 2022/03/12 07:48:52 nia Exp $ 1# $NetBSD: Makefile,v 1.17 2022/03/12 08:01:52 nia Exp $
2 2
3DISTNAME= gnome-shell-40.2 3DISTNAME= gnome-shell-40.2
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= x11 gnome 5CATEGORIES= x11 gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= cirnatdan@NetBSD.org 9MAINTAINER= cirnatdan@NetBSD.org
10HOMEPAGE= https://wiki.gnome.org/Projects/GnomeShell 10HOMEPAGE= https://wiki.gnome.org/Projects/GnomeShell
11COMMENT= Next generation GNOME shell 11COMMENT= Next generation GNOME shell
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= pkg-config perl msgfmt xgettext gdbus-codegen 14USE_TOOLS+= pkg-config perl msgfmt xgettext gdbus-codegen
@@ -33,26 +33,27 @@ CONF_FILES+= ${PREFIX}/share/examples/xd @@ -33,26 +33,27 @@ CONF_FILES+= ${PREFIX}/share/examples/xd
33 33
34PYTHON_FOR_BUILD_ONLY= tool 34PYTHON_FOR_BUILD_ONLY= tool
35 35
36post-extract: 36post-extract:
37 cp ${FILESDIR}/*.xml ${WRKSRC}/data/dbus-interfaces/ 37 cp ${FILESDIR}/*.xml ${WRKSRC}/data/dbus-interfaces/
38 38
39.include "../../devel/meson/build.mk" 39.include "../../devel/meson/build.mk"
40BUILDLINK_API_DEPENDS.libgweather+= libgweather>=40.0 40BUILDLINK_API_DEPENDS.libgweather+= libgweather>=40.0
41.include "../../devel/libgweather/buildlink3.mk" 41.include "../../devel/libgweather/buildlink3.mk"
42.include "../../x11/gtk4/buildlink3.mk" 42.include "../../x11/gtk4/buildlink3.mk"
43.include "../../archivers/gnome-autoar/buildlink3.mk" 43.include "../../archivers/gnome-autoar/buildlink3.mk"
44.include "../../audio/pulseaudio/buildlink3.mk" 44.include "../../audio/pulseaudio/buildlink3.mk"
45.include "../../devel/at-spi2-atk/buildlink3.mk" 45.include "../../devel/at-spi2-atk/buildlink3.mk"
 46.include "../../devel/gettext-tools/msgfmt-desktop.mk"
46.include "../../devel/glib2/schemas.mk" 47.include "../../devel/glib2/schemas.mk"
47.include "../../devel/gobject-introspection/buildlink3.mk" 48.include "../../devel/gobject-introspection/buildlink3.mk"
48.include "../../graphics/adwaita-icon-theme/buildlink3.mk" 49.include "../../graphics/adwaita-icon-theme/buildlink3.mk"
49.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 50.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
50.include "../../graphics/librsvg/buildlink3.mk" 51.include "../../graphics/librsvg/buildlink3.mk"
51.include "../../inputmethod/ibus/buildlink3.mk" 52.include "../../inputmethod/ibus/buildlink3.mk"
52.include "../../lang/gjs/buildlink3.mk" 53.include "../../lang/gjs/buildlink3.mk"
53.include "../../lang/python/tool.mk" 54.include "../../lang/python/tool.mk"
54.include "../../mail/evolution-data-server/buildlink3.mk" 55.include "../../mail/evolution-data-server/buildlink3.mk"
55.include "../../textproc/json-glib/buildlink3.mk" 56.include "../../textproc/json-glib/buildlink3.mk"
56.include "../../security/gcr/buildlink3.mk" 57.include "../../security/gcr/buildlink3.mk"
57.include "../../security/libsecret/buildlink3.mk" 58.include "../../security/libsecret/buildlink3.mk"
58.include "../../security/polkit/buildlink3.mk" 59.include "../../security/polkit/buildlink3.mk"
File Deleted: pkgsrc/x11/gnome-shell/Attic/hacks.mk
cvs diff -r1.99 -r1.100 pkgsrc/x11/gnome-terminal/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gnome-terminal/Makefile 2022/03/12 07:48:53 1.99
+++ pkgsrc/x11/gnome-terminal/Makefile 2022/03/12 08:01:52 1.100
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.99 2022/03/12 07:48:53 nia Exp $ 1# $NetBSD: Makefile,v 1.100 2022/03/12 08:01:52 nia Exp $
2 2
3DISTNAME= gnome-terminal-3.36.2 3DISTNAME= gnome-terminal-3.36.2
4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-terminal/${PKGVERSION_NOREV:R}/} 4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-terminal/${PKGVERSION_NOREV:R}/}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= x11 gnome 6CATEGORIES= x11 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/Terminal 10HOMEPAGE= https://wiki.gnome.org/Apps/Terminal
11COMMENT= Terminal emulator for GNOME 11COMMENT= Terminal emulator for GNOME
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 14TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2
@@ -16,20 +16,21 @@ TOOL_DEPENDS+= libxml2-[0-9]*:../../text @@ -16,20 +16,21 @@ TOOL_DEPENDS+= libxml2-[0-9]*:../../text
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
18USE_TOOLS+= pkg-config gmake itstool 18USE_TOOLS+= pkg-config gmake itstool
19USE_TOOLS+= msgfmt msgmerge xgettext 19USE_TOOLS+= msgfmt msgmerge xgettext
20USE_TOOLS+= gdbus-codegen 20USE_TOOLS+= gdbus-codegen
21 21
22CONFIGURE_ARGS+= --disable-search-provider 22CONFIGURE_ARGS+= --disable-search-provider
23CONFIGURE_ARGS+= --without-nautilus-extension 23CONFIGURE_ARGS+= --without-nautilus-extension
24 24
25post-install: 25post-install:
26 ${RM} -f ${DESTDIR}${PREFIX}/lib/systemd/user/gnome-terminal-server.service 26 ${RM} -f ${DESTDIR}${PREFIX}/lib/systemd/user/gnome-terminal-server.service
27 27
28.include "../../devel/dconf/buildlink3.mk" 28.include "../../devel/dconf/buildlink3.mk"
 29.include "../../devel/gettext-tools/msgfmt-desktop.mk"
29.include "../../devel/glib2/schemas.mk" 30.include "../../devel/glib2/schemas.mk"
30.include "../../devel/libuuid/buildlink3.mk" 31.include "../../devel/libuuid/buildlink3.mk"
31.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 32.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
32.include "../../sysutils/desktop-file-utils/desktopdb.mk" 33.include "../../sysutils/desktop-file-utils/desktopdb.mk"
33.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" 34.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
34.include "../../x11/vte3/buildlink3.mk" 35.include "../../x11/vte3/buildlink3.mk"
35.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/x11/gnome-terminal/Attic/hacks.mk
cvs diff -r1.42 -r1.43 pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile 2022/03/12 07:48:53 1.42
+++ pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile 2022/03/12 08:01:52 1.43
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1# $NetBSD: Makefile,v 1.42 2022/03/12 07:48:53 nia Exp $ 1# $NetBSD: Makefile,v 1.43 2022/03/12 08:01:52 nia Exp $
2 2
3VERSION= 2.7.1 3VERSION= 2.7.1
4DISTNAME= xfce4-whiskermenu-plugin-${VERSION} 4DISTNAME= xfce4-whiskermenu-plugin-${VERSION}
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/${VERSION:R}/ 6MASTER_SITES= https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/${VERSION:R}/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= youri@NetBSD.org 9MAINTAINER= youri@NetBSD.org
10HOMEPAGE= https://gottcode.org/xfce4-whiskermenu-plugin/ 10HOMEPAGE= https://gottcode.org/xfce4-whiskermenu-plugin/
11COMMENT= Alternate application launcher for Xfce 11COMMENT= Alternate application launcher for Xfce
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_CMAKE= yes 14USE_CMAKE= yes
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_TOOLS+= gmake pkg-config msgfmt perl intltool 16USE_TOOLS+= gmake pkg-config msgfmt perl intltool
17 17
 18.include "../../devel/gettext-tools/msgfmt-desktop.mk"
18.include "../../x11/xfce4-garcon/buildlink3.mk" 19.include "../../x11/xfce4-garcon/buildlink3.mk"
19.include "../../x11/xfce4-panel/buildlink3.mk" 20.include "../../x11/xfce4-panel/buildlink3.mk"
20.include "../../x11/xfce4-exo/buildlink3.mk" 21.include "../../x11/xfce4-exo/buildlink3.mk"
21.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 22.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/x11/xfce4-whiskermenu-plugin/Attic/hacks.mk