CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Tue, 30 Mar 2021 18:09:46 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Mar 30 18:09:46 UTC 2021

Modified Files:
        pkgsrc/audio/pulseaudio: Makefile distinfo
        pkgsrc/audio/pulseaudio/patches: patch-configure.ac
        pkgsrc/devel/glib2: Makefile
        pkgsrc/emulators/suse121_gtk2: INSTALL Makefile
        pkgsrc/emulators/suse131_libdbus: INSTALL Makefile
        pkgsrc/sysutils/dbus/files/smf: dbus.sh

Log Message:
*: update for dbus path change


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 pkgsrc/audio/pulseaudio/Makefile
cvs rdiff -u -r1.77 -r1.78 pkgsrc/audio/pulseaudio/distinfo
cvs rdiff -u -r1.16 -r1.17 pkgsrc/audio/pulseaudio/patches/patch-configure.ac
cvs rdiff -u -r1.277 -r1.278 pkgsrc/devel/glib2/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/emulators/suse121_gtk2/INSTALL
cvs rdiff -u -r1.9 -r1.10 pkgsrc/emulators/suse121_gtk2/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/suse131_libdbus/INSTALL
cvs rdiff -u -r1.12 -r1.13 pkgsrc/emulators/suse131_libdbus/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/dbus/files/smf/dbus.sh

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

Modified files:

Index: pkgsrc/audio/pulseaudio/Makefile
diff -u pkgsrc/audio/pulseaudio/Makefile:1.156 pkgsrc/audio/pulseaudio/Makefile:1.157
--- pkgsrc/audio/pulseaudio/Makefile:1.156      Sat Feb 20 22:10:39 2021
+++ pkgsrc/audio/pulseaudio/Makefile    Tue Mar 30 18:09:45 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.156 2021/02/20 22:10:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.157 2021/03/30 18:09:45 wiz Exp $
 
 DISTNAME=      pulseaudio-14.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    audio
 MASTER_SITES=  https://freedesktop.org/software/pulseaudio/releases/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/audio/pulseaudio/distinfo
diff -u pkgsrc/audio/pulseaudio/distinfo:1.77 pkgsrc/audio/pulseaudio/distinfo:1.78
--- pkgsrc/audio/pulseaudio/distinfo:1.77       Mon Mar 22 11:59:23 2021
+++ pkgsrc/audio/pulseaudio/distinfo    Tue Mar 30 18:09:45 2021
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.77 2021/03/22 11:59:23 schmonz Exp $
+$NetBSD: distinfo,v 1.78 2021/03/30 18:09:45 wiz Exp $
 
 SHA1 (pulseaudio-14.2.tar.xz) = 5dfc46595e981f0eb6308d07666f4108a69b2106
 RMD160 (pulseaudio-14.2.tar.xz) = 5e52b8549a0ece2b52df854b5edaa2998c438ccd
 SHA512 (pulseaudio-14.2.tar.xz) = 196338cbb26c542301b6d0579070dfbcc42e76dc17405f3e216af70519bec2003089b80c573a32d5f96bdab078631ca09ce89998ab7a0a8ffa26955a9bcb3c4a
 Size (pulseaudio-14.2.tar.xz) = 1951300 bytes
-SHA1 (patch-configure.ac) = aac9be87aae9b3a4b3a8a8adc03a24cc038206a4
+SHA1 (patch-configure.ac) = c7088a6cde0898942806a7d0871cf24f16df3cf6
 SHA1 (patch-src_Makefile.am) = 5d136002c12016a8b451e84103a627685ec403de
 SHA1 (patch-src_modules_module-detect.c) = 860529fef9a14cbaa3979d985f5fde391b121484
 SHA1 (patch-src_modules_oss_module-oss.c) = d254f6c346d34470c9e178199c485e929bfd84c5

Index: pkgsrc/audio/pulseaudio/patches/patch-configure.ac
diff -u pkgsrc/audio/pulseaudio/patches/patch-configure.ac:1.16 pkgsrc/audio/pulseaudio/patches/patch-configure.ac:1.17
--- pkgsrc/audio/pulseaudio/patches/patch-configure.ac:1.16     Mon Mar 22 11:59:23 2021
+++ pkgsrc/audio/pulseaudio/patches/patch-configure.ac  Tue Mar 30 18:09:45 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.16 2021/03/22 11:59:23 schmonz Exp $
+$NetBSD: patch-configure.ac,v 1.17 2021/03/30 18:09:45 wiz Exp $
 
 * Don't assume sys/capability.h is guaranteed present on Linux.
 * Fix NetBSD detection for libatomics_ops check.
@@ -51,15 +51,6 @@ $NetBSD: patch-configure.ac,v 1.16 2021/
  AC_SUBST(HAVE_MEMFD)
  AM_CONDITIONAL([HAVE_MEMFD], [test "x$HAVE_MEMFD" = x1])
  AS_IF([test "x$HAVE_MEMFD" = "x1"], AC_DEFINE([HAVE_MEMFD], 1, [Have memfd shared memory.]))
-@@ -1070,7 +1069,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
- 
- PA_MACHINE_ID="${sysconfdir}/machine-id"
- AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file])
--PA_MACHINE_ID_FALLBACK="${localstatedir}/lib/dbus/machine-id"
-+PA_MACHINE_ID_FALLBACK="${localstatedir}/db/dbus/machine-id"
- AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
-             [Fallback machine-id file])
- 
 @@ -1375,9 +1374,9 @@ fi
  
  PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse"

Index: pkgsrc/devel/glib2/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.277 pkgsrc/devel/glib2/Makefile:1.278
--- pkgsrc/devel/glib2/Makefile:1.277   Mon Mar 22 06:54:19 2021
+++ pkgsrc/devel/glib2/Makefile Tue Mar 30 18:09:45 2021
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.277 2021/03/22 06:54:19 adam Exp $
+# $NetBSD: Makefile,v 1.278 2021/03/30 18:09:45 wiz Exp $
 
 .include "Makefile.common"
 
+PKGREVISION=   1
+
 CATEGORIES=    devel gnome
 COMMENT=       Some useful routines for C programming (glib2)
 
@@ -44,7 +46,7 @@ SUBST_MESSAGE.dbusdb= Adjust dbus machin
 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}/db/dbus,g'
+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

Index: pkgsrc/emulators/suse121_gtk2/INSTALL
diff -u pkgsrc/emulators/suse121_gtk2/INSTALL:1.1.1.1 pkgsrc/emulators/suse121_gtk2/INSTALL:1.2
--- pkgsrc/emulators/suse121_gtk2/INSTALL:1.1.1.1       Wed Mar 21 13:37:08 2012
+++ pkgsrc/emulators/suse121_gtk2/INSTALL       Tue Mar 30 18:09:45 2021
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2012/03/21 13:37:08 obache Exp $
+# $NetBSD: INSTALL,v 1.2 2021/03/30 18:09:45 wiz Exp $
 #
 # Initialize gtk/pango module configuration.
 #
@@ -15,6 +15,6 @@ POST-INSTALL)
        ${GNOME_BINDIR}/pango-querymodules@BINSUFFIX@ > ${GNOME_ETCDIR}/pango/pango@ABISUFFIX@.modules
        ${MKDIR} -p ${PKG_PREFIX}/@EMULSUBDIR@/var/lock
        PATH=${PKG_PREFIX}/@EMULSUBDIR@/bin ROOT=${PKG_PREFIX}/@EMULSUBDIR@ bash ${SUSECONFIG} --module glib2
-       ${LN} -s /../var/db/dbus/machine-id ${PKG_PREFIX}/@EMULSUBDIR@/var/lib/dbus/machine-id
+       ${LN} -s /../var/lib/dbus/machine-id ${PKG_PREFIX}/@EMULSUBDIR@/var/lib/dbus/machine-id
        ;;
 esac

Index: pkgsrc/emulators/suse121_gtk2/Makefile
diff -u pkgsrc/emulators/suse121_gtk2/Makefile:1.9 pkgsrc/emulators/suse121_gtk2/Makefile:1.10
--- pkgsrc/emulators/suse121_gtk2/Makefile:1.9  Mon Feb 16 10:15:45 2015
+++ pkgsrc/emulators/suse121_gtk2/Makefile      Tue Mar 30 18:09:45 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2015/02/16 10:15:45 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2021/03/30 18:09:45 wiz Exp $
 
 PKGNAME=       suse_gtk2-${SUSE_VERSION}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    emulators
 RPMPKGS+=      libcairo2-1.10.2-14.1.3.${SUSE_ARCH}
 RPMUPDPKGS+=   dbus-1-1.5.8-2.10.1.${SUSE_ARCH}

Index: pkgsrc/emulators/suse131_libdbus/INSTALL
diff -u pkgsrc/emulators/suse131_libdbus/INSTALL:1.1 pkgsrc/emulators/suse131_libdbus/INSTALL:1.2
--- pkgsrc/emulators/suse131_libdbus/INSTALL:1.1        Thu Dec  5 11:42:15 2013
+++ pkgsrc/emulators/suse131_libdbus/INSTALL    Tue Mar 30 18:09:45 2021
@@ -1,7 +1,7 @@
-# $NetBSD: INSTALL,v 1.1 2013/12/05 11:42:15 obache Exp $
+# $NetBSD: INSTALL,v 1.2 2021/03/30 18:09:45 wiz Exp $
 #
 case ${STAGE} in
 POST-INSTALL)
-       ${LN} -s /../var/db/dbus/machine-id ${PKG_PREFIX}/@EMULSUBDIR@/var/lib/dbus/machine-id
+       ${LN} -s /../var/lib/dbus/machine-id ${PKG_PREFIX}/@EMULSUBDIR@/var/lib/dbus/machine-id
        ;;
 esac

Index: pkgsrc/emulators/suse131_libdbus/Makefile
diff -u pkgsrc/emulators/suse131_libdbus/Makefile:1.12 pkgsrc/emulators/suse131_libdbus/Makefile:1.13
--- pkgsrc/emulators/suse131_libdbus/Makefile:1.12      Tue Jul 28 08:49:15 2015
+++ pkgsrc/emulators/suse131_libdbus/Makefile   Tue Mar 30 18:09:45 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2015/07/28 08:49:15 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2021/03/30 18:09:45 wiz Exp $
 
 PKGNAME=       suse_libdbus-${SUSE_VERSION}
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    emulators
 RPMUPDPKGS+=   dbus-1-1.8.16-4.36.2.${SUSE_ARCH}
 RPMUPDPKGS+=   libdbus-1-3-1.8.16-4.36.1.${SUSE_ARCH}

Index: pkgsrc/sysutils/dbus/files/smf/dbus.sh
diff -u pkgsrc/sysutils/dbus/files/smf/dbus.sh:1.2 pkgsrc/sysutils/dbus/files/smf/dbus.sh:1.3
--- pkgsrc/sysutils/dbus/files/smf/dbus.sh:1.2  Sun Jul  5 15:21:50 2015
+++ pkgsrc/sysutils/dbus/files/smf/dbus.sh      Tue Mar 30 18:09:45 2021
@@ -10,7 +10,7 @@ if [ ! -x @PREFIX@/bin/dbus-daemon ]; th
        exit $SMF_EXIT_ERR_FATAL
 fi
 
-if [ ! -f @VARBASE@/db/dbus/machine-id ]; then
+if [ ! -f @VARBASE@/lib/dbus/machine-id ]; then
        @PREFIX@/bin/dbus-uuidgen --ensure
 fi
 pidfile="@VARBASE@/run/dbus/pid"

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index