diff --git a/common/blfs-tool-deps/901-libxml2 b/common/blfs-tool-deps/901-libxml2
deleted file mode 100644
index 2afcea4..0000000
--- a/common/blfs-tool-deps/901-libxml2
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# $Id$
-
-set -e
-cd $PKGDIR
-./configure --prefix=/usr
-make
-if ! [ -z $PKG_DEST ]; then
-	mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
-	ln -sv share/{man,doc,info} $PKG_DEST/usr
-	case $(uname -m) in
-	 x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
-	esac
-fi
-make DESTDIR=$PKG_DEST install
-if ! [ -z $PKG_DEST ]; then 
-	rm -fv $PKG_DEST/{,usr/}lib64 
-	rm -fv $PKG_DEST/usr/{man,doc,info}
-	for dir in $PKG_DEST/usr/share/{doc,info,man}; do
-	  [[ -z $(ls $dir) ]] && rmdir -v $dir
-	done
-	for dir in $PKG_DEST/usr/{lib,share}; do
-	  [[ -z $(ls $dir) ]] && rmdir -v $dir
-	done
-	for dir in $PKG_DEST/{lib,usr}; do
-	  [[ -z $(ls $dir) ]] && rmdir -v $dir
-	done
-	packInstall
-fi
-rm -rf $PKG_DEST
-
-exit
diff --git a/common/blfs-tool-deps/902-libxslt b/common/blfs-tool-deps/902-libxslt
deleted file mode 100644
index 3cc2984..0000000
--- a/common/blfs-tool-deps/902-libxslt
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# $Id$
-
-set -e
-cd $PKGDIR
-./configure --prefix=/usr
-make
-if ! [ -z $PKG_DEST ]; then
-	mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
-	ln -sv share/{man,doc,info} $PKG_DEST/usr
-	case $(uname -m) in
-	 x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
-	esac
-fi
-make DESTDIR=$PKG_DEST install
-if ! [ -z $PKG_DEST ]; then 
-	rm -fv $PKG_DEST/{,usr/}lib64 
-	rm -fv $PKG_DEST/usr/{man,doc,info}
-        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/usr/{lib,share}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/{lib,usr}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-	packInstall
-fi
-rm -rf $PKG_DEST
-
-exit
diff --git a/common/blfs-tool-deps/903-tidy b/common/blfs-tool-deps/903-tidy
deleted file mode 100644
index fc92682..0000000
--- a/common/blfs-tool-deps/903-tidy
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# $Id$
-
-set -e
-cd $PKGDIR
-
-./configure --prefix=/usr
-make
-if ! [ -z $PKG_DEST ]; then
-	mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
-	ln -sv share/{man,doc,info} $PKG_DEST/usr
-	case $(uname -m) in
-	 x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
-	esac
-fi
-make DESTDIR=$PKG_DEST install
-install -v -m644 -D htmldoc/tidy.1 \
-                    $PKG_DEST/usr/share/man/man1/tidy.1
-install -v -m755 -d $PKG_DEST/usr/share/doc/tidy-cvs_20101110
-install -v -m644    htmldoc/*.{html,gif,css} \
-                    $PKG_DEST/usr/share/doc/tidy-cvs_20101110
-if ! [ -z $PKG_DEST ]; then 
-	rm -fv $PKG_DEST/{,usr/}lib64 
-	rm -fv $PKG_DEST/usr/{man,doc,info}
-        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/usr/{lib,share}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/{lib,usr}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-	packInstall
-fi
-rm -rf $PKG_DEST
-
-exit
diff --git a/common/blfs-tool-deps/904-unzip b/common/blfs-tool-deps/904-unzip
deleted file mode 100644
index e7023fa..0000000
--- a/common/blfs-tool-deps/904-unzip
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# $Id$
-
-set -e
-cd $PKGDIR
-
-case `uname -m` in
-  i?86)
-    sed -i -e 's/DASM"/DASM -DNO_LCHMOD"/' unix/Makefile
-    make -f unix/Makefile linux
-    ;;
-  *)
-    sed -i -e 's/CFLAGS="-O -Wall/& -DNO_LCHMOD/' unix/Makefile
-    make -f unix/Makefile linux_noasm
-    ;;
-esac
-if ! [ -z $PKG_DEST ]; then
-	mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
-	ln -sv share/{man,doc,info} $PKG_DEST/usr
-	case $(uname -m) in
-	 x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
-	esac
-fi
-make prefix=$PKG_DEST/usr install
-if ! [ -z $PKG_DEST ]; then 
-	rm -fv $PKG_DEST/{,usr/}lib64 
-	rm -fv $PKG_DEST/usr/{man,doc,info}
-        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/usr/{lib,share}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/{lib,usr}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-	packInstall
-fi
-rm -rf $PKG_DEST
-
-exit
diff --git a/common/blfs-tool-deps/905-docbook-xml b/common/blfs-tool-deps/905-docbook-xml
deleted file mode 100644
index e5ec787..0000000
--- a/common/blfs-tool-deps/905-docbook-xml
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-
-# $Id$
-
-set -e
-
-cd /sources
-mkdir docbook-xml
-cd docbook-xml
-unzip ../docbook-xml-4.5.zip
-install -v -d -m755 $PKG_DEST/usr/share/xml/docbook/xml-dtd-4.5
-install -v -d -m755 $PKG_DEST/etc/xml
-chown -R root:root .
-cp -v -af docbook.cat *.dtd ent/ *.mod \
-    $PKG_DEST/usr/share/xml/docbook/xml-dtd-4.5
-if [ ! -e $PKG_DEST/etc/xml/docbook ]; then
-    xmlcatalog --noout --create $PKG_DEST/etc/xml/docbook
-fi
-xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.5//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
-    $PKG_DEST/etc/xml/docbook
-xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \
-    $PKG_DEST/etc/xml/docbook
-xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \
-    $PKG_DEST/etc/xml/docbook
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \
-    $PKG_DEST/etc/xml/docbook
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \
-    $PKG_DEST/etc/xml/docbook
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \
-    $PKG_DEST/etc/xml/docbook
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \
-    $PKG_DEST/etc/xml/docbook
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \
-    $PKG_DEST/etc/xml/docbook
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \
-    $PKG_DEST/etc/xml/docbook
-xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.5" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
-    $PKG_DEST/etc/xml/docbook
-xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.5" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
-    $PKG_DEST/etc/xml/docbook
-if [ ! -e $PKG_DEST/etc/xml/catalog ]; then
-    xmlcatalog --noout --create $PKG_DEST/etc/xml/catalog
-fi
-xmlcatalog --noout --add "delegatePublic" \
-    "-//OASIS//ENTITIES DocBook XML" \
-    "file:///etc/xml/docbook" \
-    $PKG_DEST/etc/xml/catalog
-xmlcatalog --noout --add "delegatePublic" \
-    "-//OASIS//DTD DocBook XML" \
-    "file:///etc/xml/docbook" \
-    $PKG_DEST/etc/xml/catalog
-xmlcatalog --noout --add "delegateSystem" \
-    "http://www.oasis-open.org/docbook/" \
-    "file:///etc/xml/docbook" \
-    $PKG_DEST/etc/xml/catalog
-xmlcatalog --noout --add "delegateURI" \
-    "http://www.oasis-open.org/docbook/" \
-    "file:///etc/xml/docbook" \
-    $PKG_DEST/etc/xml/catalog
-for DTDVERSION in 4.1.2 4.2 4.3 4.4
-do
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V$DTDVERSION//EN" \
-    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/docbookx.dtd" \
-    $PKG_DEST/etc/xml/docbook
-  xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
-    $PKG_DEST/etc/xml/docbook
-  xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
-    $PKG_DEST/etc/xml/docbook
-  xmlcatalog --noout --add "delegateSystem" \
-    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \
-    "file:///etc/xml/docbook" \
-    $PKG_DEST/etc/xml/catalog
-  xmlcatalog --noout --add "delegateURI" \
-    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \
-    "file:///etc/xml/docbook" \
-    $PKG_DEST/etc/xml/catalog
-done
-if ! [ -z "$PKG_DEST" ]; then
-  export PKGDIR=/sources/docbook-xml
-  packInstall
-fi
-rm -rf $PKG_DEST
-cd ..
-rm -rf docbook-xml
-
-exit
diff --git a/common/blfs-tool-deps/906-docbook-xsl b/common/blfs-tool-deps/906-docbook-xsl
deleted file mode 100644
index 7610d77..0000000
--- a/common/blfs-tool-deps/906-docbook-xsl
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# $Id$
-
-set -e
-cd $PKGDIR
-
-install -v -m755 -d /usr/share/xml/docbook/xsl-stylesheets-1.69.1
-cp -v -R VERSION common eclipse extensions fo html \
-         htmlhelp images javahelp lib manpages params \
-         profiling slides template website xhtml \
-    /usr/share/xml/docbook/xsl-stylesheets-1.69.1
-
-if [ ! -d /etc/xml ]; then install -v -m755 -d /etc/xml; fi
-if [ ! -f /etc/xml/catalog ]; then
-    xmlcatalog --noout --create /etc/xml/catalog
-fi
-
-xmlcatalog --noout --add "rewriteSystem" \
-           "http://docbook.sourceforge.net/release/xsl/1.69.1" \
-           "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \
-    /etc/xml/catalog
-
-xmlcatalog --noout --add "rewriteURI" \
-           "http://docbook.sourceforge.net/release/xsl/1.69.1" \
-           "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \
-    /etc/xml/catalog
-
-xmlcatalog --noout --add "rewriteSystem" \
-           "http://docbook.sourceforge.net/release/xsl/current" \
-           "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \
-    /etc/xml/catalog
-
-xmlcatalog --noout --add "rewriteURI" \
-           "http://docbook.sourceforge.net/release/xsl/current" \
-           "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \
-    /etc/xml/catalog
-
-exit
diff --git a/common/blfs-tool-deps/907-gpm b/common/blfs-tool-deps/907-gpm
deleted file mode 100644
index 08b4471..0000000
--- a/common/blfs-tool-deps/907-gpm
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# $Id$
-
-set -e
-cd $PKGDIR
-
-./configure --prefix=/usr --sysconfdir=/etc
-make
-if ! [ -z $PKG_DEST ]; then
-	mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
-	ln -sv share/{man,doc,info} $PKG_DEST/usr
-	case $(uname -m) in
-	 x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
-	esac
-fi
-make DESTDIR=$PKG_DEST install
-ln -v -s libgpm.so.2.1.0 $PKG_DEST/usr/lib/libgpm.so
-mkdir -pv $PKG_DEST/etc
-install -v -m644 conf/gpm-root.conf $PKG_DEST/etc
-install -v -m755 -d $PKG_DEST/usr/share/doc/gpm-1.20.6
-chmod   -v   755    doc/{changes,support}
-chmod   -v   644    doc/{changes/*,support/*,FAQ,HACK_GPM,README*}
-cp      -v -R       doc/{FAQ,HACK_GPM,README*,changes,support} \
-                    $PKG_DEST/usr/share/doc/gpm-1.20.6
-if ! [ -z $PKG_DEST ]; then 
-	rm -fv $PKG_DEST/{,usr/}lib64 
-	rm -fv $PKG_DEST/usr/{man,doc,info}
-        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/usr/{lib,share}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/{lib,usr}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-	packInstall
-fi
-rm -rf $PKG_DEST
-
-exit
diff --git a/common/blfs-tool-deps/908-lynx b/common/blfs-tool-deps/908-lynx
deleted file mode 100644
index 58215ea..0000000
--- a/common/blfs-tool-deps/908-lynx
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# $Id$
-
-set -e
-cd $PKGDIR
-
-./configure --prefix=/usr \
-            --sysconfdir=/etc/lynx \
-            --datadir=/usr/share/doc/lynx-2.8.8dev.10 \
-            --with-zlib \
-            --with-bzlib \
-            --with-screen=ncursesw \
-            --enable-locale-charset
-make
-if ! [ -z $PKG_DEST ]; then
-	mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
-	ln -sv share/{man,doc,info} $PKG_DEST/usr
-	case $(uname -m) in
-	 x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
-	esac
-fi
-make DESTDIR=$PKG_DEST install-full
-chgrp -v -R root $PKG_DEST/usr/share/doc/lynx-2.8.8dev.10/lynx_doc
-if ! [ -z $PKG_DEST ]; then 
-	rm -fv $PKG_DEST/{,usr/}lib64 
-	rm -fv $PKG_DEST/usr/{man,doc,info}
-        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/usr/{lib,share}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/{lib,usr}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-	packInstall
-fi
-rm -rf $PKG_DEST
-
-exit
diff --git a/common/blfs-tool-deps/909-sudo b/common/blfs-tool-deps/909-sudo
deleted file mode 100644
index 76129b6..0000000
--- a/common/blfs-tool-deps/909-sudo
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# $Id$
-
-set -e
-cd $PKGDIR
-
-./configure --prefix=/usr \
-            --libexecdir=/usr/lib \
-            --with-ignore-dot \
-            --with-all-insults \
-            --enable-shell-sets-home \
-            --disable-root-sudo \
-            --with-logfac=auth \
-            --without-pam \
-            --without-sendmail
-make
-if ! [ -z $PKG_DEST ]; then
-	mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
-	ln -sv share/{man,doc,info} $PKG_DEST/usr
-	case $(uname -m) in
-	 x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
-	esac
-fi
-make DESTDIR=$PKG_DEST install
-if ! [ -z $PKG_DEST ]; then 
-	rm -fv $PKG_DEST/{,usr/}lib64 
-	rm -fv $PKG_DEST/usr/{man,doc,info}
-        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/usr/{lib,share}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/{lib,usr}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-	packInstall
-fi
-rm -rf $PKG_DEST
-
-exit
diff --git a/common/blfs-tool-deps/910-wget b/common/blfs-tool-deps/910-wget
deleted file mode 100644
index d123816..0000000
--- a/common/blfs-tool-deps/910-wget
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# $Id$
-
-set -e
-cd $PKGDIR
-
-./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --without-ssl
-make
-if ! [ -z $PKG_DEST ]; then
-	mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
-	ln -sv share/{man,doc,info} $PKG_DEST/usr
-	case $(uname -m) in
-	 x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
-	esac
-fi
-make DESTDIR=$PKG_DEST install
-if ! [ -z $PKG_DEST ]; then 
-	rm -fv $PKG_DEST/{,usr/}lib64 
-	rm -fv $PKG_DEST/usr/{man,doc,info}
-        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/usr/{lib,share}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/{lib,usr}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-	packInstall
-fi
-rm -rf $PKG_DEST
-
-exit
diff --git a/common/blfs-tool-deps/911-sqlite b/common/blfs-tool-deps/911-sqlite
deleted file mode 100644
index 7bcbcb9..0000000
--- a/common/blfs-tool-deps/911-sqlite
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# $Id$
-
-set -e
-cd $PKGDIR
-
-./configure --prefix=/usr --disable-static \
-CFLAGS="-g -O2 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1" &&
-make
-if ! [ -z $PKG_DEST ]; then
-	mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
-	ln -sv share/{man,doc,info} $PKG_DEST/usr
-	case $(uname -m) in
-	 x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
-	esac
-fi
-make DESTDIR=$PKG_DEST install
-if ! [ -z $PKG_DEST ]; then 
-	rm -fv $PKG_DEST/{,usr/}lib64 
-	rm -fv $PKG_DEST/usr/{man,doc,info}
-        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/usr/{lib,share}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/{lib,usr}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-	packInstall
-fi
-rm -rf $PKG_DEST
-
-exit
diff --git a/common/blfs-tool-deps/912-apr b/common/blfs-tool-deps/912-apr
deleted file mode 100644
index ff8e479..0000000
--- a/common/blfs-tool-deps/912-apr
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# $Id$
-
-set -e
-cd $PKGDIR
-
-patch -Np1 -i ../apr-1.4.5-config.patch
-./configure
-make
-if ! [ -z $PKG_DEST ]; then
-	mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
-	ln -sv share/{man,doc,info} $PKG_DEST/usr
-	case $(uname -m) in
-	 x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
-	esac
-fi
-make DESTDIR=$PKG_DEST install
-if ! [ -z $PKG_DEST ]; then 
-	rm -fv $PKG_DEST/{,usr/}lib64 
-	rm -fv $PKG_DEST/usr/{man,doc,info}
-        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/usr/{lib,share}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/{lib,usr}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-	packInstall
-fi
-rm -rf $PKG_DEST
-
-exit
diff --git a/common/blfs-tool-deps/913-apr-util b/common/blfs-tool-deps/913-apr-util
deleted file mode 100644
index 78f4d1e..0000000
--- a/common/blfs-tool-deps/913-apr-util
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# $Id$
-
-set -e
-cd $PKGDIR
-
-patch -Np1 -i ../apr-util-1.4.1-config.patch
-./configure --with-apr=/usr/bin/apr-1-config
-make
-if ! [ -z $PKG_DEST ]; then
-	mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
-	ln -sv share/{man,doc,info} $PKG_DEST/usr
-	case $(uname -m) in
-	 x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
-	esac
-fi
-make DESTDIR=$PKG_DEST install
-if ! [ -z $PKG_DEST ]; then 
-	rm -fv $PKG_DEST/{,usr/}lib64 
-	rm -fv $PKG_DEST/usr/{man,doc,info}
-        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/usr/{lib,share}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/{lib,usr}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-	packInstall
-fi
-rm -rf $PKG_DEST
-
-exit
diff --git a/common/blfs-tool-deps/914-subversion b/common/blfs-tool-deps/914-subversion
deleted file mode 100644
index e5b9092..0000000
--- a/common/blfs-tool-deps/914-subversion
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# $Id$
-
-set -e
-cd $PKGDIR
-
-./configure --prefix=/usr
-make
-if ! [ -z $PKG_DEST ]; then
-	mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
-	ln -sv share/{man,doc,info} $PKG_DEST/usr
-	case $(uname -m) in
-	 x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
-	esac
-fi
-make DESTDIR=$PKG_DEST install
-install -v -m755 -d $PKG_DEST/usr/share/doc/subversion-1.7.1
-cp -v -R doc/* $PKG_DEST/usr/share/doc/subversion-1.7.1
-if ! [ -z $PKG_DEST ]; then 
-	rm -fv $PKG_DEST/{,usr/}lib64 
-	rm -fv $PKG_DEST/usr/{man,doc,info}
-        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/usr/{lib,share}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-        for dir in $PKG_DEST/{lib,usr}; do
-          [[ -z $(ls $dir) ]] && rmdir -v $dir
-        done
-	packInstall
-fi
-rm -rf $PKG_DEST
-
-exit
diff --git a/common/blfs-tool-deps/apr-1.4.5-config.patch b/common/blfs-tool-deps/apr-1.4.5-config.patch
deleted file mode 100644
index 7668171..0000000
--- a/common/blfs-tool-deps/apr-1.4.5-config.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Submitted By:            Pierre Labastie
-Date:                    2011-12-27
-Initial Package Version: 1.4.5 (taken from BLFS patch for httpd-2.2.0)
-Upstream Status:         Not submitted (jhalfs specific)
-Origin:                  jhalfs
-Description:             Modify the layout for installing Apache Portable Runtime
-
-diff -Naur apr-1.4.5-orig/config.layout apr-1.4.5/config.layout
---- apr-1.4.5-orig/config.layout	2004-11-24 22:51:51.000000000 +0000
-+++ apr-1.4.5/config.layout		2005-12-14 21:06:37.000000000 +0000
-@@ -11,18 +11,18 @@
- 
- #   Classical APR path layout designed for parallel installs.
- <Layout apr>
--    prefix:        /usr/local/apr
-+    prefix:        /usr
-     exec_prefix:   ${prefix}
-     bindir:        ${exec_prefix}/bin
--    sbindir:       ${exec_prefix}/bin
-+    sbindir:       ${exec_prefix}/sbin
-     libdir:        ${exec_prefix}/lib
--    libexecdir:    ${exec_prefix}/modules
--    mandir:        ${prefix}/man
--    sysconfdir:    ${prefix}/conf
--    datadir:       ${prefix}
--    installbuilddir: ${datadir}/build-${APR_MAJOR_VERSION}
--    includedir:    ${prefix}/include/apr-${APR_MAJOR_VERSION}
--    localstatedir: ${prefix}
-+    libexecdir:    ${exec_prefix}/lib/apache
-+    mandir:        ${prefix}/share/man
-+    sysconfdir:    /etc/apache
-+    datadir:       /srv/www
-+    installbuilddir: ${libexecdir}/build
-+    includedir:    ${prefix}/include/apache
-+    localstatedir: ${datadir}
-     libsuffix:     -${APR_MAJOR_VERSION}
- </Layout>
diff --git a/common/blfs-tool-deps/apr-util-1.4.1-config.patch b/common/blfs-tool-deps/apr-util-1.4.1-config.patch
deleted file mode 100644
index 7100932..0000000
--- a/common/blfs-tool-deps/apr-util-1.4.1-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur apr-util-1.4.1.orig/config.layout apr-util-1.4.1/config.layout
---- apr-util-1.4.1.orig/config.layout	2005-02-09 13:18:43.000000000 +0100
-+++ apr-util-1.4.1/config.layout	2011-12-27 19:29:41.667841632 +0100
-@@ -11,18 +11,18 @@
- 
- #   Classical APR-util path layout designed for parallel installs.
- <Layout apr-util>
--    prefix:        /usr/local/apr
-+    prefix:        /usr
-     exec_prefix:   ${prefix}
-     bindir:        ${exec_prefix}/bin
--    sbindir:       ${exec_prefix}/bin
-+    sbindir:       ${exec_prefix}/sbin
-     libdir:        ${exec_prefix}/lib
--    libexecdir:    ${exec_prefix}/modules
--    mandir:        ${prefix}/man
--    sysconfdir:    ${prefix}/conf
--    datadir:       ${prefix}
--    installbuilddir: ${datadir}/build
--    includedir:    ${prefix}/include/apr-${APRUTIL_MAJOR_VERSION}
--    localstatedir: ${prefix}
-+    libexecdir:    ${exec_prefix}/lib/apache
-+    mandir:        ${prefix}/share/man
-+    sysconfdir:    /etc/apache
-+    datadir:       /srv/www
-+    installbuilddir: ${libexecdir}/build
-+    includedir:    ${prefix}/include/apache
-+    localstatedir: ${datadir}
-     libsuffix:     -${APRUTIL_MAJOR_VERSION}
- </Layout>
-