diff --git a/build/Xft-build.sh b/build/Xft-build.sh
deleted file mode 100755
index b273b352a9a2..000000000000
--- a/build/Xft-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=$freetype/bin:$fontconfig/bin:/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd fcpackage*/Xft || exit 1
-./configure --prefix=$top --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf fcpackage* || exit 1
diff --git a/build/atk-build.sh b/build/atk-build.sh
deleted file mode 100755
index 632dbe12fbc4..000000000000
--- a/build/atk-build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib
-
-top=`pwd` || exit 1
-tar xvfj $src || exit 1
-cd atk-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf atk-* || exit 1
diff --git a/build/db4-build.sh b/build/db4-build.sh
deleted file mode 100755
index 14793f93b885..000000000000
--- a/build/db4-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd db-*/build_unix || exit 1
-../dist/configure --prefix=$top --enable-cxx --enable-compat185 || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf db-* || exit 1
diff --git a/build/fontconfig-build.sh b/build/fontconfig-build.sh
deleted file mode 100755
index 28b05fb1423e..000000000000
--- a/build/fontconfig-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=$freetype/bin:/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd fcpackage*/fontconfig || exit 1
-./configure --prefix=$top --with-confdir=$top/etc/fonts --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf fcpackage* || exit 1
diff --git a/build/freetype-build.sh b/build/freetype-build.sh
deleted file mode 100755
index 7df6083c4dc0..000000000000
--- a/build/freetype-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfj $src || exit 1
-cd freetype-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf freetype-* || exit 1
diff --git a/build/glib-build.sh b/build/glib-build.sh
deleted file mode 100755
index 92736f7015eb..000000000000
--- a/build/glib-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-
-top=`pwd`
-tar xvfj $src
-cd glib-*
-./configure --prefix=$top
-make
-make install
-cd ..
-rm -rf glib-*
diff --git a/build/gnet-build.sh b/build/gnet-build.sh
deleted file mode 100755
index 72141c2687ae..000000000000
--- a/build/gnet-build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd gnet-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf gnet-* || exit 1
diff --git a/build/gtk+-build.sh b/build/gtk+-build.sh
deleted file mode 100755
index 9a668e284caa..000000000000
--- a/build/gtk+-build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:$freetype/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$fontconfig/lib/pkgconfig:$Xft/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$fontconfig/lib:$Xft/lib
-
-top=`pwd`
-tar xvfj $src || exit 1
-cd gtk+-* || exit 1
-./configure --prefix=$top --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf gtk+-* || exit 1
diff --git a/build/gtkspell-build.sh b/build/gtkspell-build.sh
deleted file mode 100755
index 094db3c5bcd7..000000000000
--- a/build/gtkspell-build.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$pspell/lib:$fontconfig/lib:$Xft/lib:$freetype/lib:
-export C_INCLUDE_PATH=$pspell/include
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd gtkspell-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf gtkspell-* || exit 1
diff --git a/build/httpd-build.sh b/build/httpd-build.sh
deleted file mode 100755
index 6182d79a2f65..000000000000
--- a/build/httpd-build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-export LD_LIBRARY_PATH=$ssl/lib:
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd httpd-* || exit 1
-./configure --prefix=$top --enable-ssl --with-ssl=$ssl --with-berkeley-db=$db4 --enable-mods-shared=all || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf httpd-* || exit 1
diff --git a/build/libxml2-build.sh b/build/libxml2-build.sh
deleted file mode 100755
index b511080905f8..000000000000
--- a/build/libxml2-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd libxml2-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd .. || exit 1
-rm -rf libxml2-* || exit 1
diff --git a/build/openssl-build.sh b/build/openssl-build.sh
deleted file mode 100755
index 8ccef5657e54..000000000000
--- a/build/openssl-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd openssl-* || exit 1
-./config --prefix=$top shared || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf openssl-* || exit 1
diff --git a/build/pan-build-2.sh b/build/pan-build-2.sh
deleted file mode 100755
index fd74c9f95230..000000000000
--- a/build/pan-build-2.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:$gnet/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig:$gtkspell/lib/pkgconfig:$libxml/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib:$pspell/lib:$gtkspell/lib:$fontconfig/lib:$Xft/lib:$freetype/lib
-
-# A bug in gtkspell: the pspell library path is not exported
-# through pkgconfig.
-export LIBRARY_PATH=$pspell/lib
-
-export LDFLAGS=-s
-
-top=`pwd`
-tar xvfj $src || exit 1
-cd pan-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf pan-* || exit 1
diff --git a/build/pan-build.sh b/build/pan-build.sh
deleted file mode 100755
index 907215f37fa0..000000000000
--- a/build/pan-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:$gnet/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib
-
-top=`pwd`
-tar xvfj $src
-cd pan-*
-./configure --prefix=$top
-make
-make install
diff --git a/build/pan-run.sh b/build/pan-run.sh
deleted file mode 100755
index 1d9db5377650..000000000000
--- a/build/pan-run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib:$pspell/lib:$gtkspell/lib
-
-ldd $pan/bin/pan
-
-prog=$1
-shift
-
-$pan/bin/$prog $*
diff --git a/build/pango-build.sh b/build/pango-build.sh
deleted file mode 100755
index 4baf053d1c48..000000000000
--- a/build/pango-build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:$freetype/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$fontconfig/lib/pkgconfig:$Xft/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$fontconfig/lib:$Xft/lib
-
-top=`pwd` || exit 1
-tar xvfj $src || exit 1
-cd pango-* || exit 1
-./configure --prefix=$top --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf pango-* || exit 1
diff --git a/build/pspell-build.sh b/build/pspell-build.sh
deleted file mode 100755
index 862bb25e6159..000000000000
--- a/build/pspell-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd pspell-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf pspell-* || exit 1
diff --git a/build/subversion-build.sh b/build/subversion-build.sh
deleted file mode 100755
index 6c3b7e86b0a4..000000000000
--- a/build/subversion-build.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-
-export PATH=$libxml/bin:/bin:/usr/bin:/usr/local/bin
-export LD_LIBRARY_PATH=$ssl/lib:
-
-export LDFLAGS=-s
-
-top=`pwd`
-
-if test $localServer; then
-    extraflags="--with-berkeley-db=$db4 $extraflags"
-fi
-
-if test $httpsClient; then
-    extraflags="--with-ssl --with-libs=$ssl $extraflags"
-fi
-
-if test $httpServer; then
-    extraflags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $extraflags"
-    extramakeflags="APACHE_LIBEXECDIR=$top/modules $extramakeflags"
-fi
-
-if test $pythonBindings; then
-    extraflags="--with-swig=$swig $extraflags"
-fi
-
-echo "extra flags: $extraflags"
-
-tar xvfz $src || exit 1
-cd subversion-* || exit 1
-./configure --prefix=$top $extraflags || exit 1
-make $extramakeflags || exit 1
-make install $extramakeflags || exit 1
-
-if test $pythonBindings; then
-    make swig-py || exit 1
-    make install-swig-py || exit 1
-fi
-
-cd $top || exit 1
-rm -rf subversion-* || exit 1
diff --git a/build/swig-build.sh b/build/swig-build.sh
deleted file mode 100755
index ba798e904665..000000000000
--- a/build/swig-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin:/usr/local/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd SWIG-* || exit 1
-./configure --prefix=$top || exit 1
-gmake || exit 1
-gmake install || exit 1
-cd $top || exit 1
-rm -rf SWIG-* || exit 1
diff --git a/build/wxPython-build.sh b/build/wxPython-build.sh
deleted file mode 100755
index 9a61ce72663f..000000000000
--- a/build/wxPython-build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$pspell/lib:$fontconfig/lib:$Xft/lib:$freetype/lib
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd wxPythonSrc-* || exit 1
-./configure --prefix=$top --enable-gtk2 --enable-rpath=$top/lib --with-opengl || exit 1
-make || exit 1
-make install || exit 1
-cd wxPython || exit 1
-python setup.py WX_CONFIG=$top/bin/wx-config WXPORT=gtk2 build install --root=$top/python || exit 1
-cd $top || exit 1
-rm -rf wxPythonSrc-* || exit 1
diff --git a/descriptors/Xft-20021121.fix b/descriptors/Xft-20021121.fix
deleted file mode 100644
index 017cb6bec4c6..000000000000
--- a/descriptors/Xft-20021121.fix
+++ /dev/null
@@ -1,11 +0,0 @@
-Descr(
-  [ Bind("pkgId", "Xft-20021121")
-  , Bind("releaseId", "1")
-
-  , Bind("freetype", Fix("./freetype-2.1.4.fix"))
-  , Bind("fontconfig", Fix("./fontconfig-20021121.fix"))
-
-  , Bind("src", Url("2f2852c80924a9b5356c3037a471c1a1", "http://fontconfig.org/release/fcpackage.2_1.tar.gz"))
-  , Bind("build", Local("../build/Xft-build.sh"))
-  ]
-)
diff --git a/descriptors/aterm-2.0.fix b/descriptors/aterm-2.0.fix
deleted file mode 100644
index 2fdf43434f19..000000000000
--- a/descriptors/aterm-2.0.fix
+++ /dev/null
@@ -1,10 +0,0 @@
-Descr(
-  [ Bind("pkgId", "aterm-2.0")
-  , Bind("releaseId", "1")
-
-  , Bind("createGCC", True)
-
-  , Bind("src", Url("853474e4bcf4a85f7d38a0676b36bded", "http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz"))
-  , Bind("build", Local("../build/aterm-build.sh"))
-  ]
-)
diff --git a/descriptors/atk-1.2.0.fix b/descriptors/atk-1.2.0.fix
deleted file mode 100644
index 9f880be11456..000000000000
--- a/descriptors/atk-1.2.0.fix
+++ /dev/null
@@ -1,11 +0,0 @@
-Descr(
-  [ Bind("pkgId", "atk-1.2.0")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-
-  , Bind("src", Url("06a84758129554ae044af8865ecb6f1c", "ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.0.tar.bz2"))
-  , Bind("build", Local("../build/atk-build.sh"))
-  ]
-)
diff --git a/descriptors/db-4.0.14.fix b/descriptors/db-4.0.14.fix
deleted file mode 100644
index 33c4ba93a3b2..000000000000
--- a/descriptors/db-4.0.14.fix
+++ /dev/null
@@ -1,8 +0,0 @@
-Descr(
-  [ Bind("pkgId", "db-4.0.14")
-  , Bind("releaseId", "1")
-
-  , Bind("src", Url("12262c64fcd64b772e7cffad8e4d0ebc", "http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz"))
-  , Bind("build", Local("../build/db4-build.sh"))
-  ]
-)
diff --git a/descriptors/fontconfig-20021121.fix b/descriptors/fontconfig-20021121.fix
deleted file mode 100644
index c718ba7fff02..000000000000
--- a/descriptors/fontconfig-20021121.fix
+++ /dev/null
@@ -1,10 +0,0 @@
-Descr(
-  [ Bind("pkgId", "fontconfig-20021121")
-  , Bind("releaseId", "1")
-
-  , Bind("freetype", Fix("./freetype-2.1.4.fix"))
-
-  , Bind("src", Url("2f2852c80924a9b5356c3037a471c1a1", "http://fontconfig.org/release/fcpackage.2_1.tar.gz"))
-  , Bind("build", Local("../build/fontconfig-build.sh"))
-  ]
-)
diff --git a/descriptors/freetype-2.1.4.fix b/descriptors/freetype-2.1.4.fix
deleted file mode 100644
index 7fc6048003b0..000000000000
--- a/descriptors/freetype-2.1.4.fix
+++ /dev/null
@@ -1,8 +0,0 @@
-Descr(
-  [ Bind("pkgId", "freetype-2.1.4")
-  , Bind("releaseId", "1")
-
-  , Bind("src", Url("1fc0b188f1fe1216776e5855d2da141f", "http://easynews.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.bz2"))
-  , Bind("build", Local("../build/freetype-build.sh"))
-  ]
-)
diff --git a/descriptors/glib-2.2.1.fix b/descriptors/glib-2.2.1.fix
deleted file mode 100644
index 9dc0f4e2927e..000000000000
--- a/descriptors/glib-2.2.1.fix
+++ /dev/null
@@ -1,10 +0,0 @@
-Descr(
-  [ Bind("pkgId", "glib-2.2.1")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-
-  , Bind("src", Url("42406a17819080326e105f8333963b97", "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.1.tar.bz2"))
-  , Bind("build", Local("../build/glib-build.sh"))
-  ]
-)
diff --git a/descriptors/gnet-1.1.8.fix b/descriptors/gnet-1.1.8.fix
deleted file mode 100644
index ef1f1b1da726..000000000000
--- a/descriptors/gnet-1.1.8.fix
+++ /dev/null
@@ -1,11 +0,0 @@
-Descr(
-  [ Bind("pkgId", "gnet-1.1.8")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-
-  , Bind("src", Url("da2b5de278e96a5b907c2e2304bf6542", "http://www.gnetlibrary.org/src/gnet-1.1.8.tar.gz"))
-  , Bind("build", Local("../build/gnet-build.sh"))
-  ]
-)
diff --git a/descriptors/gtk+-2.2.1.fix b/descriptors/gtk+-2.2.1.fix
deleted file mode 100644
index b66b6cff66c1..000000000000
--- a/descriptors/gtk+-2.2.1.fix
+++ /dev/null
@@ -1,16 +0,0 @@
-Descr(
-  [ Bind("pkgId", "gtk+-2.2.1")
-  , Bind("releaseId", "2")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-  , Bind("atk", Fix("./atk-1.2.0.fix"))
-  , Bind("freetype", Fix("./freetype-2.1.4.fix"))
-  , Bind("fontconfig", Fix("./fontconfig-20021121.fix"))
-  , Bind("Xft", Fix("./Xft-20021121.fix"))
-  , Bind("pango", Fix("./pango-1.2.1.fix"))
-
-  , Bind("src", Url("dfd5755fddb26a46c96bfaa813280ac4", "ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.1.tar.bz2"))
-  , Bind("build", Local("../build/gtk+-build.sh"))
-  ]
-)
diff --git a/descriptors/gtkspell-2.0.2.fix b/descriptors/gtkspell-2.0.2.fix
deleted file mode 100644
index dc080f41ceb4..000000000000
--- a/descriptors/gtkspell-2.0.2.fix
+++ /dev/null
@@ -1,18 +0,0 @@
-Descr(
-  [ Bind("pkgId", "gtkspell-2.0.2")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-  , Bind("atk", Fix("./atk-1.2.0.fix"))
-  , Bind("freetype", Fix("./freetype-2.1.4.fix"))
-  , Bind("fontconfig", Fix("./fontconfig-20021121.fix"))
-  , Bind("Xft", Fix("./Xft-20021121.fix"))
-  , Bind("pango", Fix("./pango-1.2.1.fix"))
-  , Bind("gtk", Fix("./gtk+-2.2.1.fix"))
-  , Bind("pspell", Fix("./pspell-.12.2.fix"))
-
-  , Bind("src", Url("385daba9bebfdc7fdbdf524e07deb920", "http://pan.rebelbase.com/download/extras/gtkspell/SOURCES/gtkspell-2.0.2.tar.gz"))
-  , Bind("build", Local("../build/gtkspell-build.sh"))
-  ]
-)
diff --git a/descriptors/httpd-2.0.46.fix b/descriptors/httpd-2.0.46.fix
deleted file mode 100644
index 541ce7e8f351..000000000000
--- a/descriptors/httpd-2.0.46.fix
+++ /dev/null
@@ -1,11 +0,0 @@
-Descr(
-  [ Bind("pkgId", "httpd-2.0.46")
-  , Bind("releaseId", "1")
-
-  , Bind("ssl", Fix("./openssl-0.9.7b.fix"))
-  , Bind("db4", Fix("./db-4.0.14.fix"))
-
-  , Bind("src", Url("ff682f82f0808eb01df60824d959ebe8", "http://apache.cs.uu.nl/dist/httpd/httpd-2.0.46.tar.gz"))
-  , Bind("build", Local("../build/httpd-build.sh"))
-  ]
-)
diff --git a/descriptors/libxml2-2.5.7.fix b/descriptors/libxml2-2.5.7.fix
deleted file mode 100644
index 514482aa782b..000000000000
--- a/descriptors/libxml2-2.5.7.fix
+++ /dev/null
@@ -1,8 +0,0 @@
-Descr(
-  [ Bind("pkgId", "libxml2-2.5.7")
-  , Bind("releaseId", "1")
-
-  , Bind("src", Url("f7ed96959fbddf366af64652804d1b57", "ftp://fr.rpmfind.net/pub/libxml/libxml2-2.5.7.tar.gz"))
-  , Bind("build", Local("../build/libxml2-build.sh"))
-  ]
-)
diff --git a/descriptors/openssl-0.9.7b.fix b/descriptors/openssl-0.9.7b.fix
deleted file mode 100644
index f55d0cca1ef9..000000000000
--- a/descriptors/openssl-0.9.7b.fix
+++ /dev/null
@@ -1,8 +0,0 @@
-Descr(
-  [ Bind("pkgId", "openssl-0.9.7b")
-  , Bind("releaseId", "1")
-
-  , Bind("src", Url("fae4bec090fa78e20f09d76d55b6ccff", "http://www.openssl.org/source/openssl-0.9.7b.tar.gz"))
-  , Bind("build", Local("../build/openssl-build.sh"))
-  ]
-)
diff --git a/descriptors/pan-0.14.0.fix b/descriptors/pan-0.14.0.fix
deleted file mode 100644
index dcdb61862487..000000000000
--- a/descriptors/pan-0.14.0.fix
+++ /dev/null
@@ -1,21 +0,0 @@
-Descr(
-  [ Bind("pkgId", "pan-0.14.0")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("libxml", Fix("./libxml2-2.5.7.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-  , Bind("atk", Fix("./atk-1.2.0.fix"))
-  , Bind("freetype", Fix("./freetype-2.1.4.fix"))
-  , Bind("fontconfig", Fix("./fontconfig-20021121.fix"))
-  , Bind("Xft", Fix("./Xft-20021121.fix"))
-  , Bind("pango", Fix("./pango-1.2.1.fix"))
-  , Bind("gtk", Fix("./gtk+-2.2.1.fix"))
-  , Bind("gnet", Fix("./gnet-1.1.8.fix"))
-  , Bind("pspell", Fix("./pspell-.12.2.fix"))
-  , Bind("gtkspell", Fix("./gtkspell-2.0.2.fix"))
-
-  , Bind("src", Url("b2702adadb84c2e0d52d2bb029c05206", "http://pan.rebelbase.com/download/releases/0.14.0/SOURCE/pan-0.14.0.tar.bz2"))
-  , Bind("build", Local("../build/pan-build-2.sh"))
-  ]
-)
diff --git a/descriptors/pango-1.2.1.fix b/descriptors/pango-1.2.1.fix
deleted file mode 100644
index 6bd4ad973a3b..000000000000
--- a/descriptors/pango-1.2.1.fix
+++ /dev/null
@@ -1,14 +0,0 @@
-Descr(
-  [ Bind("pkgId", "pango-1.2.1")
-  , Bind("releaseId", "2")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-  , Bind("freetype", Fix("./freetype-2.1.4.fix"))
-  , Bind("fontconfig", Fix("./fontconfig-20021121.fix"))
-  , Bind("Xft", Fix("./Xft-20021121.fix"))
-
-  , Bind("src", Url("6b354ef14e75739a92b5b78f4ca3165a", "ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.1.tar.bz2"))
-  , Bind("build", Local("../build/pango-build.sh"))
-  ]
-)
diff --git a/descriptors/pkgconfig-0.15.0.fix b/descriptors/pkgconfig-0.15.0.fix
deleted file mode 100644
index bf895b0f507b..000000000000
--- a/descriptors/pkgconfig-0.15.0.fix
+++ /dev/null
@@ -1,8 +0,0 @@
-Descr(
-  [ Bind("pkgId", "pkgconfig-0.15.0")
-  , Bind("releaseId", "1")
-
-  , Bind("src", Url("a7e4f60a6657dbc434334deb594cc242", "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz"))
-  , Bind("build", Local("../build/pkgconfig-build.sh"))
-  ]
-)
diff --git a/descriptors/pspell-.12.2.fix b/descriptors/pspell-.12.2.fix
deleted file mode 100644
index 945cb62a88e5..000000000000
--- a/descriptors/pspell-.12.2.fix
+++ /dev/null
@@ -1,8 +0,0 @@
-Descr(
-  [ Bind("pkgId", "pspell-.12.2")
-  , Bind("releaseId", "1")
-
-  , Bind("src", Url("cfd3816b2372932a1b71c0ce4e9f881e", "http://unc.dl.sourceforge.net/sourceforge/pspell/pspell-.12.2.tar.gz"))
-  , Bind("build", Local("../build/pspell-build.sh"))
-  ]
-)
diff --git a/descriptors/subversion-0.23.0.fix b/descriptors/subversion-0.23.0.fix
deleted file mode 100644
index 0d3cae102cb1..000000000000
--- a/descriptors/subversion-0.23.0.fix
+++ /dev/null
@@ -1,24 +0,0 @@
-Descr(
-  [ Bind("pkgId", "subversion-0.23.0")
-  , Bind("releaseId", "3")
-
-  , Bind("localServer", Bool(True))
-  , Bind("httpsClient", Bool(True))
-  , Bind("httpServer", Bool(True))
-  , Bind("httpsServer", Bool(True))
-  , Bind("pythonBindings", Bool(True))
-
-  , Bind("libxml", Fix("./libxml2-2.5.7.fix"))
-
-  , Bind("db4", If(Var("localServer"), Fix("./db-4.0.14.fix"), ""))
-
-  , Bind("ssl", If(Var("httpsClient"), Fix("./openssl-0.9.7b.fix"), ""))
-
-  , Bind("httpd", If(Var("httpServer"), Fix("./httpd-2.0.46.fix"), ""))
-
-  , Bind("swig", If(Var("pythonBindings"), Fix("./swig-1.3.19.fix"), ""))
-
-  , Bind("src", Url("59661f2145976437b371a0ab3a555dbd", "http://subversion.tigris.org/files/documents/15/4218/subversion-0.23.0.tar.gz"))
-  , Bind("build", Local("../build/subversion-build.sh"))
-  ]
-)
diff --git a/descriptors/swig-1.3.19.fix b/descriptors/swig-1.3.19.fix
deleted file mode 100644
index dd6f3ec2c5fd..000000000000
--- a/descriptors/swig-1.3.19.fix
+++ /dev/null
@@ -1,8 +0,0 @@
-Descr(
-  [ Bind("pkgId", "swig-1.3.19")
-  , Bind("releaseId", "1")
-
-  , Bind("src", Url("a733455544426b31868dd87fc162e750", "http://heanet.dl.sourceforge.net/sourceforge/swig/swig-1.3.19.tar.gz"))
-  , Bind("build", Local("../build/swig-build.sh"))
-  ]
-)
diff --git a/descriptors/system.fix b/descriptors/system.fix
deleted file mode 100644
index f777d692fe0c..000000000000
--- a/descriptors/system.fix
+++ /dev/null
@@ -1,26 +0,0 @@
-Descr(
-  [ Bind("pkgId", Str("system"))
-  , Bind("releaseId", Str("5"))
-
-  , Bind("actATerm", Fix("./aterm-2.0.fix"))
-  , Bind("actPkgConfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("actLibxml", Fix("./libxml2-2.5.7.fix"))
-  , Bind("actGlib", Fix("./glib-2.2.1.fix"))
-  , Bind("actAtk", Fix("./atk-1.2.0.fix"))
-  , Bind("actFreetype", Fix("./freetype-2.1.4.fix"))
-  , Bind("actFontconfig", Fix("./fontconfig-20021121.fix"))
-  , Bind("actXft", Fix("./Xft-20021121.fix"))
-  , Bind("actPango", Fix("./pango-1.2.1.fix"))
-  , Bind("actGtk", Fix("./gtk+-2.2.1.fix"))
-  , Bind("actGnet", Fix("./gnet-1.1.8.fix"))
-  , Bind("actPspell", Fix("./pspell-.12.2.fix"))
-  , Bind("actGtkspell", Fix("./gtkspell-2.0.2.fix"))
-  , Bind("actPan", Fix("./pan-0.14.0.fix"))
-  , Bind("actSubversion", Fix("./subversion-0.23.0.fix"))
-  , Bind("actDb4", Fix("./db-4.0.14.fix"))
-  , Bind("actHttpd", Fix("./httpd-2.0.46.fix"))
-  , Bind("actSsl", Fix("./openssl-0.9.7b.fix"))
-
-  , Bind("build", Local("../build/populate-linkdirs.pl"))
-  ]
-)
diff --git a/descriptors/wxPython-2.4.0.7.fix b/descriptors/wxPython-2.4.0.7.fix
deleted file mode 100644
index d64c4b39172c..000000000000
--- a/descriptors/wxPython-2.4.0.7.fix
+++ /dev/null
@@ -1,17 +0,0 @@
-Descr(
-  [ Bind("pkgId", "wxPython-2.4.0.7")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-  , Bind("atk", Fix("./atk-1.2.0.fix"))
-  , Bind("freetype", Fix("./freetype-2.1.4.fix"))
-  , Bind("fontconfig", Fix("./fontconfig-20021121.fix"))
-  , Bind("Xft", Fix("./Xft-20021121.fix"))
-  , Bind("pango", Fix("./pango-1.2.1.fix"))
-  , Bind("gtk", Fix("./gtk+-2.2.1.fix"))
-
-  , Bind("src", Url("c7864b56ff1422697a310f91f54c7ed6", "http://heanet.dl.sourceforge.net/sourceforge/wxpython/wxPythonSrc-2.4.0.7.tar.gz"))
-  , Bind("build", Local("../build/wxPython-build.sh"))
-  ]
-)
diff --git a/pkgs/db4/db4-build.sh b/pkgs/db4/db4-build.sh
new file mode 100755
index 000000000000..4298bfa1c594
--- /dev/null
+++ b/pkgs/db4/db4-build.sh
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd db-*/build_unix || exit 1
+LDFLAGS=-Wl,-S ../dist/configure --prefix=$out --enable-cxx --enable-compat185 || exit 1
+make || exit 1
+make install || exit 1
+rm -rf $out/doc || exit 1
diff --git a/pkgs/db4/db4.fix b/pkgs/db4/db4.fix
new file mode 100644
index 000000000000..32a033236159
--- /dev/null
+++ b/pkgs/db4/db4.fix
@@ -0,0 +1,12 @@
+Package(
+  [ ("name", "db-4.0.14")
+  , ("build", Relative("db4/db4-build.sh"))
+
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz")
+      , ("md5", "12262c64fcd64b772e7cffad8e4d0ebc")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  ]
+)
diff --git a/pkgs/httpd/httpd-build.sh b/pkgs/httpd/httpd-build.sh
new file mode 100755
index 000000000000..d226251eb024
--- /dev/null
+++ b/pkgs/httpd/httpd-build.sh
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+envpkgs="$ssl $db4 $expat"
+. $setenv
+
+tar xvfz $src || exit 1
+cd httpd-* || exit 1
+LDFLAGS=-Wl,-S ./configure --prefix=$out --enable-ssl --with-ssl=$ssl --with-berkeley-db=$db4 \
+ --with-expat=$expat --enable-mods-shared=all --without-gdbm || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
+rm -rf $out/manual || exit 1
diff --git a/pkgs/httpd/httpd.fix b/pkgs/httpd/httpd.fix
new file mode 100644
index 000000000000..d13baaeed1e2
--- /dev/null
+++ b/pkgs/httpd/httpd.fix
@@ -0,0 +1,17 @@
+Package(
+  [ ("name", "httpd-2.0.47")
+
+  , ("build", Relative("httpd/httpd-build.sh"))
+  , ("setenv", Relative("helpers/set-env.sh"))
+
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://apache.cs.uu.nl/dist/httpd/httpd-2.0.47.tar.gz")
+      , ("md5", "63f16638c18b140b649fab32b54d7f9c")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("ssl", IncludeFix("openssl/openssl.fix"))
+  , ("db4", IncludeFix("db4/db4.fix"))
+  , ("expat", IncludeFix("expat/expat.fix"))
+  ]
+)
diff --git a/pkgs/subversion/subversion.fix b/pkgs/subversion/subversion.fix
index 5baef8f8a815..f43bce01bfed 100644
--- a/pkgs/subversion/subversion.fix
+++ b/pkgs/subversion/subversion.fix
@@ -9,9 +9,17 @@ Package(
       , ("md5", "700caa3f59b585d173812c4a078feeba")
       ]))
 
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("localServer", "1")
   , ("httpsClient", "1")
+  , ("httpServer", "1")
+  , ("httpsServer", "1")
+  , ("pythonBindings", "1")
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   , ("ssl", IncludeFix("openssl/openssl.fix"))
+  , ("swig", IncludeFix("swig/swig.fix"))
+  , ("httpd", IncludeFix("httpd/httpd.fix"))
+  , ("db4", IncludeFix("db4/db4.fix"))
   , ("libxml", IncludeFix("libxml2/libxml2.fix"))
   ]
 )
diff --git a/pkgs/swig/swig-build.sh b/pkgs/swig/swig-build.sh
new file mode 100755
index 000000000000..151d8760c194
--- /dev/null
+++ b/pkgs/swig/swig-build.sh
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd SWIG-* || exit 1
+LDFLAGS=-Wl,-S ./configure --prefix=$out || exit 1
+gmake || exit 1
+gmake install || exit 1
diff --git a/pkgs/swig/swig.fix b/pkgs/swig/swig.fix
new file mode 100644
index 000000000000..88555c6f29c6
--- /dev/null
+++ b/pkgs/swig/swig.fix
@@ -0,0 +1,12 @@
+Package(
+  [ ("name", "swig-1.3.19")
+  , ("build", Relative("swig/swig-build.sh"))
+
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://heanet.dl.sourceforge.net/sourceforge/swig/swig-1.3.19.tar.gz")
+      , ("md5", "a733455544426b31868dd87fc162e750")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  ]
+)
diff --git a/pkgs/wxPython/wxPython-build.sh b/pkgs/wxPython/wxPython-build.sh
new file mode 100755
index 000000000000..fc626caba500
--- /dev/null
+++ b/pkgs/wxPython/wxPython-build.sh
@@ -0,0 +1,17 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+export PATH=$pkgconfig/bin:$PATH
+envpkgs="$gtk"
+. $setenv || exit 1
+
+tar xvfz $src || exit 1
+cd wxPythonSrc-* || exit 1
+./configure --prefix=$out --enable-gtk2 --enable-rpath=$out/lib --with-opengl || exit 1
+make || exit 1
+make install || exit 1
+cd wxPython || exit 1
+python setup.py WX_CONFIG=$out/bin/wx-config WXPORT=gtk2 build install --root=$out/python || exit 1
+
+echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/wxPython/wxPython.fix b/pkgs/wxPython/wxPython.fix
new file mode 100644
index 000000000000..2ebfc0710988
--- /dev/null
+++ b/pkgs/wxPython/wxPython.fix
@@ -0,0 +1,16 @@
+Package(
+  [ ("name", "wxPython-2.4.1.2")
+
+  , ("build", Relative("wxPython/wxPython-build.sh"))
+  , ("setenv", Relative("helpers/set-env.sh"))
+
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://belnet.dl.sourceforge.net/sourceforge/wxpython/wxPythonSrc-2.4.1.2.tar.gz")
+      , ("md5", "515fa95c5c0497404a858213b6586411")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
+  , ("gtk", IncludeFix("gtk+/gtk+.fix"))
+  ]
+)