tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
sysutils/dbus 1.10.0 problems
Hi,
sysutils/dbus 1.10.0 uses another directory for its configuration files.
DBus consumer packages should use new directory to install
their dbus configuration files.
And dbus-1.10.0 removed CONF_FILES mechanism.
To fix these problems, I would like to commit the included patch.
O.K. to commit during freeze?
Without these patches, for example, pulseaudio would not work.
Index: audio/pulseaudio/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/pulseaudio/Makefile,v
retrieving revision 1.98
diff -u -r1.98 Makefile
--- audio/pulseaudio/Makefile 25 Apr 2015 14:20:23 -0000 1.98
+++ audio/pulseaudio/Makefile 18 Sep 2015 06:25:58 -0000
@@ -83,7 +83,7 @@
CONF_FILES+= ${EGDIR}/default.pa ${PKG_SYSCONFDIR}/default.pa
CONF_FILES+= ${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa
CONF_FILES+= ${EGDIR}/pulseaudio-system.conf \
- ${PKG_SYSCONFBASE}/dbus-1/system.d/pulseaudio-system.conf
+ ${PREFIX}/share/dbus-1/system.d/pulseaudio-system.conf
PLIST_VARS+= bonjour coreaudio evdev oss sun
Index: net/avahi/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/avahi/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- net/avahi/Makefile 25 Apr 2015 14:23:43 -0000 1.58
+++ net/avahi/Makefile 18 Sep 2015 06:26:00 -0000
@@ -67,7 +67,7 @@
CONF_FILES+= ${PREFIX}/share/examples/avahi/services/ssh.service \
${PKG_SYSCONFDIR}/services/ssh.service
CONF_FILES+= ${PREFIX}/share/examples/avahi/avahi-dbus.conf \
- ${PKG_SYSCONFBASE}/dbus-1/system.d/avahi-dbus.conf
+ ${PREFIX}/share/dbus-1/system.d/avahi-dbus.conf
CONFIGURE_ARGS+= --with-avahi-user=${AVAHI_USER}
CONFIGURE_ARGS+= --with-avahi-group=${AVAHI_GROUP}
Index: net/dhcpcd-dbus/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/dhcpcd-dbus/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- net/dhcpcd-dbus/Makefile 23 Oct 2012 17:18:16 -0000 1.11
+++ net/dhcpcd-dbus/Makefile 18 Sep 2015 06:26:00 -0000
@@ -21,7 +21,7 @@
# Install the configuration file
CONF_FILES+= ${EGDIR}/dhcpcd-dbus.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/dhcpcd-dbus.conf
+ ${PREFIX}/share/dbus-1/system.d/dhcpcd-dbus.conf
DEPENDS+= dhcpcd>=5.0.0:../../net/dhcpcd
DEPENDS+= dbus>=1.1:../../sysutils/dbus
Index: net/dnsmasq/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/dnsmasq/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- net/dnsmasq/Makefile 15 Aug 2015 12:38:17 -0000 1.31
+++ net/dnsmasq/Makefile 18 Sep 2015 06:26:00 -0000
@@ -38,7 +38,7 @@
CFLAGS+= -DHAVE_DBUS
.include "../../sysutils/dbus/buildlink3.mk"
CONF_FILES+= ${EGDIR}/dnsmasq-dbus.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/dnsmasq-dbus.conf
+ ${PREFIX}/share/dbus-1/system.d/dnsmasq-dbus.conf
PLIST.dbus= yes
.endif
Index: pkgtools/packagekit/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/packagekit/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- pkgtools/packagekit/Makefile 25 Apr 2015 14:24:45 -0000 1.47
+++ pkgtools/packagekit/Makefile 18 Sep 2015 06:26:00 -0000
@@ -31,9 +31,9 @@
CONF_FILES+= ${EGDIR}/Vendor.conf \
${PKG_SYSCONFDIR}/PackageKit/Vendor.conf
CONF_FILES+= ${EGDIR}/org.freedesktop.PackageKit.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.PackageKit.conf
+ ${PREFIX}/share/dbus-1/system.d/org.freedesktop.PackageKit.conf
CONF_FILES+= ${EGDIR}/org.freedesktop.PackageKitTestBackend.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.PackageKitTestBackend.conf
+ ${PREFIX}/share/dbus-1/system.d/org.freedesktop.PackageKitTestBackend.conf
CHECK_INTERPRETER_SKIP+= lib/pm-utils/sleep.d/95packagekit \
share/PackageKit/helpers/test_spawn/search-name.sh
Index: security/policykit/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/policykit/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- security/policykit/Makefile 25 Jul 2015 14:36:12 -0000 1.31
+++ security/policykit/Makefile 18 Sep 2015 06:26:01 -0000
@@ -20,7 +20,7 @@
EGDIR= ${PREFIX}/share/examples/policykit
CONF_FILES+= ${EGDIR}/PolicyKit.conf ${PKG_SYSCONFDIR}/PolicyKit.conf
-CONF_FILES+= ${EGDIR}/org.freedesktop.PolicyKit.conf ${PKG_SYSCONFBASE}/dbus-1/system.d/org.freedesktop.PolicyKit.conf
+CONF_FILES+= ${EGDIR}/org.freedesktop.PolicyKit.conf ${PREFIX}/share/dbus-1/system.d/org.freedesktop.PolicyKit.conf
#CONF_FILES+= ${EGDIR}/polkit ${PKG_SYSCONFBASE}/pam.d/polkit
#CONF_FILES+= ${EGDIR}/polkit-bash-completion.sh ${PKG_SYSCONFDIR}/profile.d/polkit-bash-completion.sh
Index: sysutils/consolekit/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/consolekit/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- sysutils/consolekit/Makefile 12 Jun 2015 10:51:12 -0000 1.26
+++ sysutils/consolekit/Makefile 18 Sep 2015 06:26:01 -0000
@@ -17,7 +17,7 @@
EGDIR= ${PREFIX}/share/examples/consolekit
CONF_FILES+= ${EGDIR}/00-primary.seat ${PKG_SYSCONFDIR}/seats.d/00-primary.seat
-CONF_FILES+= ${EGDIR}/ConsoleKit.conf ${PKG_SYSCONFBASE}/dbus-1/system.d/ConsoleKit.conf
+CONF_FILES+= ${EGDIR}/ConsoleKit.conf ${PREFIX}/share/dbus-1/system.d/ConsoleKit.conf
MAKE_DIRS= ${PKG_SYSCONFDIR}/seats.d
Index: sysutils/dbus/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/dbus/Makefile,v
retrieving revision 1.87
diff -u -r1.87 Makefile
--- sysutils/dbus/Makefile 7 Sep 2015 23:24:46 -0000 1.87
+++ sysutils/dbus/Makefile 18 Sep 2015 06:26:01 -0000
@@ -69,6 +69,15 @@
PLIST_VARS+= linux launchd
+DBUS_CONF_DIR+= ${PREFIX}/share/dbus-1
+OWN_DIRS+= ${DBUS_CONF_DIR}/services
+OWN_DIRS+= ${DBUS_CONF_DIR}/system-services
+OWN_DIRS+= ${DBUS_CONF_DIR}/session.d
+OWN_DIRS+= ${DBUS_CONF_DIR}/system.d
+EGDIR= ${PREFIX}/share/examples/dbus
+CONF_FILES= ${EGDIR}/system.conf ${DBUS_CONF_DIR}/system.conf
+CONF_FILES+= ${EGDIR}/session.conf ${DBUS_CONF_DIR}/session.conf
+
RCD_SCRIPTS= dbus
PKG_GROUPS_VARS+= DBUS_GROUP
Index: sysutils/dbus/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/dbus/PLIST,v
retrieving revision 1.20
diff -u -r1.20 PLIST
--- sysutils/dbus/PLIST 30 Aug 2015 15:08:00 -0000 1.20
+++ sysutils/dbus/PLIST 18 Sep 2015 06:26:01 -0000
@@ -39,8 +39,8 @@
man/man1/dbus-test-tool.1
man/man1/dbus-update-activation-environment.1
man/man1/dbus-uuidgen.1
-share/dbus-1/session.conf
-share/dbus-1/system.conf
+share/examples/dbus/session.conf
+share/examples/dbus/system.conf
share/doc/dbus/dbus-cleanup-sockets.1.html
share/doc/dbus/dbus-daemon.1.html
share/doc/dbus/dbus-faq.html
Index: sysutils/dbus/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/dbus/distinfo,v
retrieving revision 1.66
diff -u -r1.66 distinfo
--- sysutils/dbus/distinfo 30 Aug 2015 15:08:00 -0000 1.66
+++ sysutils/dbus/distinfo 18 Sep 2015 06:26:01 -0000
@@ -6,4 +6,5 @@
SHA1 (patch-ak) = 9f84b015ae706ebfe8230fe315a92c6960a84a60
SHA1 (patch-al) = 08d49257c3eea7b6ae0a3fe2682dba977ba06951
SHA1 (patch-am) = 8c794ff8b0981e90243ee20c26ae1ecc72e68de8
+SHA1 (patch-bus_Makefile.in) = bec933a478910c466fb4b159c4728dbe68026639
SHA1 (patch-dbus_dbus-sysdeps-util-unix.c) = 9c967cdac585220a3e65443dc9642e7d4478567c
Index: sysutils/dbus/patches/patch-bus_Makefile.in
===================================================================
RCS file: sysutils/dbus/patches/patch-bus_Makefile.in
diff -N sysutils/dbus/patches/patch-bus_Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysutils/dbus/patches/patch-bus_Makefile.in 18 Sep 2015 06:26:01 -0000
@@ -0,0 +1,36 @@
+$NetBSD$
+
+--- bus/Makefile.in.orig 2015-08-25 15:52:09.000000000 +0000
++++ bus/Makefile.in
+@@ -565,6 +565,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ dbusdatadir = $(datadir)/dbus-1
++dbusexampledatadir = ${PREFIX}/share/examples/dbus
+ legacydbusdatadir = $(sysconfdir)/dbus-1
+ dbus_daemon_execdir = $(DBUS_DAEMONDIR)
+ DBUS_BUS_LIBS = \
+@@ -1326,18 +1327,18 @@ uninstall-agentDATA:
+ dir='$(DESTDIR)$(agentdir)'; $(am__uninstall_files_from_dir)
+ install-dbusdataDATA: $(dbusdata_DATA)
+ @$(NORMAL_INSTALL)
+- @list='$(dbusdata_DATA)'; test -n "$(dbusdatadir)" || list=; \
++ @list='$(dbusdata_DATA)'; test -n "$(dbusexampledatadir)" || list=; \
+ if test -n "$$list"; then \
+- echo " $(MKDIR_P) '$(DESTDIR)$(dbusdatadir)'"; \
+- $(MKDIR_P) "$(DESTDIR)$(dbusdatadir)" || exit 1; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(dbusexampledatadir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(dbusexampledatadir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbusdatadir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(dbusdatadir)" || exit $$?; \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbusexampledatadir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(dbusexampledatadir)" || exit $$?; \
+ done
+
+ uninstall-dbusdataDATA:
Index: sysutils/devkitd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/devkitd/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- sysutils/devkitd/Makefile 23 Oct 2012 19:50:58 -0000 1.7
+++ sysutils/devkitd/Makefile 18 Sep 2015 06:26:01 -0000
@@ -19,7 +19,7 @@
USE_TOOLS+= gmake pkg-config
CONF_FILES+= share/examples/GConf/org.freedesktop.DeviceKit.conf \
- ${PKG_SYSCONFBASEDIR}/dbus-1/system.d/org.freedesktop.DeviceKit.conf
+ ${PREFIX}/share/dbus-1/system.d/org.freedesktop.DeviceKit.conf
.include "../../devel/glib2/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
Index: sysutils/hal/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/hal/Makefile,v
retrieving revision 1.74
diff -u -r1.74 Makefile
--- sysutils/hal/Makefile 7 Sep 2015 09:03:24 -0000 1.74
+++ sysutils/hal/Makefile 18 Sep 2015 06:26:01 -0000
@@ -27,7 +27,7 @@
EGDIR= ${PREFIX}/share/examples/hal
-CONF_FILES= ${EGDIR}/hal.conf ${PKG_SYSCONFBASE}/dbus-1/system.d/hal.conf
+CONF_FILES= ${EGDIR}/hal.conf ${PREFIX}/share/dbus-1/system.d/hal.conf
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
Index: sysutils/k3b/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/k3b/Makefile,v
retrieving revision 1.80
diff -u -r1.80 Makefile
--- sysutils/k3b/Makefile 30 Jun 2015 09:57:42 -0000 1.80
+++ sysutils/k3b/Makefile 18 Sep 2015 06:26:01 -0000
@@ -20,7 +20,7 @@
CMAKE_ARGS+= -DK3B_BUILD_MUSE_DECODER_PLUGIN=OFF
CONF_FILES= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.k3bsetup.conf \
- ${PKG_SYSCONFBASE}/dbus-1/system.d/org.kde.kcontrol.k3bsetup.conf
+ ${PREFIX}/share/dbus-1/system.d/org.kde.kcontrol.k3bsetup.conf
ONLY_FOR_PLATFORM= FreeBSD-*-* Linux-*-* NetBSD-*-* DragonFly-*-*
Index: sysutils/system-tools-backends/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/system-tools-backends/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- sysutils/system-tools-backends/Makefile 12 Jun 2015 10:51:18 -0000 1.18
+++ sysutils/system-tools-backends/Makefile 18 Sep 2015 06:26:01 -0000
@@ -23,7 +23,7 @@
.endif
EGDIR= ${PREFIX}/share/examples/system-tools-backends
-CONF_FILES+= ${EGDIR}/system-tools-backends.conf ${PKG_SYSCONFDIR}/dbus-1/system.d/system-tools-backends.conf
+CONF_FILES+= ${EGDIR}/system-tools-backends.conf ${PREFIX}/share/dbus-1/system.d/system-tools-backends.conf
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
Index: sysutils/upower/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/upower/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- sysutils/upower/Makefile 23 Jul 2015 10:55:17 -0000 1.5
+++ sysutils/upower/Makefile 18 Sep 2015 06:26:01 -0000
@@ -23,7 +23,7 @@
EGDIR= ${PREFIX}/share/examples/upower
CONF_FILES+= ${EGDIR}/UPower.conf ${PKG_SYSCONFDIR}/UPower.conf
CONF_FILES+= ${EGDIR}/org.freedesktop.UPower.conf \
- ${PKG_SYSCONFBASE}/dbus-1/system.d/org.freedesktop.UPower.conf
+ ${PREFIX}/share/dbus-1/system.d/org.freedesktop.UPower.conf
PKGCONFIG_OVERRIDE+= upower-glib.pc.in
USE_PKGLOCALEDIR= yes
Index: x11/kde-runtime4/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kde-runtime4/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- x11/kde-runtime4/Makefile 30 Jun 2015 09:57:42 -0000 1.58
+++ x11/kde-runtime4/Makefile 18 Sep 2015 06:26:02 -0000
@@ -52,7 +52,7 @@
CONF_FILES+= ${PREFIX}/share/examples/kde-runtime4/kde-information.menu \
${PKG_SYSCONFDIR}/xdg/menus/kde-information.menu
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.kcmremotewidgets.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf
+ ${PREFIX}/share/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf
BUILDLINK_DEPMETHOD.qt4-tools= full
Index: x11/kde-workspace4/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kde-workspace4/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- x11/kde-workspace4/Makefile 25 Apr 2015 14:25:07 -0000 1.47
+++ x11/kde-workspace4/Makefile 18 Sep 2015 06:26:02 -0000
@@ -40,13 +40,13 @@
CONF_FILES+= ${PREFIX}/share/examples/kde-workspace4/ksysguarddrc \
${PKG_SYSCONFDIR}/ksysguarddrc
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.ksysguard.processlisthelper.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
+ ${PREFIX}/share/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.fontinst.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.fontinst.conf
+ ${PREFIX}/share/dbus-1/system.d/org.kde.fontinst.conf
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.kcmclock.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
+ ${PREFIX}/share/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.kcmkdm.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf
+ ${PREFIX}/share/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf
SPECIAL_PERMS+= ${PREFIX}/lib/kde4/libexec/kcheckpass \
${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 6555
@@ -81,7 +81,7 @@
.if ${OPSYS} == "Linux"
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.powerdevil.backlighthelper.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf
+ ${PREFIX}/share/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf
.endif
SUBST_CLASSES+= paths
Index: x11/kdelibs4/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kdelibs4/Makefile,v
retrieving revision 1.80
diff -u -r1.80 Makefile
--- x11/kdelibs4/Makefile 25 Apr 2015 14:25:13 -0000 1.80
+++ x11/kdelibs4/Makefile 18 Sep 2015 06:26:02 -0000
@@ -33,7 +33,7 @@
CONF_FILES+= ${PREFIX}/share/examples/kdelibs4/applications.menu \
${PKG_SYSCONFDIR}/xdg/menus/applications.menu
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.auth.conf \
- ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.auth.conf
+ ${PREFIX}/share/dbus-1/system.d/org.kde.auth.conf
DEPENDS+= docbook-xml>=4.2:../../textproc/docbook-xml
DEPENDS+= docbook-xsl>=1.75:../../textproc/docbook-xsl
--
Ryo ONODERA // ryo_on%yk.rim.or.jp@localhost
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB FD1B F404 27FA C7D1 15F3
Home |
Main Index |
Thread Index |
Old Index