--- deliantra/Deliantra-Client/util/gatherer	2011/12/30 06:52:07	1.4
+++ deliantra/Deliantra-Client/util/gatherer	2011/12/30 10:59:00	1.5
@@ -78,12 +78,16 @@
 #   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
+         cd /root/src/$mod || exit
          cvs update -AdP
+         rm -rf blib
+         set -x
          $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
@@ -258,10 +262,6 @@
       $PERL -MWin32::Exe -e '$e = new Win32::Exe"perl.exe"; $e->set_subsystem_windows; $e->write'
 
    else
-      # patch braindamaged pango
-      perl -pe 's{/u(?=sr/lib(32)?/pango)}{/\x00}g; s{\Q'$PANGO'\E\x00}{y.t.u\x00}g' <$SYSLIB/libpango-1.0.$LIB0 >libpango-1.0.$LIB0
-      chmod 755 libpango-1.0.$LIB0
-
       for lib in mikmod vorbisfile; do
          cp -p $SYSLIB/lib$lib.$LIB0 .
          chmod 755 lib$lib.$LIB0
@@ -279,9 +279,16 @@
       X11 Xext Xau Xdmcp ICE SM Xrandr Xrender Xxf86vm drm GL \
       z
    do
-      rm -f lib"$lib".$SO0
+      rm -f lib"$lib".$LIB0
    done
 
+   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"
+      chmod 755 "$1"
+   fi
+
    if [ "$OS" = darwin ]; then
       # "dll hell" is most severe on os x, because apple
       # does not generally give a shit for backwards compatibility,