Changeset 79191

Timestamp:

06/04/11 13:10:23 (4 years ago)

Author:

pixilla@…

Message:

devel/dbus: Update to version 1.4.10. Remove and recreate patches. Closes ticket #27760.

Location:

trunk/dports/devel/dbus

Files:

• Portfile (modified) (5 diffs)
• files/0001-make-session-bus-listen-tag-configurable.patch (deleted)
• files/0002-add-launchd-implementation.patch (deleted)
• files/0003-look-up-DISPLAY-from-launchd-if-not-initialized.patch (deleted)
• files/0004-enable-launchd.patch (deleted)
• files/0005-dont-dup-closed-stdin.patch (deleted)
• files/0006-bus_system-conf-in.patch (deleted)
• files/10.5-launchd.diff (deleted)
• files/patch-bus-system.conf.in.diff (added)
• files/patch-dbus-dubs-sysdeps-unix.c.diff (added)

trunk/dports/devel/dbus/Portfile

@@ -6 +6 @@
 
 name            dbus
-version         1.2.24
-revision        1
+version         1.4.10
 maintainers     mcalhoun openmaintainer
 categories      devel
@@ -19 +18 @@
 master_sites    http://dbus.freedesktop.org/releases/dbus
 
-checksums       md5     565346cecd9cfecf1463540c6086cc2c \
-                sha1    9593717348ea36ba228b46f165bb67c127c12be8 \
-                rmd160  2f51def784056bc16fbec2ddc3be22c022a94fb5
+checksums           sha1    8a35d253d444d1450a206f717445b371e1d936a1 \
+                    rmd160  7eb3fd372eca42331541eb7465b62c18cd4a2546
 
 # There is a proposal to use launchd with dbus (see https://bugs.freedesktop.org/show_bug.cgi?id=14259).
-patchfiles      0001-make-session-bus-listen-tag-configurable.patch \
-                0002-add-launchd-implementation.patch \
-                0003-look-up-DISPLAY-from-launchd-if-not-initialized.patch \
-                0004-enable-launchd.patch \
-                0005-dont-dup-closed-stdin.patch \
-                0006-bus_system-conf-in.patch
-patch.pre_args  -p1
-
-if { $macosx_deployment_target != "10.4" } {
-    # Allow on-demand loading for Leopard.
-    patchfiles-append 10.5-launchd.diff
-}
+patchfiles      patch-bus-system.conf.in.diff \
+                patch-dbus-dubs-sysdeps-unix.c.diff
 
 depends_build       \
@@ -45 +33 @@
 
 depends_lib     port:expat
-
-use_autoreconf  yes
 
 configure.args  --disable-doxygen-docs \
@@ -52 +38 @@
                 --without-x \
                 --enable-launchd \
-                --with-launchd-agent-dir=${prefix}/Library/LaunchAgents
+                --with-launchd-agent-dir=${prefix}/Library/LaunchAgents \
+                --with-session-socket-dir=/tmp \
+                --with-test-socket-dir=/tmp
+
+activate.asroot yes
 
 pre-configure {
@@ -163 +153 @@
     file attributes ${prefix}/var/run/dbus -group ${dbus_group} -owner ${dbus_user}
     file attributes ${prefix}/libexec/dbus-daemon-launch-helper -group ${dbus_group}
+    
+    # Change the share directory so other ports can install to it without running as root.
+    if {[geteuid] == 0 && [getuid] != 0 && ${install.user} != 0} {
+        file attributes ${prefix}/share/dbus-1 -owner ${install.user} -group ${install.group}
+    }
     
     if { ![variant_isset no_startupitem] && ![variant_isset no_root] } {