--- deliantra/Deliantra-Client/makebin.linux	2007/06/24 03:46:46	1.2
+++ deliantra/Deliantra-Client/makebin.linux	2007/09/02 09:48:41	1.5
@@ -4,17 +4,26 @@
 
 PERL=/usr
 PERLLIB=/usr/lib/perl5/
+PANGO=1.5.0
+#PERL=/opt/perl
+#PERLLIB=/opt/perl/lib/perl5/
+#PANGO=1.6.0
+
+(cd /root/src/JSON-XS  ; $PERL/bin/perl Makefile.PL; make install; make clean) &
+(cd /root/src/Crossfire; $PERL/bin/perl Makefile.PL; make install; make clean) &
 
 (
    # patch braindamaged pango
-   perl -pe 's{/u(?=sr/lib(32)?/pango)}{/\x00}g; s{1\.5\.0\x00}{\x00.5.0\x00}g' </usr/lib/libpango-1.0.so.0 >pango-1.0.so.0
+   perl -pe 's{/u(?=sr/lib(32)?/pango)}{/\x00}g; s{\Q'$PANGO'\E\x00}{y.t.u\x00}g' </usr/lib/libpango-1.0.so.0 >pango-1.0.so.0
+   printf "%s" "$PANGO" >pangoversion
    cat <<EOF
+pangoversion;root/pangoversion
 pango-1.0.so.0;shlib/i486-linux-gnu-thread-multi/libpango-1.0.so.0
 /usr/lib/libglib-2.0.so.0;shlib/i486-linux-gnu-thread-multi/libglib-2.0.so.0
 /usr/lib/libstdc++.so.6;shlib/i486-linux-gnu-thread-multi/libstdc++.so.6
 /usr/lib/libaudio.so.2;shlib/i486-linux-gnu-thread-multi/libaudio.so.2
 /lib/libgcc_s.so.1;shlib/i486-linux-gnu-thread-multi/libgcc_s.so.1
-/usr/lib/pango/1.5.0;root/usr/lib/pango/1.5.0
+/usr/lib/pango/$PANGO;root/usr/lib/pango/$PANGO
 docwiki.pst;root/CFPlus/resources/docwiki.pst
 EOF
 
@@ -22,11 +31,13 @@
 
 ) >addlist
 
-trap "rm addlist; rm pango-1.0.so.0" 0
+trap "rm addlist pangoversion pango-1.0.so.0" 0
 
-perl Makefile.PL
+$PERL/bin/perl Makefile.PL
 make install
 
+wait
+
 LD_LIBRARY_PATH=/lib:/usr/lib \
 $PERL/bin/pp -C -I /root/src/Crossfire \
 	-M Event::idle -M Event::io -M Event::timer -M Event::signal -M Event::var \
@@ -34,7 +45,7 @@
         -l db-4.4 \
         -l glib-2.0 -l gobject-2.0 -l gmodule-2.0 \
         -l pangoft2-1.0 \
-        -l SDL -l asound -l cucul -l caca -l ncursesw \
+        -l SDL -l asound \
         -l SDL_mixer -l vorbisfile -l vorbis -l ogg -l smpeg -l stdc++ \
         -l SDL_image -l png12 -l z \
         -o cfplus-gnu-linux-x86.bin -A addlist bin/cfplus