summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sysutils/dbus-glib/Makefile9
-rw-r--r--sysutils/dbus-glib/PLIST6
-rw-r--r--sysutils/dbus-glib/buildlink3.mk5
-rw-r--r--sysutils/dbus/Makefile3
-rw-r--r--sysutils/dbus/Makefile.common27
-rw-r--r--sysutils/dbus/PLIST6
-rw-r--r--sysutils/dbus/buildlink3.mk8
-rw-r--r--sysutils/dbus/distinfo14
-rw-r--r--sysutils/dbus/files/dbus.sh4
-rw-r--r--sysutils/dbus/patches/patch-aa16
-rw-r--r--sysutils/dbus/patches/patch-ab14
-rw-r--r--sysutils/dbus/patches/patch-ac39
12 files changed, 84 insertions, 67 deletions
diff --git a/sysutils/dbus-glib/Makefile b/sysutils/dbus-glib/Makefile
index 7c31d05cc07..e5f85ad8a63 100644
--- a/sysutils/dbus-glib/Makefile
+++ b/sysutils/dbus-glib/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:10:49 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/03/30 20:57:08 jmmv Exp $
#
DBUS_INTERFACE= glib
-DBUS_DIRS= dbus glib tools
+DBUS_DIRS= dbus bus glib tools
.include "../../sysutils/dbus/Makefile.common"
-PKGREVISION= 2
-
+CONFIGURE_ARGS+=--enable-tests
# We can't install from within the 'dbus' nor 'tools' directory automatically
# because we'd get a lot of other stuff installed (overriding files in the
# dbus package).
@@ -21,6 +20,8 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/include/dbus-1.0/dbus
${INSTALL_DATA} ${WRKSRC}/dbus/dbus-glib*.h \
${PREFIX}/include/dbus-1.0/dbus
+ ${INSTALL_DATA} ${WRKSRC}/tools/dbus-glib-bindings.h \
+ ${PREFIX}/include/dbus-1.0/dbus
${INSTALL_DATA} ${WRKSRC}/dbus-glib-1.pc \
${PREFIX}/lib/pkgconfig/dbus-glib-1.pc
cd ${WRKSRC}/tools && ${LIBTOOL} --mode=install \
diff --git a/sysutils/dbus-glib/PLIST b/sysutils/dbus-glib/PLIST
index 66b767bb5fa..ada232ddab3 100644
--- a/sysutils/dbus-glib/PLIST
+++ b/sysutils/dbus-glib/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2004/10/12 08:30:46 jmmv Exp $
-bin/dbus-glib-tool
+@comment $NetBSD: PLIST,v 1.3 2006/03/30 20:57:08 jmmv Exp $
+bin/dbus-binding-tool
bin/dbus-monitor
+include/dbus-1.0/dbus/dbus-glib-bindings.h
include/dbus-1.0/dbus/dbus-glib-error-enum.h
include/dbus-1.0/dbus/dbus-glib-lowlevel.h
include/dbus-1.0/dbus/dbus-glib.h
+include/dbus-1.0/dbus/dbus-gtype-specialized.h
lib/libdbus-glib-1.la
lib/pkgconfig/dbus-glib-1.pc
man/man1/dbus-monitor.1
diff --git a/sysutils/dbus-glib/buildlink3.mk b/sysutils/dbus-glib/buildlink3.mk
index 563a6922438..0578cc53bb9 100644
--- a/sysutils/dbus-glib/buildlink3.mk
+++ b/sysutils/dbus-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/03/30 20:57:08 jmmv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DBUS_GLIB_BUILDLINK3_MK:= ${DBUS_GLIB_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndbus-glib}
BUILDLINK_PACKAGES+= dbus-glib
.if !empty(DBUS_GLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dbus-glib+= dbus-glib>=0.23.4
-BUILDLINK_RECOMMENDED.dbus-glib?= dbus-glib>=0.23.4nb2
+BUILDLINK_DEPENDS.dbus-glib+= dbus-glib>=0.61
BUILDLINK_PKGSRCDIR.dbus-glib?= ../../sysutils/dbus-glib
.endif # DBUS_GLIB_BUILDLINK3_MK
diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index 2619e7f6da1..f61dbd3e6af 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:10:49 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/03/30 20:57:08 jmmv Exp $
#
.include "Makefile.common"
-PKGREVISION= 2
PKG_USERS= messagebus:messagebus::System\ message\ bus:${VARBASE}/run/dbus:${NOLOGIN}
PKG_GROUPS= messagebus
diff --git a/sysutils/dbus/Makefile.common b/sysutils/dbus/Makefile.common
index f942ca359e0..3ac7a09c2a7 100644
--- a/sysutils/dbus/Makefile.common
+++ b/sysutils/dbus/Makefile.common
@@ -1,10 +1,7 @@
-# $NetBSD: Makefile.common,v 1.12 2006/02/11 14:30:29 rxg Exp $
+# $NetBSD: Makefile.common,v 1.13 2006/03/30 20:57:08 jmmv Exp $
#
-# XXX Do not update to 0.30 or above yet. The API in the 0.2x series is
-# XXX the most commonly used ATM.
-
-DBUS_VERSION= 0.23.4
+DBUS_VERSION= 0.61
DISTNAME= dbus-${DBUS_VERSION}
CATEGORIES= sysutils
@@ -21,20 +18,26 @@ GNU_CONFIGURE= YES
USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
-PKGCONFIG_OVERRIDE= dbus-1.pc
-PKGCONFIG_OVERRIDE+= dbus-glib-1.pc
-PKGCONFIG_OVERRIDE+= dbus-sharp.pc
+PKGCONFIG_OVERRIDE= dbus-1.pc.in
+PKGCONFIG_OVERRIDE+= dbus-glib-1.pc.in
+PKGCONFIG_OVERRIDE+= dbus-sharp.pc.in
-CONFIGURE_ARGS+= --disable-qt
-CONFIGURE_ARGS+= --disable-glib
-CONFIGURE_ARGS+= --disable-gtk
-CONFIGURE_ARGS+= --disable-xml-docs
+CONFIGURE_ARGS+= --disable-asserts
+CONFIGURE_ARGS+= --disable-dnotify
CONFIGURE_ARGS+= --disable-doxygen-docs
CONFIGURE_ARGS+= --disable-gcj
+CONFIGURE_ARGS+= --disable-gcov
+CONFIGURE_ARGS+= --disable-glib
+CONFIGURE_ARGS+= --disable-gtk
CONFIGURE_ARGS+= --disable-mono
CONFIGURE_ARGS+= --disable-mono-docs
CONFIGURE_ARGS+= --disable-python
+CONFIGURE_ARGS+= --disable-qt
+CONFIGURE_ARGS+= --disable-qt-debug
+CONFIGURE_ARGS+= --disable-qt3
CONFIGURE_ARGS+= --disable-selinux
+CONFIGURE_ARGS+= --disable-tests
+CONFIGURE_ARGS+= --disable-xml-docs
CONFIGURE_ARGS+= --enable-checks
CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
diff --git a/sysutils/dbus/PLIST b/sysutils/dbus/PLIST
index 5b2c40c9fce..d45b047d793 100644
--- a/sysutils/dbus/PLIST
+++ b/sysutils/dbus/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/02 20:34:05 reed Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/03/30 20:57:08 jmmv Exp $
bin/dbus-cleanup-sockets
-bin/dbus-daemon-1
+bin/dbus-daemon
bin/dbus-launch
bin/dbus-send
include/dbus-1.0/dbus/dbus-address.h
@@ -21,7 +21,7 @@ lib/dbus-1.0/include/dbus/dbus-arch-deps.h
lib/libdbus-1.la
lib/pkgconfig/dbus-1.pc
man/man1/dbus-cleanup-sockets.1
-man/man1/dbus-daemon-1.1
+man/man1/dbus-daemon.1
man/man1/dbus-launch.1
man/man1/dbus-send.1
share/examples/dbus/session.conf
diff --git a/sysutils/dbus/buildlink3.mk b/sysutils/dbus/buildlink3.mk
index 1750bbbad47..1e46e7546e9 100644
--- a/sysutils/dbus/buildlink3.mk
+++ b/sysutils/dbus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/03/30 20:57:08 jmmv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DBUS_BUILDLINK3_MK:= ${DBUS_BUILDLINK3_MK}+
@@ -11,9 +11,11 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndbus}
BUILDLINK_PACKAGES+= dbus
.if !empty(DBUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dbus+= dbus>=0.23.4
-BUILDLINK_RECOMMENDED.dbus?= dbus>=0.23.4nb2
+BUILDLINK_DEPENDS.dbus+= dbus>=0.61
BUILDLINK_PKGSRCDIR.dbus?= ../../sysutils/dbus
+
+PRINT_PLIST_AWK+= /^@dirrm share\/dbus-1\/services/ \
+ { print "@comment in dbus: " $$0; next }
.endif # DBUS_BUILDLINK3_MK
.include "../../textproc/expat/buildlink3.mk"
diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo
index 3fc9fd0756d..edcd8ea22f3 100644
--- a/sysutils/dbus/distinfo
+++ b/sysutils/dbus/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2006/02/26 21:42:33 joerg Exp $
+$NetBSD: distinfo,v 1.6 2006/03/30 20:57:08 jmmv Exp $
-SHA1 (dbus-0.23.4.tar.gz) = 57ea3dd1a0ef520b1f891932e7ccd6b8d59eaca9
-RMD160 (dbus-0.23.4.tar.gz) = 94c6ed261cbf41695b7cc15c99ef929868f8645d
-Size (dbus-0.23.4.tar.gz) = 1288374 bytes
-SHA1 (patch-aa) = 4f03adb4bf41359a6eed93965786b93d4c92f87d
-SHA1 (patch-ab) = e0f5955a2b54e557e636f23715fbb6484c479e1f
-SHA1 (patch-ac) = 7117c0384360702cd725c24f522d275127e65556
+SHA1 (dbus-0.61.tar.gz) = fdddc695dad64974fb4138fcb04a77a66f1f47f8
+RMD160 (dbus-0.61.tar.gz) = 67306e1a632c1986460e8ead311ae642447cdcc3
+Size (dbus-0.61.tar.gz) = 1735729 bytes
+SHA1 (patch-aa) = 9dd1f74cbed3ef973612f9a1b1336732a88cd819
+SHA1 (patch-ab) = 302e0fe5c1f8482de43de2ad09ba4f15d1ce935d
+SHA1 (patch-ac) = 901af7a6a43776f784917bef267786446009ee41
SHA1 (patch-ad) = 31f0321c85296d6431d2db157ff8cc53f8351a04
diff --git a/sysutils/dbus/files/dbus.sh b/sysutils/dbus/files/dbus.sh
index fd03828e166..9d8c272bcec 100644
--- a/sysutils/dbus/files/dbus.sh
+++ b/sysutils/dbus/files/dbus.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: dbus.sh,v 1.2 2004/10/12 08:15:35 jmmv Exp $
+# $NetBSD: dbus.sh,v 1.3 2006/03/30 20:57:08 jmmv Exp $
#
# PROVIDE: dbus
# REQUIRE: DAEMON
@@ -10,7 +10,7 @@
name="dbus"
rcvar=$name
-command="@PREFIX@/bin/dbus-daemon-1"
+command="@PREFIX@/bin/dbus-daemon"
command_args="--system"
pidfile="@VARBASE@/run/dbus/pid"
start_precmd=dbus_prestart
diff --git a/sysutils/dbus/patches/patch-aa b/sysutils/dbus/patches/patch-aa
index 6316aa2199c..751faf026e2 100644
--- a/sysutils/dbus/patches/patch-aa
+++ b/sysutils/dbus/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.2 2005/03/22 10:55:13 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2006/03/30 20:57:08 jmmv Exp $
---- bus/Makefile.in.orig 2005-01-12 23:21:12.000000000 +0100
+--- bus/Makefile.in.orig 2006-02-24 17:36:50.000000000 +0100
+++ bus/Makefile.in
-@@ -337,11 +337,11 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -374,11 +374,11 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
-configdir = $(sysconfdir)/dbus-1
+configdir = $(datadir)/examples/@PACKAGE@
INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) \
- -DDAEMON_NAME=\"dbus-daemon-1\" -DDBUS_COMPILATION \
+ -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION \
- -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
- -DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\"
+ -DDBUS_SYSTEM_CONFIG_FILE=\""$(sysconfdir)/system.conf"\" \
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.2 2005/03/22 10:55:13 jmmv Exp $
EFENCE =
CONFIG_IN_FILES = \
-@@ -899,8 +899,6 @@ clean-local:
+@@ -939,8 +939,6 @@ clean-local:
/bin/rm *.bb *.bbg *.da *.gcov || true
install-data-hook:
diff --git a/sysutils/dbus/patches/patch-ab b/sysutils/dbus/patches/patch-ab
index 68cdce8255f..6d98f97ebb4 100644
--- a/sysutils/dbus/patches/patch-ab
+++ b/sysutils/dbus/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2005/03/22 10:55:13 jmmv Exp $
+$NetBSD: patch-ab,v 1.3 2006/03/30 20:57:08 jmmv Exp $
---- tools/Makefile.in.orig 2005-01-12 23:21:22.000000000 +0100
+--- tools/Makefile.in.orig 2006-02-24 17:36:59.000000000 +0100
+++ tools/Makefile.in
-@@ -344,7 +344,7 @@ dbus_send_LDADD = $(top_builddir)/dbus/l
+@@ -395,7 +395,7 @@ dbus_send_LDADD = $(top_builddir)/dbus/l
dbus_monitor_LDADD = $(top_builddir)/glib/libdbus-glib-1.la
dbus_launch_LDADD = $(DBUS_X_LIBS)
- dbus_viewer_LDADD = $(DBUS_GLIB_TOOL_LIBS) $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_LIBS)
+ dbus_viewer_LDADD = $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_THREADS_LIBS) $(DBUS_GLIB_TOOL_LIBS)
-man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1
+man_MANS = dbus-send.1 dbus-launch.1 dbus-cleanup-sockets.1
- EXTRA_DIST = $(man_MANS)
- all: all-am
-
+ EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh
+ CLEANFILES = \
+ run-with-tmp-session-bus.conf \
diff --git a/sysutils/dbus/patches/patch-ac b/sysutils/dbus/patches/patch-ac
index 3317ce3f59b..3ecf95b58e0 100644
--- a/sysutils/dbus/patches/patch-ac
+++ b/sysutils/dbus/patches/patch-ac
@@ -1,15 +1,26 @@
-$NetBSD: patch-ac,v 1.1 2005/12/07 15:18:33 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2006/03/30 20:57:08 jmmv Exp $
---- dbus/dbus-sysdeps.c.orig 2005-12-03 01:22:01.000000000 +0000
-+++ dbus/dbus-sysdeps.c
-@@ -862,8 +862,8 @@ _dbus_read_credentials_unix_socket (int
- #ifdef HAVE_CMSGCRED
- if (cmsg->cmsg_len < sizeof (cmsgmem) || cmsg->cmsg_type != SCM_CREDS)
- {
-- dbus_set_error (error, DBUS_ERROR_FAILED);
-- _dbus_verbose ("Message from recvmsg() was not SCM_CREDS\n");
-+ dbus_set_error (error, DBUS_ERROR_FAILED,
-+ "Message from recvmsg() was not SCM_CREDS");
- return FALSE;
- }
- #endif
+--- tools/run-with-tmp-session-bus.sh.orig 2005-03-17 18:48:29.000000000 +0100
++++ tools/run-with-tmp-session-bus.sh
+@@ -1,10 +1,10 @@
+-#! /bin/bash
++#! /bin/sh
+
+ SCRIPTNAME=$0
+ WRAPPED_SCRIPT=$1
+ shift
+
+-function die()
++die()
+ {
+ if ! test -z "$DBUS_SESSION_BUS_PID" ; then
+ echo "killing message bus "$DBUS_SESSION_BUS_PID >&2
+@@ -19,7 +19,7 @@ if test -z "$DBUS_TOP_BUILDDIR" ; then
+ fi
+
+ ## convenient to be able to ctrl+C without leaking the message bus process
+-trap 'die "Received SIGINT"' SIGINT
++trap 'die "Received SIGINT"' INT
+
+ CONFIG_FILE=./run-with-tmp-session-bus.conf
+ SERVICE_DIR="$DBUS_TOP_BUILDDIR/test/data/valid-service-files"
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 00:56:13 +0000