Ticket #52257: dbus.diff

devel/dbus/Portfile

@@ -7 +7 @@
 name            dbus
 conflicts       dbus-devel
 version         1.10.8
+revision        1
 maintainers     mcalhoun openmaintainer
 categories      devel
 platforms       darwin
@@ -27 +28 @@
 #    poll is always broken
 #    see https://trac.macports.org/ticket/47741#comment:12 for EXTERNAL authentication
 patchfiles      patch-bus-system.conf.in.diff \
-                patch-configure.diff
-
-depends_build       \
-    port:pkgconfig
+                patch-improve-systembus.diff \
+                patch-autogen.sh \
+                patch-enable-standard-launch2.diff
+
+depends_build \
+                port:pkgconfig \
+                port:autoconf \
+                port:automake \
+                port:libtool
 
 unset -nocomplain startup_root
 if { [variant_isset no_root] } {
@@ -71 +77 @@
         set startup_root  ""
     }
 }
-add_users         ${dbus_user} group=${dbus_group} realname=Message\ Bus
+add_users       ${dbus_user} group=${dbus_group} realname=Message\ Bus
 
 depends_lib     port:expat
 
+configure.cmd   ./autogen.sh
+
 configure.args  --disable-doxygen-docs \
                 --disable-xml-docs \
                 --disable-ducktype-docs \
                 --without-x \
                 --enable-launchd \
                 --with-launchd-agent-dir=${prefix}/Library/LaunchAgents \
+                --with-launchd-daemon-dir=${prefix}/Library/LaunchDaemons \
+                --with-session-socket-dir=/tmp \
                 --with-dbus-user=${dbus_user} \
-                --disable-tests
+                --disable-tests \
+                --disable-maintainer-mode \
+                --disable-dependency-tracking \
+                --disable-verbose-mode \
+                --disable-asserts
 
 set sudo ""
 if {![variant_isset no_root]} {
     set sudo "sudo "
 }
 
+variant x11 description {Build with support for X11 (*experimental* on OS X!), \
+        for running a session dbus when working on a remote X11 display} {
+    # we *can* enable X11 autolaunch, but I have some doubts that's a good idea on OS X
+    configure.args-replace \
+                --without-x --with-x
+    depends_lib-append \
+                port:xorg-libsm port:xorg-libX11
+#     patchfiles-append \
+#                 patch-enable-standard-launch.diff
+}
+
+# the variant for building the documentation is not called 'docs' to avoid propagating
+# the docs variant to doxygen, which causes a dependency explosion
+variant documentation description {Build the (doxygen) documentation} {
+    configure.args-replace \
+                --disable-doxygen-docs --enable-doxygen-docs
+    # this is a hack to avoid installing port:doxygen+universal
+    if {![file exists ${prefix}/bin/doxygen]} {
+        depends_build-append \
+                port:doxygen
+    }
+}
+
 # These variants are obsolete
 # dbus should respect the global variable startupitem.install set in ${prefix}/etc/macports/macports.conf
 # See https://guide.macports.org/#reference.startupitems
@@ -125 +162 @@
 }
 
 post-patch {
+    # moved from patch-configure.diff:
+    reinplace "s|broken_poll=\"no (cross compiling)\"|broken_poll=yes|g" ${worksrcpath}/configure.ac
+    reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/dbus/dbus-sysdeps-util-unix.c
+
     if { [tbool startupitem.create] } {
         # Disable if installed into startup directory.
         reinplace "s|</array>|</array>\\\n\\\n\\\t<key>Disabled</key>\\\n\\\t<true/>|" \
@@ -167 +208 @@
 }
 
 post-destroot {
-    # Simplify startup script over startupitem.install.
-    # See #15081
-    xinstall -d -m 0755 ${destroot}${plistDir}
-    set plist [open "${destroot}${plistFl}" w 0644]
-
-    puts ${plist} "<?xml version='1.0' encoding='UTF-8'?>"
-    puts ${plist} "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\""
-    puts ${plist} "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\" >"
-    puts ${plist} "<plist version='1.0'>"
-    puts ${plist} "<dict>"
-
-    puts ${plist} "<key>Label</key><string>org.freedesktop.dbus-system</string>"
-
-    puts ${plist} "<key>ProgramArguments</key>"
-    puts ${plist} "<array>"
-    puts ${plist} "\t<string>${prefix}/bin/dbus-daemon</string>"
-    puts ${plist} "\t<string>--system</string>"
-    puts ${plist} "\t<string>--nofork</string>"
-    puts ${plist} "</array>"
-    if {$macosx_deployment_target eq "10.4"} {
-        puts ${plist} "<key>OnDemand</key><false/>"
-    } else {
-        puts ${plist} "<key>KeepAlive</key><true/>"
-    }
-
-    if { [tbool startupitem.install] } {
-        puts ${plist} "<key>Disabled</key><true/>"
-    }
-
-    puts ${plist} "</dict>"
-    puts ${plist} "</plist>"
-
-    close ${plist}
+#     # Simplify startup script over startupitem.install.
+#     # See #15081
+    # handled through configure/build/install; see patch-improve-systembus.diff
 
     if { [info exists startup_root] } {
         xinstall -d -m 0755 ${destroot}${startup_root}/Library/LaunchDaemons
@@ -220 +231 @@
 
 post-activate {
     file attributes ${prefix}/var/run/dbus -group ${dbus_group} -owner ${dbus_user}
+    file attributes ${prefix}/libexec/dbus-daemon-launch-helper -owner root
     file attributes ${prefix}/libexec/dbus-daemon-launch-helper -group ${dbus_group}
+    system "chmod u+s ${prefix}/libexec/dbus-daemon-launch-helper"
 
     if { [tbool startupitem.install] && ![variant_isset no_root] } {
         file attributes ${prefix}/Library/LaunchAgents/org.freedesktop.dbus-session.plist -owner root -group wheel
@@ -241 +254 @@
     ui_warn "This variant requires circular dependencies and only works if ${name} is already installed"
 
     configure.args-replace  --disable-tests --enable-tests
-    configure.args-append   --without-dbus-glib
-    depends_build-append      port:glib2
-    depends_build-append      port:python27 port:dbus-python27 port:py27-gobject port:dbus-python
+#     configure.args-append   --without-dbus-glib
+    configure.args-append   --enable-modular-tests \
+                            --with-test-socket-dir=/tmp
+    depends_build-append    port:glib2
+    depends_build-append    port:python27 port:dbus-python27 port:py27-gobject port:py27-gobject3 port:dbus-python
     configure.python        ${prefix}/bin/python2.7
 }
 
@@ -268 +283 @@
 ############################################################################"
 }
 
+# obsolete advice, but keep for reference:
+# - Add a line to /etc/sudoers (using the visudo Terminal command):
+# Defaults        env_keep += \"DBUS_LAUNCHD_SESSION_BUS_SOCKET\"
+
 variant no_root conflicts underscore description {Run the DBUS daemon as MacPorts install user.} {
     pre-fetch {
         ###########
@@ -277 +296 @@
         # add_users root trashes the root user in the extract phase. See
         # #45737.
         if {${install.user} eq "root" || ${install.group} eq "wheel"} {
-            ui_error "The DBUS daemon should not be run as root."
+            ui_error "The DBUS daemon should not be run as root (${install.user} ${install.group})."
             error "Please do not use this variant with your MacPorts configuration."
         }
     }
@@ -293 +312 @@
     # This variant allows the user to follow that convention.
 }
 
+configure.optflags-append   -g
+configure.ldflags-append    -g
+configure.env-append        LDFLAGS=-g STRIP=/bin/echo
+build.env-append            STRIP=/bin/echo
+
 set cross_opts  "ac_cv_have_abstract_sockets=no"
 if {${os.arch} eq "i386"} {
     if { ${os.major} >= 10 } {