CVS commit: pkgsrc/devel/glib2

["Dan Cirnat" <cirnatdan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   cirnatdan
Date:           Tue Mar 30 20:34:10 UTC 2021

Modified Files:
        pkgsrc/devel/glib2: Makefile

Log Message:
glib2: Fix dbus machine-id path, use localstatedir meson option


To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.279 pkgsrc/devel/glib2/Makefile

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

Modified files:

Index: pkgsrc/devel/glib2/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.278 pkgsrc/devel/glib2/Makefile:1.279
--- pkgsrc/devel/glib2/Makefile:1.278   Tue Mar 30 18:09:45 2021
+++ pkgsrc/devel/glib2/Makefile Tue Mar 30 20:34:10 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.278 2021/03/30 18:09:45 wiz Exp $
+# $NetBSD: Makefile,v 1.279 2021/03/30 20:34:10 cirnatdan Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   1
+PKGREVISION=   2
 
 CATEGORIES=    devel gnome
 COMMENT=       Some useful routines for C programming (glib2)
@@ -12,6 +12,7 @@ COMMENT=      Some useful routines for C prog
 MESON_ARGS+=   -Dinstalled_tests=false
 # Avoid linux dependency on libmount-dev
 MESON_ARGS+=   -Dlibmount=disabled
+MESON_ARGS+=   -Dlocalstatedir=${VARBASE}
 .if ${OPSYS} == "FreeBSD"
 MESON_ARGS+=   -Db_lundef=false
 .endif
@@ -41,12 +42,6 @@ FILES_SUBST+=                GLIB_COMPILE_SCHEMAS=${PR
 FILES_SUBST+=          GLIB_SCHEMAS_DIR=${PREFIX}/share/glib-2.0/schemas
 
 BUILD_DEFS+=           VARBASE
-SUBST_CLASSES+=                dbusdb
-SUBST_MESSAGE.dbusdb=  Adjust dbus machine uuid path to dbus package
-SUBST_STAGE.dbusdb=    pre-configure
-SUBST_FILES.dbusdb=    gio/gdbusconnection.c
-SUBST_FILES.dbusdb+=   po/*.po
-SUBST_SED.dbusdb=      -e 's,/var/lib/dbus,${VARBASE}/lib/dbus,g'
 
 SUBST_CLASSES+=                xdg
 SUBST_MESSAGE.xdg=     Adjust XDG_DATA_DIRS so schemas and pixbuf loaders are found