[66705] trunk/dports/x11/xinit

[jeremyhu at macports.org]

Revision: 66705
          http://trac.macports.org/changeset/66705
Author:   jeremyhu at macports.org
Date:     2010-04-20 13:30:49 -0700 (Tue, 20 Apr 2010)
Log Message:
-----------
xinit: Fix fontpath.  #24534

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

Modified: trunk/dports/x11/xinit/Portfile
===================================================================
--- trunk/dports/x11/xinit/Portfile	2010-04-20 19:20:44 UTC (rev 66704)
+++ trunk/dports/x11/xinit/Portfile	2010-04-20 20:30:49 UTC (rev 66705)
@@ -4,7 +4,7 @@
 
 name                xinit
 version             1.2.1
-revision            1
+revision            2
 categories          x11
 platforms           darwin
 maintainers         jeremyhu
@@ -41,8 +41,9 @@
 
 	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
 
-	xinstall -m 755 ${filespath}/font_cache.sh ${destroot}${prefix}/bin/font_cache
-	reinplace "s|__PREFIX__|${prefix}|" ${destroot}${prefix}/bin/font_cache
+	eval reinplace "s|__PREFIX__|${prefix}|g" \
+		[glob ${destroot}${prefix}/lib/X11/xinit/xinitrc.d/*.sh] \
+		${destroot}${prefix}/bin/font_cache
 }

Modified: trunk/dports/x11/xinit/files/xinitrc.d/10-fontdir.sh
===================================================================
--- trunk/dports/x11/xinit/files/xinitrc.d/10-fontdir.sh	2010-04-20 19:20:44 UTC (rev 66704)
+++ trunk/dports/x11/xinit/files/xinitrc.d/10-fontdir.sh	2010-04-20 20:30:49 UTC (rev 66705)
@@ -1,11 +1,11 @@
-if [ -x /usr/X11/bin/xset ] ; then
-        fontpath="/usr/X11/lib/X11/fonts/misc/,/usr/X11/lib/X11/fonts/TTF/,/usr/X11/lib/X11/fonts/OTF,/usr/X11/lib/X11/fonts/Type1/,/usr/X11/lib/X11/fonts/75dpi/:unscaled,/usr/X11/lib/X11/fonts/100dpi/:unscaled,/usr/X11/lib/X11/fonts/75dpi/,/usr/X11/lib/X11/fonts/100dpi/"
+if [ -x __PREFIX__/bin/xset ] ; then
+        fontpath="__PREFIX__/lib/X11/fonts/misc/,__PREFIX__/lib/X11/fonts/TTF/,__PREFIX__/lib/X11/fonts/OTF,__PREFIX__/lib/X11/fonts/Type1/,__PREFIX__/lib/X11/fonts/75dpi/:unscaled,__PREFIX__/lib/X11/fonts/100dpi/:unscaled,__PREFIX__/lib/X11/fonts/75dpi/,__PREFIX__/lib/X11/fonts/100dpi/"
 
         [ -e "$HOME"/.fonts/fonts.dir ] && fontpath="$fontpath,$HOME/.fonts"
         [ -e "$HOME"/Library/Fonts/fonts.dir ] && fontpath="$fontpath,$HOME/Library/Fonts"
         [ -e /Library/Fonts/fonts.dir ] && fontpath="$fontpath,/Library/Fonts"
         [ -e /System/Library/Fonts/fonts.dir ] && fontpath="$fontpath,/System/Library/Fonts"
 
-        /usr/X11/bin/xset fp= "$fontpath"
+        __PREFIX__/bin/xset fp= "$fontpath"
         unset fontpath
 fi

Modified: trunk/dports/x11/xinit/files/xinitrc.d/99-quartz-wm.sh
===================================================================
--- trunk/dports/x11/xinit/files/xinitrc.d/99-quartz-wm.sh	2010-04-20 19:20:44 UTC (rev 66704)
+++ trunk/dports/x11/xinit/files/xinitrc.d/99-quartz-wm.sh	2010-04-20 20:30:49 UTC (rev 66705)
@@ -1,5 +1,5 @@
 [ -n "${USERWM}" -a -x "${USERWM}" ] && exec "${USERWM}"
-[ -x @PREFIX@/bin/quartz-wm ] && exec @PREFIX@/bin/quartz-wm
+[ -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/20100420/f0c104f2/attachment.html>