[36697] trunk/dports/devel/dbus

[nox at macports.org]

Revision: 36697
          http://trac.macosforge.org/projects/macports/changeset/36697
Author:   nox at macports.org
Date:     2008-05-12 04:52:14 -0700 (Mon, 12 May 2008)

Log Message:
-----------
dbus:
 * Removed X11 support.
 * Disabled XML and Doxygen documentation build.
 * Enabled parallel build.

Modified Paths:
--------------
    trunk/dports/devel/dbus/Portfile

Added Paths:
-----------
    trunk/dports/devel/dbus/files/patch-tools-dbus-launch.c.diff

Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile	2008-05-12 08:20:36 UTC (rev 36696)
+++ trunk/dports/devel/dbus/Portfile	2008-05-12 11:52:14 UTC (rev 36697)
@@ -4,7 +4,7 @@
 
 name            dbus
 version         1.1.20
-revision        1
+revision        2
 maintainers     nomaintainer
 categories      devel
 platforms       darwin
@@ -20,27 +20,11 @@
                 sha1 fff5db438483e6b4a3c40d430b20baa49ad2d58a \
                 rmd160 da06f0fca2e83e9ea3af6fa14045a69b97435221
 
-depends_lib     port:expat \
-                port:libxml2
-depends_build   port:pkgconfig \
-                port:docbook-xml-4.1.2 \
-                port:xmlto
+depends_build   port:pkgconfig
 
-configure.args  --mandir=${prefix}/share/man \
-                --disable-tests \
-                --enable-xml-docs \
-                --enable-kqueue \
-                --with-dbus-daemondir=${prefix}/bin
-    
-configure.cflags-append -no-cpp-precomp
-configure.cflags-append -flat_namespace
+depends_lib     port:expat
 
-startupitem.create  yes
-startupitem.name    dbus
-startupitem.init    XDG_DATA_DIRS=${prefix}/share
-startupitem.start   "${prefix}/bin/dbus-daemon --system"
-startupitem.stop    "kill `cat ${prefix}/var/run/dbus/pid`"
-startupitem.restart "kill `cat ${prefix}/var/run/dbus/pid` ; ${prefix}/bin/dbus-daemon --system"
+patchfiles      patch-tools-dbus-launch.c.diff
 
 pre-patch {
     file mkdir ${worksrcpath}/m4
@@ -48,22 +32,32 @@
 }
 
 # Fixes to be removed post 1.1.20
-patchfiles      patch-dbus-dbus-sysdeps.c.diff
-pre-configure {
+patchfiles-append   patch-dbus-dbus-sysdeps.c.diff
+post-patch {
     reinplace "s|-Wl,-z,relro||g" ${worksrcpath}/configure
-}
-
-pre-build {
     reinplace "s|ucred.h|sys/ucred.h|g" ${worksrcpath}/dbus/dbus-sysdeps-unix.c
 }
 
+configure.args  --mandir=${prefix}/share/man \
+                --disable-tests \
+                --disable-doxygen-docs \
+                --disable-xml-docs \
+                --enable-kqueue \
+                --without-x \
+                --with-dbus-daemondir=${prefix}/bin
+    
+configure.cflags-append -no-cpp-precomp
+configure.cflags-append -flat_namespace
+
+use_parallel_build  yes
+
 test.run        yes
 test.target     check
 
 pre-test {
     if {![variant_isset test]} {
-        ui_error "test variant must be activated to enable test support"
-        return -code 1
+        ui_error "test variant must be activated to enable test support."
+        error "Please enable test variant."
     }
 }
 
@@ -82,6 +76,13 @@
     ${destroot}${prefix}/etc/dbus-1/system.d \
     ${destroot}${prefix}/etc/dbus-1/session.d
 
+startupitem.create  yes
+startupitem.name    dbus
+startupitem.init    XDG_DATA_DIRS=${prefix}/share
+startupitem.start   "${prefix}/bin/dbus-daemon --system"
+startupitem.stop    "kill `cat ${prefix}/var/run/dbus/pid`"
+startupitem.restart "kill `cat ${prefix}/var/run/dbus/pid` ; ${prefix}/bin/dbus-daemon --system"
+
 pre-activate {
     addgroup messagebus
     adduser messagebus gid=[existsgroup messagebus] realname=Message\ Bus

Added: trunk/dports/devel/dbus/files/patch-tools-dbus-launch.c.diff
===================================================================
--- trunk/dports/devel/dbus/files/patch-tools-dbus-launch.c.diff	                        (rev 0)
+++ trunk/dports/devel/dbus/files/patch-tools-dbus-launch.c.diff	2008-05-12 11:52:14 UTC (rev 36697)
@@ -0,0 +1,12 @@
+--- tools/dbus-launch.c.orig	2008-05-12 13:47:53.000000000 +0200
++++ tools/dbus-launch.c	2008-05-12 13:48:17.000000000 +0200
+@@ -966,7 +966,9 @@
+       char write_pid_fd_as_string[MAX_FD_LEN];
+       char write_address_fd_as_string[MAX_FD_LEN];
+ 
++#ifdef DBUS_BUILD_X11
+       xdisplay = NULL;
++#endif
+ 
+       if (close_stderr)
+ 	do_close_stderr ();

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080512/e74cef1c/attachment.html