[cvs] dists/10.4/unstable/main/finkinfo/x11 appleotffonts.patch, NONE, 1.1 appleotffonts.info, 1.4, 1.5

[Tomoaki Okayama]

Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv13428

Modified Files:
        appleotffonts.info 
Added Files:
        appleotffonts.patch 
Log Message:
Work right on 10.4, 10.5 and 10.6.

--- NEW FILE: appleotffonts.patch ---
--- /dev/null   2011-01-17 20:12:01.000000000 +0900
+++ ./fix-otffont-filename.sh   2011-01-17 20:09:03.000000000 +0900
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+ot_fonts_dir="`@PREFIX@/bin/xfontpath basedir`/appleotf"
+
+evallines(){
+  while read line; do
+    eval $line
+  done
+}
+
+LC_ALL=ja_JP.UTF-8
+cd $ot_fonts_dir
+
+cat <<EOF | /usr/bin/iconv -f UTF-8 -t UTF-8-MAC | evallines
+if [ -L ヒラギノ明朝_Pro_W3.otf ]; then mv ヒラギノ明朝_Pro_W3.otf 
HiraMinPro-W3.otf; fi
+if [ -L ヒラギノ明朝_Pro_W6.otf ]; then mv ヒラギノ明朝_Pro_W6.otf 
HiraMinPro-W6.otf; fi
+if [ -L ヒラギノ角ゴ_Pro_W3.otf ]; then mv ヒラギノ角ゴ_Pro_W3.otf 
HiraKakuPro-W3.otf; fi
+if [ -L ヒラギノ角ゴ_Pro_W6.otf ]; then mv ヒラギノ角ゴ_Pro_W6.otf 
HiraKakuPro-W6.otf; fi
+if [ -L ヒラギノ角ゴ_Std_W8.otf ]; then mv ヒラギノ角ゴ_Std_W8.otf 
HiraKakuStd-W8.otf; fi
+if [ -L ヒラギノ丸ゴ_Pro_W4.otf ]; then mv ヒラギノ丸ゴ_Pro_W4.otf 
HiraMaruPro-W4.otf; fi
+if [ -L ヒラギノ明朝_ProN_W3.otf ]; then mv 
ヒラギノ明朝_ProN_W3.otf HiraMinProN-W3.otf; fi
+if [ -L ヒラギノ明朝_ProN_W6.otf ]; then mv 
ヒラギノ明朝_ProN_W6.otf HiraMinProN-W6.otf; fi
+if [ -L ヒラギノ角ゴ_ProN_W3.otf ]; then mv 
ヒラギノ角ゴ_ProN_W3.otf HiraKakuProN-W3.otf; fi
+if [ -L ヒラギノ角ゴ_ProN_W6.otf ]; then mv 
ヒラギノ角ゴ_ProN_W6.otf HiraKakuProN-W6.otf; fi
+if [ -L ヒラギノ角ゴ_StdN_W8.otf ]; then mv 
ヒラギノ角ゴ_StdN_W8.otf HiraKakuStdN-W8.otf; fi
+if [ -L ヒラギノ丸ゴ_ProN_W4.otf ]; then mv 
ヒラギノ丸ゴ_ProN_W4.otf HiraMaruProN-W4.otf; fi
+EOF

Index: appleotffonts.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/appleotffonts.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- appleotffonts.info  18 Aug 2008 02:30:55 -0000      1.4
+++ appleotffonts.info  17 Jan 2011 11:48:00 -0000      1.5
@@ -1,15 +1,23 @@
 Package: appleotffonts
 Version: 0.1
-Revision: 9
+Revision: 10
+BuildDepends: fink (>= 0.24.12)
 Depends: xfontpath
 Type: nosource
+PatchFile: %n.patch
+PatchFile-MD5: 5458918bce03271165f90ef99a3a1b9d
+PatchScript: sed 's|@PREFIX@|%p|' < %{PatchFile} | patch -p1
 CompileScript: <<
   echo No compilation needed
   echo
   echo This package is created on the fly > dummy
   echo at installation time. >> dummy
 <<
-InstallScript:         install -d -m 755 %d`%p/bin/xfontpath basedir`/appleotf
+InstallScript: <<
+ install -d -m 755 %d`%p/bin/xfontpath basedir`/appleotf
+ install -d -m 755                         %i/bin
+ install    -m 755 fix-otffont-filename.sh %i/bin
+<<
 DocFiles: dummy
 PreRmScript: rm -f `%p/bin/xfontpath basedir`/appleotf/*
 PostInstScript: <<
@@ -21,21 +29,8 @@
     ln -sf "$FONTFILE" "${FONTNAME//\ /_}"
   done
 
-  export HiraMaruProW4="????????????????????????_Pro_W4.otf"
-  export HiraMinProW3="?????????????????????_Pro_W3.otf"
-  export HiraMinProW6="?????????????????????_Pro_W6.otf"
-  export HiraKakuProW3="????????????????????????_Pro_W3.otf"
-  export HiraKakuProW6="????????????????????????_Pro_W6.otf"
-  export HiraKakuStdW8="????????????????????????_Std_W8.otf"
-  if [ -a `%p/bin/xfontpath basedir`/appleotf/$HiraMaruProW4 ] ; then
-    mv $HiraMaruProW4 HiraMaruPro-W4.otf
-    mv $HiraMinProW3  HiraMinPro-W3.otf
-    mv $HiraMinProW6  HiraMinPro-W6.otf
-    mv $HiraKakuProW3 HiraKakuPro-W3.otf
-    mv $HiraKakuProW6 HiraKakuPro-W6.otf
-    mv $HiraKakuStdW8 HiraKakuStd-W8.otf
-    echo "# Renamed Japanese Open Type Font files into Roma-ji filename."
-  fi
+  # Rename Japanese Open Type Font files into Roma-ji filename if exist.
+  %p/bin/fix-otffont-filename.sh
 <<
 Description: Make Apple otf fonts available to Freetype, dvipdfmx etc
 DescDetail: <<



------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand 
malware threats, the impact they can have on your business, and how you 
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs