Sat Mar 12 07:14:17 2022 UTC ()
misc: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.


(nia)
diff -r1.58 -r1.59 pkgsrc/misc/orca/Makefile
diff -r0 -r1.1 pkgsrc/misc/orca/hacks.mk
diff -r1.78 -r1.79 pkgsrc/misc/yelp3/Makefile
diff -r0 -r1.1 pkgsrc/misc/yelp3/hacks.mk
cvs diff -r1.58 -r1.59 pkgsrc/misc/orca/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/orca/Makefile 2021/12/08 16:05:42 1.58
+++ pkgsrc/misc/orca/Makefile 2022/03/12 07:14:17 1.59
@@ -1,40 +1,37 @@ @@ -1,40 +1,37 @@
1# $NetBSD: Makefile,v 1.58 2021/12/08 16:05:42 adam Exp $ 1# $NetBSD: Makefile,v 1.59 2022/03/12 07:14:17 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
15DEPENDS+= ${PYPKGPREFIX}-at-spi2-[0-9]*:../../devel/py-at-spi2 15DEPENDS+= ${PYPKGPREFIX}-at-spi2-[0-9]*:../../devel/py-at-spi2
16DEPENDS+= ${PYPKGPREFIX}-dbus-[0-9]*:../../sysutils/py-dbus 16DEPENDS+= ${PYPKGPREFIX}-dbus-[0-9]*:../../sysutils/py-dbus
17DEPENDS+= ${PYPKGPREFIX}-gstreamer1-[0-9]*:../../multimedia/py-gstreamer1 17DEPENDS+= ${PYPKGPREFIX}-gstreamer1-[0-9]*:../../multimedia/py-gstreamer1
18 18
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# XXX msgfmt: unknown option -- desktop 
26_TOOLS_USE_PKGSRC.msgfmt= yes 
27 
28# Python 3 only 25# Python 3 only
29PYTHON_VERSIONS_INCOMPATIBLE= 27 26PYTHON_VERSIONS_INCOMPATIBLE= 27
30 27
31CHECK_PORTABILITY_SKIP+= run_pylint.sh.in 28CHECK_PORTABILITY_SKIP+= run_pylint.sh.in
32 29
33.include "../../devel/glib2/schemas.mk" 30.include "../../devel/glib2/schemas.mk"
34.include "../../audio/speech-dispatcher/buildlink3.mk" 31.include "../../audio/speech-dispatcher/buildlink3.mk"
35.include "../../devel/libwnck3/buildlink3.mk" 32.include "../../devel/libwnck3/buildlink3.mk"
36.include "../../devel/py-gobject3-common/buildlink3.mk" 33.include "../../devel/py-gobject3-common/buildlink3.mk"
37.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 34.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
38.include "../../multimedia/gstreamer1/buildlink3.mk" 35.include "../../multimedia/gstreamer1/buildlink3.mk"
39.include "../../sysutils/desktop-file-utils/desktopdb.mk" 36.include "../../sysutils/desktop-file-utils/desktopdb.mk"
40.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" 37.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
File Added: pkgsrc/misc/orca/Attic/hacks.mk
# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:14:17 nia Exp $

.if !defined(ORCA_HACKS_MK)
ORCA_HACKS_MK:=

.include "../../mk/bsd.fast.prefs.mk"

.if ${OPSYS} == "NetBSD"
# Old GPLv2 version of msgfmt in NetBSD does not support --desktop/--xml.
TOOLS_PLATFORM.msgfmt=	# none
PKG_HACKS+=		avoid-gplv2-msgfmt
.endif
.endif # ORCA_HACKS_MK
cvs diff -r1.78 -r1.79 pkgsrc/misc/yelp3/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/yelp3/Makefile 2021/12/08 16:05:44 1.78
+++ pkgsrc/misc/yelp3/Makefile 2022/03/12 07:14:17 1.79
@@ -1,34 +1,31 @@ @@ -1,34 +1,31 @@
1# $NetBSD: Makefile,v 1.78 2021/12/08 16:05:44 adam Exp $ 1# $NetBSD: Makefile,v 1.79 2022/03/12 07:14:17 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
19# Requires --desktop in msgfmt. 
20_TOOLS_USE_PKGSRC.msgfmt= yes 
21 
22BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38.0 19BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38.0
23BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.13.3 20BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.13.3
24BUILDLINK_API_DEPENDS.libxslt+= libxslt>=1.1.4 21BUILDLINK_API_DEPENDS.libxslt+= libxslt>=1.1.4
25 22
26.include "../../archivers/bzip2/buildlink3.mk" 23.include "../../archivers/bzip2/buildlink3.mk"
27.include "../../devel/glib2/schemas.mk" 24.include "../../devel/glib2/schemas.mk"
28.include "../../x11/gtk3/buildlink3.mk" 25.include "../../x11/gtk3/buildlink3.mk"
29.include "../../textproc/libxml2/buildlink3.mk" 26.include "../../textproc/libxml2/buildlink3.mk"
30.include "../../textproc/libxslt/buildlink3.mk" 27.include "../../textproc/libxslt/buildlink3.mk"
31.include "../../databases/sqlite3/buildlink3.mk" 28.include "../../databases/sqlite3/buildlink3.mk"
32.include "../../www/webkit-gtk/buildlink3.mk" 29.include "../../www/webkit-gtk/buildlink3.mk"
33.include "../../textproc/yelp-xsl/buildlink3.mk" 30.include "../../textproc/yelp-xsl/buildlink3.mk"
34 31
File Added: pkgsrc/misc/yelp3/Attic/hacks.mk
# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:14:17 nia Exp $

.if !defined(YELP_HACKS_MK)
YELP_HACKS_MK:=

.include "../../mk/bsd.fast.prefs.mk"

.if ${OPSYS} == "NetBSD"
# Old GPLv2 version of msgfmt in NetBSD does not support --desktop/--xml.
TOOLS_PLATFORM.msgfmt=	# none
PKG_HACKS+=		avoid-gplv2-msgfmt
.endif
.endif # YELP_HACKS_MK