[PC-BSD Commits] r18120 - in pbi/modules/nonport/truetypefonts: . scripts

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-08-03 14:14:18 +0000 (Fri, 03 Aug 2012)
New Revision: 18120

Modified:
   pbi/modules/nonport/truetypefonts/pbi.conf
   pbi/modules/nonport/truetypefonts/scripts/post-install.sh
   pbi/modules/nonport/truetypefonts/scripts/pre-remove.sh
Log:
Fix up the truetypefonts PBI to try and remove the cabextract PBI conflict



Modified: pbi/modules/nonport/truetypefonts/pbi.conf
===================================================================
--- pbi/modules/nonport/truetypefonts/pbi.conf	2012-08-03 11:21:28 UTC (rev 18119)
+++ pbi/modules/nonport/truetypefonts/pbi.conf	2012-08-03 14:14:18 UTC (rev 18120)
@@ -27,7 +27,7 @@
 
 PBI_REQUIRESROOT="YES"; export PBI_REQUIRESROOT
 
-PBI_BUILDKEY="05"; export PBI_BUILDKEY
+PBI_BUILDKEY="06"; export PBI_BUILDKEY
  
 PBI_AB_PRIORITY="40"; export PBI_AB_PRIORITY
 

Modified: pbi/modules/nonport/truetypefonts/scripts/post-install.sh
===================================================================
--- pbi/modules/nonport/truetypefonts/scripts/post-install.sh	2012-08-03 11:21:28 UTC (rev 18119)
+++ pbi/modules/nonport/truetypefonts/scripts/post-install.sh	2012-08-03 14:14:18 UTC (rev 18120)
@@ -58,20 +58,10 @@
 
 for i in `ls *.ttf`
 do
-  if [ -d "/PCBSD/local/lib/X11/fonts/TrueType" ]
-  then
-    ln -s ${PBI_PROGDIRPATH}/msttf/${i} /PCBSD/local/lib/X11/fonts/TrueType/${i}
-  else
     ln -s ${PBI_PROGDIRPATH}/msttf/${i} /usr/local/lib/X11/fonts/TrueType/${i}
-  fi
 done
 
-if [ -d "/PCBSD/local/lib/X11/fonts/TrueType" ]
-then
-  cd /PCBSD/local/lib/X11/fonts/TrueType/
-else
-  cd /usr/local/lib/X11/fonts/TrueType/
-fi
+cd /usr/local/lib/X11/fonts/TrueType/
 
 ${PBI_PROGDIRPATH}/bin/ttmkfdir > fonts.dir
 fc-cache -f
@@ -80,5 +70,3 @@
 DialogType: Info
 DialogText: Your fonts were installed successfully. Please log out and log back in for changes to take effect.
 <End Dialog>"
-
-rm ${PBI_PROGDIRPATH}/bin/cabextract

Modified: pbi/modules/nonport/truetypefonts/scripts/pre-remove.sh
===================================================================
--- pbi/modules/nonport/truetypefonts/scripts/pre-remove.sh	2012-08-03 11:21:28 UTC (rev 18119)
+++ pbi/modules/nonport/truetypefonts/scripts/pre-remove.sh	2012-08-03 14:14:18 UTC (rev 18120)
@@ -2,12 +2,7 @@
 cd ${PBI_PROGDIRPATH}/msttf/
 for i in `ls *.ttf`
 do
-  if [ -d "/PCBSD/local/lib/X11/fonts/TrueType/${i}" ]
-  then
-    rm /PCBSD/local/lib/X11/fonts/TrueType/${i}
-  else
-    rm /usr/local/lib/X11/fonts/TrueType/${i}
-  fi
+  rm /usr/local/lib/X11/fonts/TrueType/${i}
 done
 
 cd /usr/local/lib/X11/fonts/TrueType