Source Mage code commit list

[Andraž Levstik <scm AT sourcemage.org>]

GIT changes to devel-texlive grimoire by Andraž Levstik 
<ruskie+2054d253 AT codemages.net>:

 latex/texlive/DEPENDS              |    2 +
 latex/texlive/HISTORY              |    5 ++++
 latex/texlive/PRE_BUILD            |   22 +++++++++++++-----
 latex/texlive/rename_getline.patch |   45 
+++++++++++++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 6 deletions(-)

New commits:
commit 9a2214b3dc5cde3c0ffd350560074c857a460f52
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

    texlive: getline fixes, removing included libs and utils

diff --git a/latex/texlive/DEPENDS b/latex/texlive/DEPENDS
index f5781ce..285c9c9 100755
--- a/latex/texlive/DEPENDS
+++ b/latex/texlive/DEPENDS
@@ -6,6 +6,8 @@ depends flex &&
 depends expat &&
 depends ghostscript '--with-gs=gs' &&
 depends fontconfig '--with-xetex' &&
+# still testing this
+#depends freetype1 '--with-system-freetype' &&
 depends freetype2 "--with-system-freetype2 
--with-freetype2-include=/usr/include" &&
 depends ncurses '--with-system-ncurses' &&
 depends libpng '--with-system-pnglib' &&
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY
index a536ed1..e077b5a 100644
--- a/latex/texlive/HISTORY
+++ b/latex/texlive/HISTORY
@@ -1,3 +1,8 @@
+2009-08-06 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * rename_getline.patch: patch to rename getline to tex_getline
+       * PRE_BUILD: various sedits and some rms
+       * DEPENDS: trying out system freetype1
+
 2009-07-29 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
        * BUILD, DEPENDS, DETAILS, PRE_BUILD: spell created
        * fix_scripts_2.patch, fix_scripts.patch, texmf.cnf_fix.patch: needed 
for
diff --git a/latex/texlive/PRE_BUILD b/latex/texlive/PRE_BUILD
index 7def1cb..e117a23 100755
--- a/latex/texlive/PRE_BUILD
+++ b/latex/texlive/PRE_BUILD
@@ -5,9 +5,19 @@ xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
 cd $SOURCE_DIRECTORY &&
 patch -p0 < $SPELL_DIRECTORY/fix_scripts.patch &&
 patch -p0 < $SPELL_DIRECTORY/fix_scripts_2.patch &&
-patch -p0 < $SPELL_DIRECTORY/texmf.cnf_fix.patch
-#rm -rf 
libs/{ncurses,expat,freetype,freetype2,gd,jpeg,libpng,lua51,luafilesystem,zlib,xpdf,t1lib,unzip,luazlib,luapeg}
 &&
-#rm -rf 
texk/{detex,dtl,dvi2tty,dvipdf,dvipdfmx,dvipng,gsftopk,lacheck,lcdf-typetools,tetex,xdvik}
 &&
-#rm -rf utils/{dialog,gzip,lzma,ps2eps,psutils,t1utils,texinfo} &&
-#patch -p0 < $SPELL_DIRECTORY/get_rid_of_internal_crap.patch &&
-#./reautoconf
+patch -p0 < $SPELL_DIRECTORY/texmf.cnf_fix.patch &&
+patch -p0 < $SPELL_DIRECTORY/rename_getline.patch &&
+sed -i '/^[^#]*\.p:/ {n; a \
+       sed -i "s/getline/tex_getline/g" $@
+}' texk/web2c/Makefile.in &&
+sed -i "s/getline/tex_getline/g"  texk/web2c/mpware/mpto.c &&
+sed -i "s/getline/tex_getline/g"  texk/afm2pl/afm2pl.c &&
+sed -i "s/getline/tex_getline/g"  texk/dvipsk/afm2tfm.c &&
+sed -i "s/getline/tex_getline/g"  texk/ttf2pk/newobj.h &&
+sed -i "s/getline/tex_getline/g"  texk/ttf2pk/newobj.c &&
+sed -i "s/getline/tex_getline/g"  texk/ttf2pk/parse.c &&
+sed -i '/^[^#]*\.p:/ {n; a \
+       sed -i "s/getline/tex_getline/g" $@
+}' texk/web2c/omegadir/omega.mk &&
+rm -rf utils/{dialog,gzip,lzma,ps2eps,psutils,t1utils,texinfo,pdfopen} &&
+rm -rf 
libs/{xpdf,freetype2,lua51,libpng,jpeg,expat,gd,luafilesystem,luafontforge,luamd5,luapeg,luazip,luazlib,ncurses,t1lib,unzip}
diff --git a/latex/texlive/rename_getline.patch 
b/latex/texlive/rename_getline.patch
new file mode 100644
index 0000000..fb7cd9b
--- /dev/null
+++ b/latex/texlive/rename_getline.patch
@@ -0,0 +1,45 @@
+--- texk/web2c/tangleboot.p.orig       2009-08-06 13:53:53.000000000 +0200
++++ texk/web2c/tangleboot.p    2009-08-06 13:54:25.000000000 +0200
+@@ -577,7 +577,7 @@
+ if not inputln(webfile)then begin begin writeln(stdout);
+ write(stdout,'! WEB file ended during a change');error;end;
+ inputhasended:=true;goto 10;end;if linesdontmatch then n:=n+1;end;
+-10:end;{:132}{135:}procedure getline;label 20;
++10:end;{:132}{135:}procedure tex_getline;label 20;
+ begin 20:if changing then{137:}begin line:=line+1;
+ if not inputln(changefile)then begin begin writeln(stdout);
+ write(stdout,'! Change file ended without @z');error;end;buffer[0]:=64;
+@@ -604,13 +604,13 @@
+ 60:controlcode:=135;61:controlcode:=2;92:controlcode:=3;
+ others:controlcode:=0 end;end;{:139}{140:}function skipahead:eightbits;
+ label 30;var c:eightbits;
+-begin while true do begin if loc>limit then begin getline;
++begin while true do begin if loc>limit then begin tex_getline;
+ if inputhasended then begin c:=136;goto 30;end;end;buffer[limit+1]:=64;
+ while buffer[loc]<>64 do loc:=loc+1;if loc<=limit then begin loc:=loc+2;
+ c:=controlcode(buffer[loc-1]);if(c<>0)or(buffer[loc-1]=62)then goto 30;
+ end;end;30:skipahead:=c;end;{:140}{141:}procedure skipcomment;label 10;
+ var bal:eightbits;c:ASCIIcode;begin bal:=0;
+-while true do begin if loc>limit then begin getline;
++while true do begin if loc>limit then begin tex_getline;
+ if inputhasended then begin begin writeln(stdout);
+ write(stdout,'! Input ended in mid-comment');error;end;goto 10;end;end;
+ c:=buffer[loc];loc:=loc+1;{142:}if c=64 then begin c:=buffer[loc];
+@@ -622,7 +622,7 @@
+ then bal:=bal+1 else if c=125 then begin if bal=0 then goto 10;
+ bal:=bal-1;end{:142};end;10:end;{:141}{145:}function getnext:eightbits;
+ label 20,30,31;var c:eightbits;d:eightbits;j,k:0..longestname;
+-begin 20:if loc>limit then begin getline;
++begin 20:if loc>limit then begin tex_getline;
+ if inputhasended then begin c:=136;goto 31;end;end;c:=buffer[loc];
+ loc:=loc+1;
+ if scanninghex then{146:}if((c>=48)and(c<=57))or((c>=65)and(c<=70))then
+@@ -647,7 +647,7 @@
+ 64:{150:}begin c:=controlcode(buffer[loc]);loc:=loc+1;
+ if c=0 then goto 20 else if c=13 then scanninghex:=true else if c=135
+ then{151:}begin{153:}k:=0;
+-while true do begin if loc>limit then begin getline;
++while true do begin if loc>limit then begin tex_getline;
+ if inputhasended then begin begin writeln(stdout);
+ write(stdout,'! Input ended in section name');error;end;goto 30;end;end;
+ d:=buffer[loc];{154:}if d=64 then begin d:=buffer[loc+1];