--- deliantra/Deliantra-Client/util/gatherer	2011/12/30 23:43:25	1.6
+++ deliantra/Deliantra-Client/util/gatherer	2012/01/04 11:41:25	1.10
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# this gem of a hack gathers all fiels required by the client for the platform
+# this gem of a hack gathers all files required by the client for the platform
 # by deep magic, it works on osx, linux and windows. on MY osx, linux
 # and windows, that is.
 
@@ -19,7 +19,7 @@
    . ~/.setenv
 
    OS=windows
-   URLADER=windowx-x86
+   URLADER=windows-x86
    unset PANGO
    PERL=/c/perl/bin/perl
    MAKE=nmake
@@ -73,29 +73,6 @@
 export EV_INOTIFY=0
 export EV_SIGNALFD=0
 
-if true; then
-   for mod in deliantra/Deliantra deliantra/Deliantra-Client; do
-#   for mod in common-sense AnyEvent EV JSON-XS deliantra/Deliantra Compress-LZF BDB Guard deliantra/Deliantra-Client; do
-#   for mod in CFPlus; do
-      (
-         cd /root/src/$mod || exit
-         cvs update -AdP
-         rm -rf blib
-         $PERL Makefile.PL </dev/null >/dev/null
-         $MAKE clean >/dev/null
-         $PERL Makefile.PL </dev/null >/dev/null
-         if ! $MAKE install >log 2>&1; then
-            echo
-            echo error while building $mod
-            cat log
-            exit
-         fi
-         rm -f log
-         $MAKE clean >/dev/null
-      ) || exit
-   done
-fi
-
 cat <<EOF >"$DIST"/pango.rc
 [Pango]
 ModuleFiles = pango.modules
@@ -107,7 +84,7 @@
       base=$(basename "$lib")
       [ "$base" = pango-basic-x.$LIBEXT ] && continue
       cp -p "$lib" "$DIST"/.
-      echo "$base $rest" >&5
+      echo "./$base $rest" >&5 # using ./ seems to help pango not to rummage around in /usr/lib etc.
    done
 )
 
@@ -283,8 +260,14 @@
 
    if [ "$OS" != windows ]; then
       # patch braindamaged pango
-      set libpango-1.0.$LIB0
-      perl -pe 's{/u(?=sr/lib(32)?/pango)}{/\x00}g; s{\Q'$PANGO'\E\x00}{y.t.u\x00}g' <"$1" >"$1~" && mv "$1~" "$1"
+
+      if [ "$OS" != darwin ]; then
+         set libpango-1.0.$LIB0
+         perl -pe 's{/u(?=sr/lib(32)?/pango)}{.\x00}g;' <"$1" >"$1~" && mv "$1~" "$1"
+      else
+         set lib*pango-1.0.0.dylib
+         perl -pe 's{/o(?=pt/local/.../pango)}{.\x00}g;' <"$1" >"$1~" && mv "$1~" "$1"
+      fi
       chmod 755 "$1"
    fi
 
@@ -328,8 +311,10 @@
       done
    fi
 
-   [ "$OS" = linux ] && chrpath -d perl # debian perls have an rpath. really.
+   [ "$OS" = linux ] && chrpath -d perl $(find pm -name "*.so") # debian perls have an rpath, many modules too
    $STRIP $(find . -name "*.$SO" -o -name "*.$LIBEXT" -o -name "*.$LIB0") perl
+
+   : >timidity.cfg
 )
 
 cat >"$DIST".vars <<EOF
@@ -337,6 +322,6 @@
 G_OS="$OS"
 G_ARCHNAME="$ARCHNAME"
 G_ENVVARS="$GENPACK_ENVVARS"
-G_ARGS="./perl run"
+G_COMMAND="./perl run"
 EOF