tl11supp-111214-vine.patch 10 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303
  1. diff -up texlive-2011/tl11/common.sh.vine texlive-2011/tl11/common.sh
  2. --- texlive-2011/tl11/common.sh.vine 2011-11-20 15:49:23.000000000 +0900
  3. +++ texlive-2011/tl11/common.sh 2011-11-23 16:32:00.545511134 +0900
  4. @@ -7,29 +7,48 @@
  5. TLSRCDIR=/opt/home-supp/tl11
  6. # temporaly working directory
  7. -TMPDIR=/tmp
  8. +TMPDIR=$(dirname ${TLSRCDIR})/build
  9. #TMPDIR=/var/tmp
  10. # the place of installed TeX Live
  11. -TLINSTDIR=/opt/texlive/2011
  12. +TLINSTDIR=/usr/share/texlive-sources
  13. #TLINSTDIR=/mnt/cd0a
  14. # install directory
  15. -PREFIX=/opt/texlive/p2011
  16. +PREFIX=$(dirname ${TLSRCDIR})/work
  17. # toolkit for [p]xdvi
  18. -#TL_CONF_XDVI_TOOLKIT=--with-xdvi-x-toolkit=motif
  19. -TL_CONF_XDVI_TOOLKIT=--with-xdvi-x-toolkit=xaw
  20. +TL_CONF_XDVI_TOOLKIT=--with-xdvi-x-toolkit=motif
  21. +#TL_CONF_XDVI_TOOLKIT=--with-xdvi-x-toolkit=xaw
  22. -TL_MAKE_FLAGS=-j3
  23. +TL_MAKE_FLAGS=-j$(/usr/bin/getconf _NPROCESSORS_ONLN)
  24. TL_CONFIGURE_ARGS=
  25. -## The following args are for generating binaries for tlptexlive
  26. -#TL_CONFIGURE_ARGS="--disable-all-pkgs --enable-web2c \
  27. -# --disable-xdvipdfmx --disable-xetex \
  28. -# --enable-web-progs --enable-dvipdfmx --enable-mendexk \
  29. -# --enable-makejvf --enable-pxdvik --enable-dvipsk \
  30. -# --enable-tetex --enable-texlive "
  31. +## The following args are for generating binaries for Vine Linux
  32. +TL_CONFIGURE_ARGS=" \
  33. + --enable-shared --disable-static \
  34. + --enable-compiler-warnings=max \
  35. + --without-cxx-runtime-hack \
  36. + \
  37. + --enable-web2c \
  38. + --enable-web-progs --enable-dvipdfmx --enable-mendexk \
  39. + --enable-makejvf --enable-pxdvik --enable-dvipsk \
  40. + --enable-tetex --enable-texlive \
  41. + \
  42. + --with-system-xpdf \
  43. + --with-system-gd \
  44. + --with-system-t1lib \
  45. + --with-system-libpng \
  46. + --with-system-zlib \
  47. + --with-system-freetype2 --with-freetype2-include=`freetype-config --cflags | sed -e 's/-I//' -e 's/ .*//'` \
  48. + --with-pic \
  49. + --with-xdvi-x-toolkit=motif \
  50. + \
  51. + --disable-xindy --disable-xindy-docs --disable-xindy-make-rules \
  52. + --disable-dvi2tty \
  53. + --disable-t1utils --disable-psutils --disable-detex \
  54. + --disable-dvipng --disable-lcdf-typetools \
  55. +"
  56. # for Ubuntu?
  57. # CONFIG_SHELL=$BASH
  58. @@ -38,16 +57,17 @@ TL_CONFIGURE_ARGS=
  59. # --------------------------------
  60. unset TEXINPUTS
  61. unset PTEX_KANJI_ENC
  62. +[ -d $TMPDIR ] || mkdir -p $TMPDIR
  63. TLV=`basename $TLSRCDIR/texlive-*-source.tar.xz |sed "s/texlive-\(........\).*/\1/"`
  64. SRCDIR=$TMPDIR/texlive-$TLV-source
  65. echo -e "\e[0;32m *** TeX Live source: texlive-$TLV-source.tar.xz ***\e[0m"
  66. -ARCH=`ls $SRCDIR/inst/bin/ 2> /dev/null`
  67. +##ARCH=`ls $SRCDIR/inst/bin/ 2> /dev/null`
  68. PTEX_IN_FILTER=no
  69. TEXMF=$SRCDIR/inst/texmf
  70. XMAP=$TEXMF/fonts/map/dvipdfmx
  71. export TEXMFMAIN=$TEXMF
  72. export ORIGPATH=$PATH
  73. -export PATH=$SRCDIR/inst/bin/$ARCH:$PATH
  74. +export PATH=$SRCDIR/inst/bin:$PATH
  75. export TL_CONF_XDVI_TOOLKIT TL_CONFIGURE_ARGS TL_MAKE_FLAGS
  76. sedwrite(){
  77. Diff finished. Wed Nov 23 16:32:14 2011
  78. diff -up texlive-2011/tl11/scripts/texmf.sh.vine texlive-2011/tl11/scripts/texmf.sh
  79. --- texlive-2011/tl11/scripts/texmf.sh.vine 2011-11-20 15:48:57.000000000 +0900
  80. +++ texlive-2011/tl11/scripts/texmf.sh 2011-11-26 15:33:53.791319730 +0900
  81. @@ -1,4 +1,4 @@
  82. -#!/bin/bash
  83. +#!/bin/bash -x
  84. . ./common.sh $*
  85. @@ -29,26 +29,26 @@ mv sample.* ../../../doc/platex/japanese
  86. mv README ../../../doc/platex/japanese/
  87. cd ../../../..
  88. -# otf package
  89. -tarz $TLSRCDIR/ptex/otfbeta.zip
  90. -#if [ "$FLG_UP" = "TRUE" ] ;then
  91. -# tar zxf $TLSRCDIR/uptex/otfstable-uptex-0.05.tar.gz
  92. -#fi
  93. -cd otfbeta
  94. -sedwrite mkjvf "s/ovp2ovf/wovp2ovf/" && chmod +x mkjvf
  95. -#if [ "$FLG_UP" = "TRUE" ] ;then
  96. -# sedwrite umkjvf "s/'ovp2ovf/'wovp2ovf/" && chmod +x umkjvf
  97. -#fi
  98. -for x in script/*.pl; do sedwrite $x "s/ovp2ovf/wovp2ovf/"; chmod +x $x; done
  99. -./makeotf
  100. -#if [ "$FLG_UP" = "TRUE" ] ;then
  101. -# ./umakeotf
  102. -#fi
  103. -mkdir -p ../texmf/fonts/tfm/otf && cp tfm/*.tfm ../texmf/fonts/tfm/otf/
  104. -mkdir -p ../texmf/fonts/vf/otf && cp vf/*.vf ../texmf/fonts/vf/otf/
  105. -mkdir -p ../texmf/tex/latex/otf && cp sty/* ../texmf/tex/latex/otf
  106. -cd ..
  107. -rm -rf otfbeta
  108. +# # otf package
  109. +# tarz $TLSRCDIR/ptex/otfbeta.zip
  110. +# #if [ "$FLG_UP" = "TRUE" ] ;then
  111. +# # tar zxf $TLSRCDIR/uptex/otfstable-uptex-0.05.tar.gz
  112. +# #fi
  113. +# cd otfbeta
  114. +# sedwrite mkjvf "s/ovp2ovf/wovp2ovf/" && chmod +x mkjvf
  115. +# #if [ "$FLG_UP" = "TRUE" ] ;then
  116. +# # sedwrite umkjvf "s/'ovp2ovf/'wovp2ovf/" && chmod +x umkjvf
  117. +# #fi
  118. +# for x in script/*.pl; do sedwrite $x "s/ovp2ovf/wovp2ovf/"; chmod +x $x; done
  119. +# ./makeotf
  120. +# #if [ "$FLG_UP" = "TRUE" ] ;then
  121. +# # ./umakeotf
  122. +# #fi
  123. +# mkdir -p ../texmf/fonts/tfm/otf && cp tfm/*.tfm ../texmf/fonts/tfm/otf/
  124. +# mkdir -p ../texmf/fonts/vf/otf && cp vf/*.vf ../texmf/fonts/vf/otf/
  125. +# mkdir -p ../texmf/tex/latex/otf && cp sty/* ../texmf/tex/latex/otf
  126. +# cd ..
  127. +# rm -rf otfbeta
  128. fi
  129. echo -e "\e[0;33m[rewriting] \e[0m updmap.cfg"
  130. @@ -56,7 +56,7 @@ echo "KanjiMap otf-cktx.map" >> texmf/we
  131. (cd $XMAP && tarz $TLSRCDIR/ptex/ptexlive-maps-????????.tar.xz)
  132. # xdvi
  133. -if [ -f bin/$ARCH/pxdvi ]; then
  134. +if [ -f bin/pxdvi ]; then
  135. cp ../texk/pxdvik/texmf/XDvi texmf/xdvi/XDvi
  136. cp ../texk/pxdvik/texmf/pxdvi.cfg texmf/xdvi/pxdvi.cfg
  137. cp $TLSRCDIR/xdvi-ptex.map.sample texmf/xdvi/
  138. Diff finished. Sat Nov 26 15:34:13 2011
  139. diff -up texlive-2011/tl11/scripts/build.sh.vine texlive-2011/tl11/scripts/build.sh
  140. --- texlive-2011/tl11/scripts/build.sh.vine 2011-11-08 15:56:41.000000000 +0900
  141. +++ texlive-2011/tl11/scripts/build.sh 2011-11-23 19:08:55.313053090 +0900
  142. @@ -7,8 +7,11 @@ if [ "$FLG_RP" = "TRUE" ] ;then
  143. zpatch 0 $TLSRCDIR/reautoconf-parallel.diff
  144. fi
  145. ./reautoconf || exit 1 # ここで時間がかかる
  146. -TL_MAKE=$MAKE ./Build --enable-multiplatform --disable-native-texlive-build || exit 1
  147. +##TL_MAKE=$MAKE ./Build --enable-multiplatform --disable-native-texlive-build || exit 1
  148. +TL_MAKE=$MAKE ./Build --disable-multiplatform --disable-native-texlive-build || exit 1
  149. +exit 0
  150. +## We run the following processes as scripts/build-post.sh.
  151. #
  152. . $TLSRCDIR/common.sh $*
  153. Diff finished. Wed Nov 23 19:09:01 2011
  154. diff -up /dev/null texlive-2011/tl11/scripts/build-post.sh
  155. --- /dev/null 2011-11-23 23:03:59.948000077 +0900
  156. +++ texlive-2011/tl11/scripts/build-post.sh 2011-11-23 19:10:27.848058399 +0900
  157. @@ -0,0 +1,65 @@
  158. +#!/bin/bash
  159. +
  160. +. ./common.sh $*
  161. +
  162. +cd $SRCDIR/inst
  163. +cp -r texmf texmf.orig
  164. +cp -r $TLINSTDIR/texmf .
  165. +cp -r ../texk/tetex/updmap.pl texmf/scripts/tetex/
  166. +cp texmf.orig/web2c/fmtutil.cnf texmf/web2c/fmtutil.cnf
  167. +cp texmf.orig/web2c/texmf.cnf texmf/web2c/texmf.cnf
  168. +rm -rf texmf.orig
  169. +
  170. +# if [ "$FLG_UP" = "TRUE" ] ;then
  171. +# cd texmf
  172. +# zpatch 0 $TLSRCDIR/uptex/uptex-*-texmf-texlive2010.diff
  173. +# tarz $TLSRCDIR/uptex_font-*.tar.gz
  174. +# cd fonts/uptex_min/pl
  175. +# echo -e "\e[0;33m[building] \e[0m umin7.tfm etc."
  176. +# $MAKE pl5 tfm5 vf5 &>/dev/null || exit 1
  177. +# cp u*.tfm ../../tfm/uptex/
  178. +# cp u*.vf ../../vf/uptex/
  179. +# cd ../../..
  180. +# rm -rf fonts/uptex_jis fonts/uptex_upjis fonts/uptex_map fonts/uptex_min
  181. +# cd ..
  182. +# fi
  183. +
  184. +# map for dvipdfmx
  185. +sedwrite texmf/dvipdfmx/dvipdfmx.cfg "s/cid-x.map/kanjix.map/"
  186. +echo -e "\e[0;33m[rewriting] \e[0m updmap.cfg"
  187. +cat <<EOF >> texmf/web2c/updmap.cfg || exit
  188. +#
  189. +# map for pTeX
  190. +KanjiMap morisawa.map
  191. +EOF
  192. +
  193. +
  194. +ln -s $TLINSTDIR/tlpkg tlpkg
  195. +
  196. +exit 0
  197. +
  198. +
  199. +######
  200. +if [ "$FLG_UP" = "TRUE" ] ;then
  201. + echo -e "\e[0;33m[rewriting] \e[0m updmap.cfg"
  202. + echo "KanjiMap uptex-ckt.map" >> texmf/web2c/updmap.cfg || exit
  203. + echo -e "\e[0;33m[writing] \e[0m uptex-ckt.map"
  204. + cat <<EOF > $XMAP/uptex-ckt.map
  205. +%%
  206. +%% Chinese/Korean fonts for upTeX
  207. +%%
  208. +upstsl-h UniGB-UTF16-H !STSong-Light
  209. +upstsl-v UniGB-UTF16-V !STSong-Light
  210. +upstht-h UniGB-UTF16-H !STHeiti-Regular
  211. +upstht-v UniGB-UTF16-V !STHeiti-Regular
  212. +upmsl-h UniCNS-UTF16-H !MSung-Light
  213. +upmsl-v UniCNS-UTF16-V !MSung-Light
  214. +upmhm-h UniCNS-UTF16-H !MHei-Medium
  215. +upmhm-v UniCNS-UTF16-V !MHei-Medium
  216. +uphysmjm-h UniKS-UTF16-H !HYSMyeongJo-Medium
  217. +uphysmjm-v UniKS-UTF16-V !HYSMyeongJo-Medium
  218. +uphygt-h UniKS-UTF16-H !HYGoThic-Medium
  219. +uphygt-v UniKS-UTF16-V !HYGoThic-Medium
  220. +EOF
  221. + cp $TLSRCDIR/uptex/convbkmk.rb $SRCDIR/inst/bin/$ARCH/
  222. +fi
  223. Diff finished. Wed Nov 23 19:10:58 2011
  224. diff -up texlive-2011/tl11/scripts/build-post.sh.vine texlive-2011/tl11/scripts/build-post.sh
  225. --- texlive-2011/tl11/scripts/build-post.sh.vine 2011-11-23 19:10:27.848058399 +0900
  226. +++ texlive-2011/tl11/scripts/build-post.sh 2011-11-23 19:13:50.011070042 +0900
  227. @@ -1,14 +1,15 @@
  228. -#!/bin/bash
  229. +#!/bin/bash -x
  230. . ./common.sh $*
  231. cd $SRCDIR/inst
  232. -cp -r texmf texmf.orig
  233. -cp -r $TLINSTDIR/texmf .
  234. -cp -r ../texk/tetex/updmap.pl texmf/scripts/tetex/
  235. -cp texmf.orig/web2c/fmtutil.cnf texmf/web2c/fmtutil.cnf
  236. -cp texmf.orig/web2c/texmf.cnf texmf/web2c/texmf.cnf
  237. -rm -rf texmf.orig
  238. +[ -d texmf ] && tar cpf texmf-orig.tar texmf && mv texmf texmf.orig || exit 1
  239. +[ -d $TLINSTDIR/texmf ] && cp -far $TLINSTDIR/texmf . || exit 1
  240. +## cp -r ../texk/tetex/updmap.pl texmf/scripts/tetex/
  241. +## cp texmf.orig/web2c/fmtutil.cnf texmf/web2c/fmtutil.cnf
  242. +## cp texmf.orig/web2c/texmf.cnf texmf/web2c/texmf.cnf
  243. +[ -d texmf -a -d texmf.orig -a -f texmf-orig.tar ] && tar xpf texmf-orig.tar && rm -f texmf-orig.tar || exit 1
  244. +## rm -rf texmf.orig
  245. # if [ "$FLG_UP" = "TRUE" ] ;then
  246. # cd texmf
  247. @@ -34,7 +35,8 @@ KanjiMap morisawa.map
  248. EOF
  249. -ln -s $TLINSTDIR/tlpkg tlpkg
  250. +## ln -s $TLINSTDIR/tlpkg tlpkg
  251. +cp -ra $TLINSTDIR/tlpkg tlpkg || exit 1
  252. exit 0
  253. @@ -61,5 +63,5 @@ uphysmjm-v UniKS-UTF16-V
  254. uphygt-h UniKS-UTF16-H !HYGoThic-Medium
  255. uphygt-v UniKS-UTF16-V !HYGoThic-Medium
  256. EOF
  257. - cp $TLSRCDIR/uptex/convbkmk.rb $SRCDIR/inst/bin/$ARCH/
  258. + cp $TLSRCDIR/uptex/convbkmk.rb $SRCDIR/inst/bin/
  259. fi
  260. Diff finished. Wed Nov 23 19:13:53 2011
  261. diff -up texlive-2011/tl11/scripts/install.sh.vine texlive-2011/tl11/scripts/install.sh
  262. --- texlive-2011/tl11/scripts/install.sh.vine 2011-11-08 15:56:41.000000000 +0900
  263. +++ texlive-2011/tl11/scripts/install.sh 2011-11-13 16:14:42.809982841 +0900
  264. @@ -30,8 +30,8 @@ cat <<EOF
  265. Installation is finished.
  266. Please set \$PATH:
  267. - (sh/bash user): export PATH=$PREFIX/bin/$ARCH:\$PATH
  268. - (csh/tcsh user): setenv PATH $PREFIX/bin/$ARCH:\$PATH
  269. + (sh/bash user): export PATH=$PREFIX/bin:\$PATH
  270. + (csh/tcsh user): setenv PATH $PREFIX/bin:\$PATH
  271. EOF
  272. exit 0
  273. Diff finished. Sun Nov 13 16:14:45 2011