[Xquartz-changes] [502] trunk/pkg/scripts

[source_changes at macosforge.org]

Revision: 502
          http://trac.macosforge.org/projects/xquartz/changeset/502
Author:   jeremyhu at freedesktop.org
Date:     2011-01-15 13:53:57 -0800 (Sat, 15 Jan 2011)
Log Message:
-----------
Remove old libpng SDKs during postinst

Modified Paths:
--------------
    trunk/pkg/scripts/postinst_leo.sh
    trunk/pkg/scripts/postinst_sl.sh

Modified: trunk/pkg/scripts/postinst_leo.sh
===================================================================
--- trunk/pkg/scripts/postinst_leo.sh	2010-12-19 22:04:59 UTC (rev 501)
+++ trunk/pkg/scripts/postinst_leo.sh	2011-01-15 21:53:57 UTC (rev 502)
@@ -1,13 +1,13 @@
 #!/bin/sh
-# Cache system fonts
-/usr/X11/bin/font_cache --force --system
 
+[[ -d /usr/X11/include/libpng14 ]] && rm -rf /usr/X11/include/libpng14
+[[ -f /usr/X11/bin/libpng14-config ]] && rm /usr/X11/bin/libpng14-config
+
 # Load the privileged_startx daemon
 /bin/launchctl unload -w /System/Library/LaunchDaemons/org.x.privileged_startx.plist >& /dev/null
 /bin/launchctl load -w /System/Library/LaunchDaemons/org.x.privileged_startx.plist
 
-#if [ -d /usr/X11/share/X11/xkb ] ; then
-#	rm -rf /usr/X11/share/X11/xkb
-#fi
+# Cache system fonts
+/usr/X11/bin/font_cache --force --system
 
 exit 0

Modified: trunk/pkg/scripts/postinst_sl.sh
===================================================================
--- trunk/pkg/scripts/postinst_sl.sh	2010-12-19 22:04:59 UTC (rev 501)
+++ trunk/pkg/scripts/postinst_sl.sh	2011-01-15 21:53:57 UTC (rev 502)
@@ -1,12 +1,19 @@
 #!/bin/sh
-# Cache system fonts
-/opt/X11/bin/font_cache --force --system
 
+[[ -f /etc/paths.d/XQuartz ]] && rm /etc/paths.d/XQuartz 
+[[ -f /etc/manpaths.d/XQuartz ]] && rm /etc/manpaths.d/XQuartz 
+
+[[ -d /opt/X11/include/libpng12 ]] && rm -rf /opt/X11/include/libpng12
+[[ -f /opt/X11/bin/libpng12-config ]] && rm /opt/X11/bin/libpng12-config
+
+[[ -d /opt/X11/include/libpng14 ]] && rm -rf /opt/X11/include/libpng14
+[[ -f /opt/X11/bin/libpng14-config ]] && rm /opt/X11/bin/libpng14-config
+
 # Load the privileged_startx daemon
 /bin/launchctl unload -w /Library/LaunchDaemons/org.macosforge.xquartz.privileged_startx.plist
 /bin/launchctl load -w /Library/LaunchDaemons/org.macosforge.xquartz.privileged_startx.plist
 
-[[ -f /etc/paths.d/XQuartz ]] && rm /etc/paths.d/XQuartz 
-[[ -f /etc/manpaths.d/XQuartz ]] && rm /etc/manpaths.d/XQuartz 
+# Cache system fonts
+/opt/X11/bin/font_cache --force --system
 
 exit 0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20110115/e5376095/attachment.html>