Tue Feb 14 14:03:53 2023 UTC ()
libnotify: move test-relevant stuff into a 'tests' option


(wiz)
diff -r1.73 -r1.74 pkgsrc/sysutils/libnotify/Makefile
diff -r1.8 -r1.9 pkgsrc/sysutils/libnotify/options.mk
cvs diff -r1.73 -r1.74 pkgsrc/sysutils/libnotify/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/libnotify/Makefile 2023/02/14 13:01:58 1.73
+++ pkgsrc/sysutils/libnotify/Makefile 2023/02/14 14:03:53 1.74
@@ -1,47 +1,40 @@ @@ -1,47 +1,40 @@
1# $NetBSD: Makefile,v 1.73 2023/02/14 13:01:58 wiz Exp $ 1# $NetBSD: Makefile,v 1.74 2023/02/14 14:03:53 wiz Exp $
2 2
3DISTNAME= libnotify-0.8.1 3DISTNAME= libnotify-0.8.1
4CATEGORIES= sysutils gnome 4CATEGORIES= sysutils gnome
5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libnotify/${PKGVERSION_NOREV:R}/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libnotify/${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://developer.gnome.org/libnotify/ 9HOMEPAGE= https://developer.gnome.org/libnotify/
10COMMENT= Desktop notification framework 10COMMENT= Desktop notification framework
11LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
12 12
13TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 13TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
14TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 14TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
15 15
16CONFLICTS+= libnotify07-[0-9]* 16CONFLICTS+= libnotify07-[0-9]*
17SUPERSEDES+= libnotify07-[0-9]* 17SUPERSEDES+= libnotify07-[0-9]*
18 18
19USE_TOOLS+= pkg-config 19USE_TOOLS+= pkg-config
20 20
21PKGCONFIG_OVERRIDE= output/meson-private/libnotify.pc 21PKGCONFIG_OVERRIDE= output/meson-private/libnotify.pc
22PKGCONFIG_OVERRIDE_STAGE= pre-install 22PKGCONFIG_OVERRIDE_STAGE= pre-install
23# for testing 
24#MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE} 
25 23
26MESON_ARGS+= -Dintrospection=enabled 24MESON_ARGS+= -Dintrospection=enabled
27# no tests are included 
28MESON_ARGS+= -Dtests=false 
29 25
30# Apply removals to post-wrapper transformed arguments. 26# Apply removals to post-wrapper transformed arguments.
31BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script 27BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script
32BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,${WRKSRC}/libnotify/libnotify.map 28BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,${WRKSRC}/libnotify/libnotify.map
33 29
34PYTHON_FOR_BUILD_ONLY= tool 30PYTHON_FOR_BUILD_ONLY= tool
35 31
36.include "options.mk" 32.include "options.mk"
37 33
38.include "../../graphics/gdk-pixbuf2/buildlink3.mk" 34.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
39BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38.0 35BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38.0
40.include "../../devel/glib2/buildlink3.mk" 36.include "../../devel/glib2/buildlink3.mk"
41BUILDLINK_DEPMETHOD.gobject-introspection= build 37BUILDLINK_DEPMETHOD.gobject-introspection= build
42.include "../../devel/gobject-introspection/buildlink3.mk" 38.include "../../devel/gobject-introspection/buildlink3.mk"
43# gtk3 only needed by tests (which are not included) 
44#BUILDLINK_DEPMETHOD.gtk3= build 
45#.include "../../x11/gtk3/buildlink3.mk" 
46.include "../../devel/meson/build.mk" 39.include "../../devel/meson/build.mk"
47.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/sysutils/libnotify/options.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/libnotify/options.mk 2022/06/07 18:07:16 1.8
+++ pkgsrc/sysutils/libnotify/options.mk 2023/02/14 14:03:53 1.9
@@ -1,19 +1,33 @@ @@ -1,19 +1,33 @@
1# $NetBSD: options.mk,v 1.8 2022/06/07 18:07:16 wiz Exp $ 1# $NetBSD: options.mk,v 1.9 2023/02/14 14:03:53 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libnotify 3PKG_OPTIONS_VAR= PKG_OPTIONS.libnotify
4PKG_SUPPORTED_OPTIONS= doc 4PKG_SUPPORTED_OPTIONS= doc tests
5PKG_SUGGESTED_OPTIONS= # empty 5PKG_SUGGESTED_OPTIONS= # empty
6PLIST_VARS+= doc 6PLIST_VARS+= doc
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10.if !empty(PKG_OPTIONS:Mdoc) 10.if !empty(PKG_OPTIONS:Mdoc)
11TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc 11TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
12TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto 12TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
13PLIST.doc= yes 13PLIST.doc= yes
14MESON_ARGS+= -Ddocbook_docs=enabled 14MESON_ARGS+= -Ddocbook_docs=enabled
15MESON_ARGS+= -Dgtk_doc=true 15MESON_ARGS+= -Dgtk_doc=true
16.else 16.else
17MESON_ARGS+= -Ddocbook_docs=disabled 17MESON_ARGS+= -Ddocbook_docs=disabled
18MESON_ARGS+= -Dgtk_doc=false 18MESON_ARGS+= -Dgtk_doc=false
19.endif 19.endif
 20
 21.if !empty(PKG_OPTIONS:Mtests)
 22# 'make test' doesn't work:
 23# [0/1] Running all tests.
 24# No tests defined.
 25# though tests are built (see output/tests);
 26# also, running them manually, some of these need a DISPLAY
 27MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE}
 28MESON_ARGS+= -Dtests=true
 29BUILDLINK_DEPMETHOD.gtk3= build
 30.include "../../x11/gtk3/buildlink3.mk"
 31.else
 32MESON_ARGS+= -Dtests=false
 33.endif