CVS commit: pkgsrc/sysutils/libnotify

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 14 14:03:53 UTC 2023

Modified Files:
        pkgsrc/sysutils/libnotify: Makefile options.mk

Log Message:
libnotify: move test-relevant stuff into a 'tests' option


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/sysutils/libnotify/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/libnotify/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/libnotify/Makefile
diff -u pkgsrc/sysutils/libnotify/Makefile:1.73 pkgsrc/sysutils/libnotify/Makefile:1.74
--- pkgsrc/sysutils/libnotify/Makefile:1.73     Tue Feb 14 13:01:58 2023
+++ pkgsrc/sysutils/libnotify/Makefile  Tue Feb 14 14:03:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2023/02/14 13:01:58 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2023/02/14 14:03:53 wiz Exp $
 
 DISTNAME=      libnotify-0.8.1
 CATEGORIES=    sysutils gnome
@@ -20,12 +20,8 @@ USE_TOOLS+=          pkg-config
 
 PKGCONFIG_OVERRIDE=            output/meson-private/libnotify.pc
 PKGCONFIG_OVERRIDE_STAGE=      pre-install
-# for testing
-#MAKE_ENV+=                    LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE}
 
 MESON_ARGS+=           -Dintrospection=enabled
-# no tests are included
-MESON_ARGS+=           -Dtests=false
 
 # Apply removals to post-wrapper transformed arguments.
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script
@@ -40,8 +36,5 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.3
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.gobject-introspection=     build
 .include "../../devel/gobject-introspection/buildlink3.mk"
-# gtk3 only needed by tests (which are not included)
-#BUILDLINK_DEPMETHOD.gtk3=     build
-#.include "../../x11/gtk3/buildlink3.mk"
 .include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/libnotify/options.mk
diff -u pkgsrc/sysutils/libnotify/options.mk:1.8 pkgsrc/sysutils/libnotify/options.mk:1.9
--- pkgsrc/sysutils/libnotify/options.mk:1.8    Tue Jun  7 18:07:16 2022
+++ pkgsrc/sysutils/libnotify/options.mk        Tue Feb 14 14:03:53 2023
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.8 2022/06/07 18:07:16 wiz Exp $
+# $NetBSD: options.mk,v 1.9 2023/02/14 14:03:53 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libnotify
-PKG_SUPPORTED_OPTIONS= doc
+PKG_SUPPORTED_OPTIONS= doc tests
 PKG_SUGGESTED_OPTIONS= # empty
 PLIST_VARS+=           doc
 
@@ -17,3 +17,17 @@ MESON_ARGS+=         -Dgtk_doc=true
 MESON_ARGS+=           -Ddocbook_docs=disabled
 MESON_ARGS+=           -Dgtk_doc=false
 .endif
+
+.if !empty(PKG_OPTIONS:Mtests)
+# 'make test' doesn't work:
+#      [0/1] Running all tests.
+#      No tests defined.
+# though tests are built (see output/tests);
+# also, running them manually, some of these need a DISPLAY
+MAKE_ENV+=             LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE}
+MESON_ARGS+=           -Dtests=true
+BUILDLINK_DEPMETHOD.gtk3=      build
+.include "../../x11/gtk3/buildlink3.mk"
+.else
+MESON_ARGS+=           -Dtests=false
+.endif