[59322] trunk/dports/devel/dbus/Portfile
sharky at macports.org
sharky at macports.org
Tue Oct 13 08:10:55 PDT 2009
Revision: 59322
http://trac.macports.org/changeset/59322
Author: sharky at macports.org
Date: 2009-10-13 08:10:53 -0700 (Tue, 13 Oct 2009)
Log Message:
-----------
dbus: remove references to darwin 7
Modified Paths:
--------------
trunk/dports/devel/dbus/Portfile
Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile 2009-10-13 15:00:46 UTC (rev 59321)
+++ trunk/dports/devel/dbus/Portfile 2009-10-13 15:10:53 UTC (rev 59322)
@@ -67,36 +67,6 @@
}
}
-platform darwin 7 {
- depends_build-delete port:autoconf port:automake port:libtool
- depends_lib-append port:xorg-libsm port:xorg-libX11
-
- use_autoreconf no
-
- configure.args-delete --without-x \
- --enable-launchd \
- --with-launchd-agent-dir=${prefix}/Library/LaunchAgents
- configure.args-append --with-x
-
- post-patch {
- # Neither _SC_GETPW_R_SIZE_MAX nor _SC_GETGR_R_SIZE_MAX are defined in Panther.
- # The value of -1 is used to emulate a failed sysconf call.
- reinplace "s|sysconf (_SC_GETPW_R_SIZE_MAX)|-1|" \
- ${worksrcpath}/dbus/dbus-sysdeps-unix.c
- reinplace "s|sysconf (_SC_GETGR_R_SIZE_MAX)|-1|" \
- ${worksrcpath}/dbus/dbus-sysdeps-util-unix.c
-
- # -Wno-pointer-sign does not work on Panther.
- reinplace {/CFLAGS="$CFLAGS -Wno-pointer-sign"/d} ${worksrcpath}/configure
- }
-
- if { ! [variant_isset no_startupitem] } {
- startupitem.create yes
- }
- startupitem.name dbus
- startupitem.executable ${prefix}/bin/dbus-daemon --system --nofork
-}
-
use_parallel_build yes
test.run yes
@@ -129,46 +99,44 @@
}
post-destroot {
- if {![variant_isset darwin_7]} {
- # Simplify startup script over startupitem.create.
- # See http://trac.macports.org/ticket/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>"
-
- puts ${plist} "<key>OnDemand</key><false/>"
-
- if { ! [variant_isset no_startupitem] } {
- puts ${plist} "<key>Disabled</key><true/>"
- }
-
- puts ${plist} "</dict>"
- puts ${plist} "</plist>"
-
- close ${plist}
-
- if { ! [variant_isset no_startupitem] } {
- xinstall -d -m 0755 ${destroot}${startup_root}/Library/LaunchDaemons
- xinstall -d -m 0755 ${destroot}${startup_root}/Library/LaunchAgents
- ln -s ${plistFl} ${destroot}${startup_root}/Library/LaunchDaemons
- ln -s ${prefix}/Library/LaunchAgents/org.freedesktop.dbus-session.plist ${destroot}${startup_root}/Library/LaunchAgents
- }
+ # Simplify startup script over startupitem.create.
+ # See http://trac.macports.org/ticket/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>"
+
+ puts ${plist} "<key>OnDemand</key><false/>"
+
+ if { ! [variant_isset no_startupitem] } {
+ puts ${plist} "<key>Disabled</key><true/>"
}
+ puts ${plist} "</dict>"
+ puts ${plist} "</plist>"
+
+ close ${plist}
+
+ if { ! [variant_isset no_startupitem] } {
+ xinstall -d -m 0755 ${destroot}${startup_root}/Library/LaunchDaemons
+ xinstall -d -m 0755 ${destroot}${startup_root}/Library/LaunchAgents
+ ln -s ${plistFl} ${destroot}${startup_root}/Library/LaunchDaemons
+ ln -s ${prefix}/Library/LaunchAgents/org.freedesktop.dbus-session.plist ${destroot}${startup_root}/Library/LaunchAgents
+ }
+
system "env DYLD_LIBRARY_PATH=${destroot}${prefix}/lib ${destroot}${prefix}/bin/dbus-uuidgen --ensure=${destroot}${prefix}/var/lib/dbus/machine-id"
}
@@ -186,7 +154,7 @@
file attributes ${prefix}/var/run/dbus -group ${dbus_group} -owner ${dbus_user}
file attributes ${prefix}/libexec/dbus-daemon-launch-helper -group ${dbus_group}
- if {![variant_isset darwin_7] && ![variant_isset no_startupitem] } {
+ if { ![variant_isset no_startupitem] } {
if { ! [variant_isset no_root] } {
set sudo "sudo "
file attributes /Library/LaunchAgents/org.freedesktop.dbus-session.plist -owner root -group wheel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091013/2db3dd13/attachment.html>
More information about the macports-changes
mailing list