pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/dbus update to 1.2.1, mostly from Blair Sadewitz



details:   https://anonhg.NetBSD.org/pkgsrc/rev/359f67a20e47
branches:  trunk
changeset: 543310:359f67a20e47
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Jun 13 11:28:35 2008 +0000

description:
update to 1.2.1, mostly from Blair Sadewitz
There is some stuff in the pkg which is not completed or doesn't work yet,
as support for NetBSD's new atomic increment ops, but this is not
essential. It is a good moment to do the update right now because gtk2
was just updated, and there is just enough time before the next branch.
This is a major update, too many changes to list here.

diffstat:

 sysutils/dbus/Makefile         |   81 +++++++-----
 sysutils/dbus/PLIST            |    7 +-
 sysutils/dbus/distinfo         |   18 +-
 sysutils/dbus/options.mk       |   32 +++++
 sysutils/dbus/patches/patch-aa |   43 ++-----
 sysutils/dbus/patches/patch-ab |  170 +++++++++-------------------
 sysutils/dbus/patches/patch-ac |  243 ++++++++++++++++++++++++++++++++++++++--
 sysutils/dbus/patches/patch-ag |    6 +-
 sysutils/dbus/patches/patch-ah |   50 --------
 sysutils/dbus/patches/patch-ai |   13 ++
 10 files changed, 401 insertions(+), 262 deletions(-)

diffs (truncated from 782 to 300 lines):

diff -r 3bc3e9948ca0 -r 359f67a20e47 sysutils/dbus/Makefile
--- a/sysutils/dbus/Makefile    Fri Jun 13 11:23:30 2008 +0000
+++ b/sysutils/dbus/Makefile    Fri Jun 13 11:28:35 2008 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2008/04/30 13:38:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.29 2008/06/13 11:28:35 drochner Exp $
 #
 
-DISTNAME=      dbus-1.0.2
-PKGREVISION=   5
+DISTNAME=      dbus-1.2.1
 CATEGORIES=    sysutils
 MASTER_SITES=  http://dbus.freedesktop.org/releases/dbus/
 
@@ -21,48 +20,50 @@
 
 PKGCONFIG_OVERRIDE=    dbus-1.pc.in
 
-CONFIGURE_ARGS+=       --disable-abstract-sockets
-CONFIGURE_ARGS+=       --disable-ansi
-CONFIGURE_ARGS+=       --disable-asserts
-CONFIGURE_ARGS+=       --disable-console-owner-file
-CONFIGURE_ARGS+=       --disable-dnotify
-CONFIGURE_ARGS+=       --disable-doxygen-docs
-CONFIGURE_ARGS+=       --disable-gcov
-CONFIGURE_ARGS+=       --disable-selinux
-CONFIGURE_ARGS+=       --disable-tests
-CONFIGURE_ARGS+=       --disable-verbose-mode
-CONFIGURE_ARGS+=       --disable-xml-docs
-CONFIGURE_ARGS+=       --enable-checks
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+.include "../../mk/bsd.prefs.mk"
+
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=       --with-xml=expat
-CONFIGURE_ARGS+=       --with-dbus-user=${DBUS_USER}
+
+#CFLAGS.NetBSD+=               -D_NETBSD_SOURCE
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.dbus
-PKG_SUPPORTED_OPTIONS+=        debug nox11
+CONFIGURE_ARGS_GROUPS= enable disable with without
+
+CONFIGURE_ARGS.Linux=  abstract-sockets dnotify selinux
+CONFIGURE_ARGS.docs=   doxygen-docs xml-docs
 
-.include "../../mk/bsd.options.mk"
+CONFIGURE_ARGS.disable=                ansi asserts gcov tests
+CONFIGURE_ARGS.disable+=       console-owner-file verbose-mode
+CONFIGURE_ARGS.disable+=       ${CONFIGURE_ARGS.docs}
+CONFIGURE_ARGS.enable=         checks static
 
-.if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=       --enable-asserts
-CONFIGURE_ARGS+=       --enable-tests
-CONFIGURE_ARGS+=       --enable-verbose-mode
+CONFIGURE_ARGS.with=   dbus-user=${DBUS_USER}
+CONFIGURE_ARGS.with+=  test-socket-dir=${WRKDIR:Q}
+CONFIGURE_ARGS.with+=  xml=expat
+
+PTHREAD_AUTO_VARS=     yes
+
+.if ${OPSYS} != "Linux"
+CONFIGURE_ARGS.disable+=\
+                       ${CONFIGURE_ARGS.Linux}
 .endif
 
-.if !empty(PKG_OPTIONS:Mnox11)
-CONFIGURE_ARGS+=       --without-x
-.else
-.include "../../x11/libX11/buildlink3.mk"
-.endif
+CONFIGURE_ARGS+=\
+       ${CONFIGURE_ARGS_GROUPS:@.g.@                   \
+               ${CONFIGURE_ARGS.${.g.}:@.a.@           \
+                       --${.g.}-${.a.}                 \
+               @}                                      \
+       @:M*}
 
-PKG_SYSCONFSUBDIR=     dbus-1
-MAKE_DIRS=             ${PKG_SYSCONFDIR}/event.d
-MAKE_DIRS+=            ${PKG_SYSCONFDIR}/system.d
+MAKE_DIRS=             ${PKG_SYSCONFDIR}/dbus-1/event.d
+MAKE_DIRS+=            ${PKG_SYSCONFDIR}/dbus-1/system.d
+MAKE_DIRS+=            ${PKG_SYSCONFDIR}/dbus-1/session.d
 
 EGDIR=                 ${PREFIX}/share/examples/dbus
-CONF_FILES=            ${EGDIR}/session.conf ${PKG_SYSCONFDIR}/session.conf
-CONF_FILES+=           ${EGDIR}/system.conf ${PKG_SYSCONFDIR}/system.conf
-INSTALLATION_DIRS=     ${EGDIR}
+CONF_FILES=    ${EGDIR}/session.conf ${PKG_SYSCONFDIR}/dbus-1/session.conf
+CONF_FILES+=   ${EGDIR}/system.conf ${PKG_SYSCONFDIR}/dbus-1/system.conf
 
 RCD_SCRIPTS=           dbus
 
@@ -77,6 +78,16 @@
 FILES_SUBST+=          DBUS_USER=${DBUS_USER}
 FILES_SUBST+=          DBUS_GROUP=${DBUS_GROUP}
 
+
+.include "options.mk"
+
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/bus/rc.messagebus \
+               ${DESTDIR}${PREFIX}/share/examples/rc.d/rc.messagebus.slackware
+       ${INSTALL_DATA} ${WRKSRC}/bus/messagebus \
+               ${DESTDIR}${PREFIX}/share/examples/rc.d/messagebus.redhat
+
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3bc3e9948ca0 -r 359f67a20e47 sysutils/dbus/PLIST
--- a/sysutils/dbus/PLIST       Fri Jun 13 11:23:30 2008 +0000
+++ b/sysutils/dbus/PLIST       Fri Jun 13 11:28:35 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2006/12/17 15:39:33 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/06/13 11:28:35 drochner Exp $
 bin/dbus-cleanup-sockets
 bin/dbus-daemon
 bin/dbus-launch
@@ -24,6 +24,7 @@
 lib/dbus-1.0/include/dbus/dbus-arch-deps.h
 lib/libdbus-1.la
 lib/pkgconfig/dbus-1.pc
+libexec/dbus-daemon-launch-helper
 man/man1/dbus-cleanup-sockets.1
 man/man1/dbus-daemon.1
 man/man1/dbus-launch.1
@@ -36,9 +37,13 @@
 share/examples/rc.d/messagebus.redhat
 share/examples/rc.d/rc.messagebus.slackware
 @dirrm share/examples/dbus
+@exec ${MKDIR} %D/share/dbus-1/system-services
+@dirrm share/dbus-1/system-services
 @exec ${MKDIR} %D/share/dbus-1/services
 @dirrm share/dbus-1/services
 @dirrm share/dbus-1
+@exec ${MKDIR} %D/libexec/dbus-1
+@dirrm libexec/dbus-1
 @dirrm lib/dbus-1.0/include/dbus
 @dirrm lib/dbus-1.0/include
 @dirrm lib/dbus-1.0
diff -r 3bc3e9948ca0 -r 359f67a20e47 sysutils/dbus/distinfo
--- a/sysutils/dbus/distinfo    Fri Jun 13 11:23:30 2008 +0000
+++ b/sysutils/dbus/distinfo    Fri Jun 13 11:28:35 2008 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.20 2008/03/02 13:21:07 drochner Exp $
+$NetBSD: distinfo,v 1.21 2008/06/13 11:28:35 drochner Exp $
 
-SHA1 (dbus-1.0.2.tar.gz) = 2870efd6ea0b5b0d14e52195f560238a74bb1e0e
-RMD160 (dbus-1.0.2.tar.gz) = d5eddfb058c4c026d4a9f091ad90abcc6e54861a
-Size (dbus-1.0.2.tar.gz) = 1400278 bytes
-SHA1 (patch-aa) = 71c903a268e8ece66c39f48937c9544b7c82d1b3
-SHA1 (patch-ab) = 2fce79e3114fa5f345094e61d2513a9eb232c57a
-SHA1 (patch-ac) = eae0564535d36cb0082dd2e66d74fea808800d4e
-SHA1 (patch-ag) = 469993db97a74da50c61449454c02c8a7c69e7bd
-SHA1 (patch-ah) = db8ce2de1f1f9aa06804eacb9a7f264eb3187f36
+SHA1 (dbus-1.2.1.tar.gz) = 2c5b38d51b486e0143faf7749d298e07a8c71223
+RMD160 (dbus-1.2.1.tar.gz) = 88b20e16251e10e205fece57e6b434a7aa43b615
+Size (dbus-1.2.1.tar.gz) = 1406833 bytes
+SHA1 (patch-aa) = e527a1a1f937781ce4204a325e3ff7f31fd6afa8
+SHA1 (patch-ab) = 20253f9730a1bd1e233240e6374e30e7fe0586c8
+SHA1 (patch-ac) = afec419973f339e846dc109866148529f80998b3
+SHA1 (patch-ag) = 9539b91fb496681b03854ebdc698b53ae43e6ba6
+SHA1 (patch-ai) = 046f3a78c465b28595abf278aac942f7f0d0a297
diff -r 3bc3e9948ca0 -r 359f67a20e47 sysutils/dbus/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/dbus/options.mk  Fri Jun 13 11:28:35 2008 +0000
@@ -0,0 +1,32 @@
+# $NetBSD: options.mk,v 1.1 2008/06/13 11:28:35 drochner Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.dbus
+PKG_SUPPORTED_OPTIONS+=        debug kqueue nox11
+PKG_SUGGESTED_OPTIONS= # empty
+
+.if (${OPSYS} == "NetBSD"  ||  \
+     ${OPSYS} == "FreeBSD" ||  \
+     ${OPSYS} == "OpenBSD")
+PKG_SUGGESTED_OPTIONS+=        kqueue
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS.enable+=        asserts tests verbose-mode
+.endif
+
+.if !empty(PKG_OPTIONS:Mkqueue)
+CONFIGURE_ARGS.enable+=        kqueue
+.else
+CONFIGURE_ARGS.disable+=       kqueue
+.endif
+
+.if !empty(PKG_OPTIONS:Mnox11)
+CONFIGURE_ARGS.without=        x
+.else
+CONFIGURE_ARGS.with+=  x
+.  include "../../x11/libX11/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt=     build
+.  include "../../x11/libXt/buildlink3.mk"
+.endif
diff -r 3bc3e9948ca0 -r 359f67a20e47 sysutils/dbus/patches/patch-aa
--- a/sysutils/dbus/patches/patch-aa    Fri Jun 13 11:23:30 2008 +0000
+++ b/sysutils/dbus/patches/patch-aa    Fri Jun 13 11:28:35 2008 +0000
@@ -1,42 +1,23 @@
-$NetBSD: patch-aa,v 1.6 2006/12/17 15:39:33 jmmv Exp $
+$NetBSD: patch-aa,v 1.7 2008/06/13 11:28:35 drochner Exp $
 
---- bus/Makefile.in.orig       2006-12-12 20:41:47.000000000 +0100
+--- bus/Makefile.in.orig       2008-02-26 13:36:18.000000000 -0500
 +++ bus/Makefile.in
-@@ -305,11 +305,11 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
+@@ -411,7 +411,7 @@ target_os = @target_os@
  target_vendor = @target_vendor@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -configdir = $(sysconfdir)/dbus-1
 +configdir = $(datadir)/examples/@PACKAGE@
- INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS)                         \
-       -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"\"       \
-+      -DDBUS_SESSION_CONFIG_FILE=\""$(sysconfdir)/session.conf"\"
- 
- EFENCE = 
- CONFIG_IN_FILES = \
-@@ -390,6 +390,13 @@ SCRIPT_IN_FILES = messagebus.in \
- @DBUS_INIT_SCRIPTS_SLACKWARE_TRUE@initd_SCRIPTS = \
- @DBUS_INIT_SCRIPTS_SLACKWARE_TRUE@    rc.messagebus
- 
-+initddir = $(datadir)/examples/rc.d
-+initd_SCRIPTS = messagebus.redhat rc.messagebus.slackware
-+messagebus.redhat: messagebus
-+      cp messagebus messagebus.redhat
-+rc.messagebus.slackware: rc.messagebus
-+      cp rc.messagebus rc.messagebus.slackware
-+
- MAN_IN_FILES = dbus-daemon.1.in
- man_MANS = dbus-daemon.1
- 
-@@ -858,8 +865,6 @@ install-data-hook:
+ INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@            \
+       -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\"        \
+       -DDAEMON_NAME=\"dbus-daemon\"  -DDBUS_COMPILATION
+@@ -1291,9 +1291,6 @@ install-data-hook:
                chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
        fi
        $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
 -      $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
 -      $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
+-      $(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
        $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
+       $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
+       $(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1
diff -r 3bc3e9948ca0 -r 359f67a20e47 sysutils/dbus/patches/patch-ab
--- a/sysutils/dbus/patches/patch-ab    Fri Jun 13 11:23:30 2008 +0000
+++ b/sysutils/dbus/patches/patch-ab    Fri Jun 13 11:28:35 2008 +0000
@@ -1,126 +1,64 @@
-$NetBSD: patch-ab,v 1.9 2008/02/21 01:42:13 tnn Exp $
+$NetBSD: patch-ab,v 1.10 2008/06/13 11:28:35 drochner Exp $
 
---- dbus/dbus-sysdeps-unix.c.orig      2006-12-11 14:21:09.000000000 -0500
+--- dbus/dbus-sysdeps-unix.c.orig      2008-04-04 11:24:08.000000000 -0400
 +++ dbus/dbus-sysdeps-unix.c
-@@ -22,6 +22,10 @@
-  *
-  */
- 
-+#ifdef __NetBSD__
-+#define _NETBSD_SOURCE
-+#endif
-+
- #include "dbus-internals.h"
- #include "dbus-sysdeps.h"
- #include "dbus-sysdeps-unix.h"
-@@ -67,6 +71,10 @@
- #include <ucred.h>
- #endif
+@@ -35,6 +35,9 @@
+ #include "dbus-list.h"
+ #include "dbus-credentials.h"
  
-+#ifdef __NetBSD__
-+#include <sys/un.h>
-+#endif
-+
- #ifndef O_BINARY
- #define O_BINARY 0
- #endif
-@@ -75,6 +83,33 @@
- #define socklen_t int
- #endif



Home | Main Index | Thread Index | Old Index