[35293] trunk/dports/devel/dbus

[gui_dos at macports.org]

Revision: 35293
          http://trac.macosforge.org/projects/macports/changeset/35293
Author:   gui_dos at macports.org
Date:     2008-03-24 07:26:04 -0700 (Mon, 24 Mar 2008)

Log Message:
-----------
dbus:
* Updated to 1.1.20
* Applied fixes as for
http://gitweb.freedesktop.org/?p=dbus/dbus.git;a=commitdiff;h=ee4a0dce33a556bac188cc382c28e2acb75b1a5d

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

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

Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile	2008-03-24 12:56:34 UTC (rev 35292)
+++ trunk/dports/devel/dbus/Portfile	2008-03-24 14:26:04 UTC (rev 35293)
@@ -3,8 +3,7 @@
 PortSystem      1.0
 
 name            dbus
-version         1.0.2
-revision        2
+version         1.1.20
 maintainers     nomaintainer
 categories      devel
 platforms       darwin
@@ -16,9 +15,9 @@
 homepage        http://www.freedesktop.org/Software/dbus
 master_sites    http://dbus.freedesktop.org/releases/dbus
 
-checksums       md5 0552a9b54beb4a044951b7cdbc8fc855 \
-                sha1 2870efd6ea0b5b0d14e52195f560238a74bb1e0e \
-                rmd160 d5eddfb058c4c026d4a9f091ad90abcc6e54861a
+checksums       md5 c552b9bc4b69e4c602644abc21b7661e \
+                sha1 fff5db438483e6b4a3c40d430b20baa49ad2d58a \
+                rmd160 da06f0fca2e83e9ea3af6fa14045a69b97435221
 
 depends_lib     port:expat \
                 port:libxml2
@@ -47,6 +46,12 @@
     system "touch ${worksrcpath}/m4/acx_pthread.m4"
 }
 
+# Fixes to be removed post 1.1.20 
+patchfiles      patch-dbus-dbus-sysdeps.c.diff
+pre-configure {
+    reinplace "s|-Wl,-z,relro||g" ${worksrcpath}/configure
+}
+
 pre-build {
     reinplace "s|ucred.h|sys/ucred.h|g" ${worksrcpath}/dbus/dbus-sysdeps-unix.c
 }
@@ -81,6 +86,7 @@
 
 post-activate {
     file attributes ${prefix}/var/run/dbus -group messagebus -owner messagebus
+    file attributes ${prefix}/libexec/dbus-daemon-launch-helper -group messagebus
     system "${prefix}/bin/dbus-uuidgen --ensure"
 }
 

Added: trunk/dports/devel/dbus/files/patch-dbus-dbus-sysdeps.c.diff
===================================================================
--- trunk/dports/devel/dbus/files/patch-dbus-dbus-sysdeps.c.diff	                        (rev 0)
+++ trunk/dports/devel/dbus/files/patch-dbus-dbus-sysdeps.c.diff	2008-03-24 14:26:04 UTC (rev 35293)
@@ -0,0 +1,21 @@
+--- dbus/dbus-sysdeps.c.orig	2008-02-26 17:02:27.000000000 +0100
++++ dbus/dbus-sysdeps.c	2008-03-24 14:38:08.000000000 +0100
+@@ -39,6 +39,10 @@
+ #include <string.h>
+ #include <stdio.h>
+ 
++#include <sys/time.h>
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++
+ /* This is UNIX-specific (on windows it's just in stdlib.h I believe)
+  * but OK since the same stuff does exist on Windows in stdlib.h
+  * and covered by a configure check.
+@@ -191,7 +195,6 @@
+   if (clearenv () != 0)
+      rc = FALSE;
+ #else
+-  extern char **environ;
+ 
+   if (environ != NULL)
+     environ[0] = NULL;

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