x11 appleotffonts.patch, NONE, 1.1 applesystemfonts.patch, NONE, 1.1 appleotffonts.info, 1.1, 1.2 applesystemfonts.info, 1.1, 1.2

David Fang Tue, 13 Dec 2011 17:21:39 -0800

Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/x11
In directory vz-cvs-3.sog:/tmp/cvs-serv1597


Modified Files:
        appleotffonts.info applesystemfonts.info 
Added Files:
        appleotffonts.patch applesystemfonts.patch 
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8


--- NEW FILE: applesystemfonts.patch ---
--- /dev/null   2011-01-19 23:49:59.000000000 +0900
+++ ./fix-ttffont-filename.sh   2011-01-17 21:01:58.000000000 +0900
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+tt_fonts_dir="`@PREFIX@/bin/xfontpath basedir`/applettf"
+
+evallines(){
+  while read line; do
+    eval $line
+  done
+}
+
+cd $tt_fonts_dir
+
+cat <<EOF | /usr/bin/iconv -f UTF-8 -t UTF-8-MAC | evallines
+if [ -L å·å®_Pro.ttf ]; then mv å·å®_Pro.ttf LiSongPro.ttf ; fi
+if [ -L å·é»_Pro.ttf ]; then mv å·é»_Pro.ttf LiHeiPro.ttf  ; fi
+if [ -L åæä»¿å®.ttf ]; then mv åæä»¿å®.ttf STFangsong.ttf; fi
+if [ -L åæå®ä½.ttf ]; then mv åæå®ä½.ttf STSong.ttf    ; fi
+if [ -L åææ¥·ä½.ttf ]; then mv åææ¥·ä½.ttf STKaiti.ttf   ; fi
+if [ -L åæç»é».ttf ]; then mv åæç»é».ttf STXihei.ttf   ; fi
+if [ -L åæé»ä½.ttf ]; then mv åæé»ä½.ttf STHeiti.ttf   ; fi
+EOF

--- 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,26 @@
+#!/bin/sh
+
+ot_fonts_dir="`@PREFIX@/bin/xfontpath basedir`/appleotf"
+
+evallines(){
+  while read line; do
+    eval $line
+  done
+}
+
+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: applesystemfonts.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/x11/applesystemfonts.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- applesystemfonts.info       11 Jul 2011 04:08:35 -0000      1.1
+++ applesystemfonts.info       14 Dec 2011 01:21:29 -0000      1.2
@@ -1,16 +1,20 @@
 Package: applesystemfonts
 Version: 1.1
-Revision: 1
+Revision: 3
+BuildDepends: fink (>= 0.24.12)
 Depends: xfontpath, x11, fondu
 Type: nosource
 NoSourceDirectory: true
+PatchFile: %n.patch
+PatchFile-MD5: 951b7b471098ab069181088cf7c73658
+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: /usr/bin/true
+InstallScript: mkdir -p %i/bin && install -m 755 fix-ttffont-filename.sh %i/bin
 DocFiles: dummy
 PostInstScript: <<
   /usr/bin/install -d -m 755 `%p/bin/xfontpath basedir`/applettf
@@ -30,8 +34,12 @@
       rm -f "$FONTNAME"
       ln -s "$FONTFILE" "${FONTNAME//\ /_}"
     done
-  # remove two notoriously rotten fonts
-  rm -f GujaratiMT.ttf NISC18030.ttf
+  # remove some notoriously rotten fonts
+  rm -f GujaratiMT.ttf NISC18030.ttf .Keyboard.ttf .LastResort.ttf
+
+  # Rename Chinese TrueType Font files into Roman letters if exist.
+  %p/bin/fix-ttffont-filename.sh
+
   echo "generating fonts.scale"
   # work around a bug in Apple's X11's mkfontscale, it forgets to close files
   ulimit -n 1000

Index: appleotffonts.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/x11/appleotffonts.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- appleotffonts.info  11 Jul 2011 04:08:35 -0000      1.1
+++ appleotffonts.info  14 Dec 2011 01:21:29 -0000      1.2
@@ -1,15 +1,23 @@
 Package: appleotffonts
 Version: 0.1
-Revision: 9
+Revision: 11
+BuildDepends: fink (>= 0.24.12)
 Depends: xfontpath
 Type: nosource
+PatchFile: %n.patch
+PatchFile-MD5: df210cc178dcff074e2811cc84dd8daf
+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 x11
 DescDetail: <<

------------------------------------------------------------------------------
Cloud Computing - Latest Buzzword or a Glimpse of the Future?
This paper surveys cloud computing today: What are the benefits? 
Why are businesses embracing it? What are its payoffs and pitfalls?
http://www.accelacomm.com/jaw/sdnl/114/51425149/

_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] dists/10.4/stable/main/finkinfo/10.4-EOL/x11 appleotffonts.patch, NONE, 1.1 applesystemfonts.patch, NONE, 1.1 appleotffonts.info, 1.1, 1.2 applesystemfonts.info, 1.1, 1.2

Reply via email to