[48099] trunk/dports/x11/xinit

[jeremyhu at macports.org]

Revision: 48099
          http://trac.macports.org/changeset/48099
Author:   jeremyhu at macports.org
Date:     2009-03-14 01:55:41 -0700 (Sat, 14 Mar 2009)
Log Message:
-----------
xinit: Use quartz-wm from prefix if it's available

Modified Paths:
--------------
    trunk/dports/x11/xinit/Portfile
    trunk/dports/x11/xinit/files/xinitrc.d/99-quartz-wm.sh

Modified: trunk/dports/x11/xinit/Portfile
===================================================================
--- trunk/dports/x11/xinit/Portfile	2009-03-14 08:52:12 UTC (rev 48098)
+++ trunk/dports/x11/xinit/Portfile	2009-03-14 08:55:41 UTC (rev 48099)
@@ -4,7 +4,7 @@
 
 name                xinit
 version             1.1.1
-revision            2
+revision            3
 categories          x11
 platforms           darwin
 maintainers         jeremyhu
@@ -33,7 +33,7 @@
 
 configure.pkg_config_path ${x11prefix}/lib/pkgconfig
 
-pre-configure {
+post-patch {
 	reinplace "s|org.x|org.macports|" ${worksrcpath}/privileged_startx/org.x.privileged_startx.plist.cpp
 	reinplace "s|org.x|org.macports|" ${worksrcpath}/privileged_startx/privileged_startx_types.h
 	reinplace "s|org.x|org.macports|" ${worksrcpath}/privileged_startx/server.c
@@ -47,6 +47,7 @@
 
 	xinstall -d ${destroot}${prefix}/lib/X11/xinit/xinitrc.d
 	eval xinstall -m 755 [glob ${filespath}/xinitrc.d/*.sh] ${destroot}${prefix}/lib/X11/xinit/xinitrc.d
+	reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${prefix}/lib/X11/xinit/xinitrc.d/99-quartz-wm.sh
 
 	xinstall -m 755 ${filespath}/font_cache.sh ${destroot}${prefix}/bin/font_cache
 	reinplace "s|^X11DIR=.*$|X11DIR=${prefix}|" ${destroot}${prefix}/bin/font_cache

Modified: trunk/dports/x11/xinit/files/xinitrc.d/99-quartz-wm.sh
===================================================================
--- trunk/dports/x11/xinit/files/xinitrc.d/99-quartz-wm.sh	2009-03-14 08:52:12 UTC (rev 48098)
+++ trunk/dports/x11/xinit/files/xinitrc.d/99-quartz-wm.sh	2009-03-14 08:55:41 UTC (rev 48099)
@@ -1,4 +1,5 @@
 [ -n "${USERWM}" -a -x "${USERWM}" ] && exec "${USERWM}"
+[ -x @PREFIX@/bin/quartz-wm ] && exec @PREFIX@/bin/quartz-wm
 [ -x /usr/bin/quartz-wm ] && exec /usr/bin/quartz-wm
 [ -x /usr/X11/bin/quartz-wm ] && exec /usr/X11/bin/quartz-wm
 [ -x /usr/X11R6/bin/quartz-wm ] && exec /usr/X11R6/bin/quartz-wm
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090314/803fa620/attachment.html>