diff --git a/app-doc/doxygen/doxygen-1.6.1.recipe b/app-doc/doxygen/doxygen-1.6.1.recipe
deleted file mode 100644
index 94f3c58ae..000000000
--- a/app-doc/doxygen/doxygen-1.6.1.recipe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Objective-C, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D." 
-HOMEPAGE="http://www.doxygen.org" 
-SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.1.src.tar.gz"
-CHECKSUM_MD5="2ec343643e134f0d3ce2069420bcb4f0"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd doxygen-1.6.1
-	./configure --prefix /boot/common
-	make
-}
-
-INSTALL()
-{
-	cd doxygen-1.6.1
-	make install
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="1997-2010 Dimitri van Heesch"
diff --git a/app-doc/doxygen/doxygen-1.6.2.recipe b/app-doc/doxygen/doxygen-1.6.2.recipe
deleted file mode 100644
index 88d2e032d..000000000
--- a/app-doc/doxygen/doxygen-1.6.2.recipe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Objective-C, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D." 
-HOMEPAGE="http://www.doxygen.org" 
-SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.2.src.tar.gz"
-CHECKSUM_MD5="70260101ef60952cb99484700241c99e"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd doxygen-1.6.2
-	./configure --prefix /boot/common
-	make
-}
-
-INSTALL()
-{
-	cd doxygen-1.6.2
-	make install
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="1997-2010 Dimitri van Heesch"
diff --git a/app-doc/doxygen/patches/doxygen-1.6.1.patch b/app-doc/doxygen/patches/doxygen-1.6.1.patch
deleted file mode 100644
index 1bf4d37f7..000000000
--- a/app-doc/doxygen/patches/doxygen-1.6.1.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -Naur doxygen-1.6.1/PLATFORMS doxygen-1.6.1-haiku/PLATFORMS
---- doxygen-1.6.1/PLATFORMS	2007-11-24 09:12:35.000000000 -0700
-+++ doxygen-1.6.1-haiku/PLATFORMS	2009-11-07 13:02:41.000000000 -0700
-@@ -4,6 +4,7 @@
- dgux-g++
- freebsd-g++
- gnu-g++
-+haiku-g++
- hpux-acc
- hpux-cc
- hpux-g++
-diff -Naur doxygen-1.6.1/configure doxygen-1.6.1-haiku/configure
---- doxygen-1.6.1/configure	2009-08-25 03:49:10.000000000 -0600
-+++ doxygen-1.6.1-haiku/configure	2009-11-07 13:01:31.000000000 -0700
-@@ -180,6 +180,9 @@
-         f_insttool=/usr/bin/install
-       fi
-       ;;
-+    Haiku:*)
-+      f_platform=haiku-g++
-+      ;;
-     HP-UX:*)
-       f_platform=hpux-g++
-       if test "$f_insttool" = NO; then
-diff -Naur doxygen-1.6.1/qtools/qglobal.h doxygen-1.6.1-haiku/qtools/qglobal.h
---- doxygen-1.6.1/qtools/qglobal.h	2008-12-06 06:16:20.000000000 -0700
-+++ doxygen-1.6.1-haiku/qtools/qglobal.h	2009-11-07 13:09:09.000000000 -0700
-@@ -147,6 +147,8 @@
- #define _OS_CYGWIN_
- #elif defined(__BEOS__)
- #define _OS_BEOS_
-+#elif defined(__HAIKU__)
-+#define _OS_HAIKU_
- #elif defined(__MINT__)
- #define _OS_MINT_
- #else
-diff -Naur doxygen-1.6.1/src/doxygen.pro.in doxygen-1.6.1-haiku/src/doxygen.pro.in
---- doxygen-1.6.1/src/doxygen.pro.in	2009-08-02 07:55:02.000000000 -0600
-+++ doxygen-1.6.1-haiku/src/doxygen.pro.in	2009-11-07 13:19:57.000000000 -0700
-@@ -19,6 +19,7 @@
- HEADERS      =	doxygen.h 
- SOURCES      =	main.cpp 
- unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 
-+haiku-g++:LIBS             += -L/boot/common/lib -liconv
- win32:INCLUDEPATH          += .
- win32-mingw:LIBS           += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 
- win32-msvc:LIBS            += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib
-diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/app.t doxygen-1.6.1-haiku/tmake/lib/haiku-g++/app.t
---- doxygen-1.6.1/tmake/lib/haiku-g++/app.t	1969-12-31 17:00:00.000000000 -0700
-+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/app.t	2009-11-07 13:04:20.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! Use the common Unix template
-+#$ IncludeTemplate("../unix/app.t");
-diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/lib.t doxygen-1.6.1-haiku/tmake/lib/haiku-g++/lib.t
---- doxygen-1.6.1/tmake/lib/haiku-g++/lib.t	1969-12-31 17:00:00.000000000 -0700
-+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/lib.t	2009-11-07 13:04:20.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! Use the common Unix template
-+#$ IncludeTemplate("../unix/lib.t");
-diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/subdirs.t doxygen-1.6.1-haiku/tmake/lib/haiku-g++/subdirs.t
---- doxygen-1.6.1/tmake/lib/haiku-g++/subdirs.t	1969-12-31 17:00:00.000000000 -0700
-+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/subdirs.t	2009-11-07 13:04:20.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! Use the common Unix template
-+#$ IncludeTemplate("../unix/subdirs.t");
-diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/tmake.conf doxygen-1.6.1-haiku/tmake/lib/haiku-g++/tmake.conf
---- doxygen-1.6.1/tmake/lib/haiku-g++/tmake.conf	1969-12-31 17:00:00.000000000 -0700
-+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/tmake.conf	2009-11-07 13:09:42.000000000 -0700
-@@ -0,0 +1,51 @@
-+#
-+# 
-+#
-+# tmake configuration for haiku-g++
-+#
-+
-+TEMPLATE		= app
-+CONFIG			= qt warn_on release
-+
-+TMAKE_CC		= gcc
-+TMAKE_CFLAGS		=
-+TMAKE_CFLAGS_WARN_ON	= -Wall -W
-+TMAKE_CFLAGS_WARN_OFF	=
-+TMAKE_CFLAGS_RELEASE	=
-+TMAKE_CFLAGS_DEBUG	= -g
-+TMAKE_CFLAGS_SHLIB	= -fPIC
-+TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-+
-+TMAKE_CXX		= g++
-+TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-+TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-+TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-+TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-+TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-+TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-+TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-+
-+TMAKE_INCDIR		=
-+TMAKE_LIBDIR		=
-+TMAKE_INCDIR_QT		= $(QTDIR)/include
-+TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-+
-+TMAKE_LINK		= g++
-+TMAKE_LINK_SHLIB	= g++
-+TMAKE_LFLAGS		= -Wl,-rpath=/lib:$(QTDIR)/lib
-+TMAKE_LFLAGS_RELEASE	=
-+TMAKE_LFLAGS_DEBUG	=
-+TMAKE_LFLAGS_SHLIB	= -shared
-+TMAKE_LFLAGS_SONAME	= -Wl,-soname,
-+
-+TMAKE_LIBS		=
-+TMAKE_LIBS_QT		= -lqt
-+TMAKE_LIBS_QT_MT	= -lqt-mt
-+
-+TMAKE_MOC		= moc
-+
-+TMAKE_AR		= ar cqs
-+TMAKE_RANLIB		=
-+
-+TMAKE_TAR		= tar -cf
-+TMAKE_GZIP		= gzip -9f
diff --git a/app-doc/doxygen/patches/doxygen-1.6.2.patch b/app-doc/doxygen/patches/doxygen-1.6.2.patch
deleted file mode 100644
index f0692e0bc..000000000
--- a/app-doc/doxygen/patches/doxygen-1.6.2.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -up doxygen-1.6.2/PLATFORMS.orig doxygen-1.6.2/PLATFORMS
---- doxygen-1.6.2/PLATFORMS.orig	2007-11-24 09:12:35.000000000 -0700
-+++ doxygen-1.6.2/PLATFORMS	2010-01-06 17:27:33.000000000 -0700
-@@ -4,6 +4,7 @@ beos-g++
- dgux-g++
- freebsd-g++
- gnu-g++
-+haiku-g++
- hpux-acc
- hpux-cc
- hpux-g++
-diff -up doxygen-1.6.2/configure.orig doxygen-1.6.2/configure
---- doxygen-1.6.2/configure.orig	2009-12-29 05:57:53.000000000 -0700
-+++ doxygen-1.6.2/configure	2010-01-06 17:27:33.000000000 -0700
-@@ -180,6 +180,9 @@ if test -z "$f_platform"; then
-         f_insttool=/usr/bin/install
-       fi
-       ;;
-+    Haiku:*)
-+      f_platform=haiku-g++
-+      ;;
-     HP-UX:*)
-       f_platform=hpux-g++
-       if test "$f_insttool" = NO; then
-diff -up doxygen-1.6.2/qtools/qglobal.h.orig doxygen-1.6.2/qtools/qglobal.h
---- doxygen-1.6.2/qtools/qglobal.h.orig	2009-10-25 09:44:29.000000000 -0600
-+++ doxygen-1.6.2/qtools/qglobal.h	2010-01-06 17:27:33.000000000 -0700
-@@ -150,6 +150,8 @@
- #define _OS_CYGWIN_
- #elif defined(__BEOS__)
- #define _OS_BEOS_
-+#elif defined(__HAIKU__)
-+#define _OS_HAIKU_
- #elif defined(__MINT__)
- #define _OS_MINT_
- #else
-diff -up doxygen-1.6.2/src/doxygen.pro.in.orig doxygen-1.6.2/src/doxygen.pro.in
---- doxygen-1.6.2/src/doxygen.pro.in.orig	2009-08-02 07:55:02.000000000 -0600
-+++ doxygen-1.6.2/src/doxygen.pro.in	2010-01-06 17:27:33.000000000 -0700
-@@ -19,6 +19,7 @@ CONFIG       =	console warn_on $extraopt
- HEADERS      =	doxygen.h 
- SOURCES      =	main.cpp 
- unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 
-+haiku-g++:LIBS             += -L/boot/common/lib -liconv
- win32:INCLUDEPATH          += .
- win32-mingw:LIBS           += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 
- win32-msvc:LIBS            += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib
-diff -up doxygen-1.6.2/tmake/lib/haiku-g++/app.t.orig doxygen-1.6.2/tmake/lib/haiku-g++/app.t
---- doxygen-1.6.2/tmake/lib/haiku-g++/app.t.orig	2010-01-06 17:27:33.000000000 -0700
-+++ doxygen-1.6.2/tmake/lib/haiku-g++/app.t	2010-01-06 17:27:33.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! Use the common Unix template
-+#$ IncludeTemplate("../unix/app.t");
-diff -up doxygen-1.6.2/tmake/lib/haiku-g++/lib.t.orig doxygen-1.6.2/tmake/lib/haiku-g++/lib.t
---- doxygen-1.6.2/tmake/lib/haiku-g++/lib.t.orig	2010-01-06 17:27:33.000000000 -0700
-+++ doxygen-1.6.2/tmake/lib/haiku-g++/lib.t	2010-01-06 17:27:33.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! Use the common Unix template
-+#$ IncludeTemplate("../unix/lib.t");
-diff -up doxygen-1.6.2/tmake/lib/haiku-g++/subdirs.t.orig doxygen-1.6.2/tmake/lib/haiku-g++/subdirs.t
---- doxygen-1.6.2/tmake/lib/haiku-g++/subdirs.t.orig	2010-01-06 17:27:33.000000000 -0700
-+++ doxygen-1.6.2/tmake/lib/haiku-g++/subdirs.t	2010-01-06 17:27:33.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! Use the common Unix template
-+#$ IncludeTemplate("../unix/subdirs.t");
-diff -up doxygen-1.6.2/tmake/lib/haiku-g++/tmake.conf.orig doxygen-1.6.2/tmake/lib/haiku-g++/tmake.conf
---- doxygen-1.6.2/tmake/lib/haiku-g++/tmake.conf.orig	2010-01-06 17:27:33.000000000 -0700
-+++ doxygen-1.6.2/tmake/lib/haiku-g++/tmake.conf	2010-01-06 17:27:33.000000000 -0700
-@@ -0,0 +1,51 @@
-+#
-+# 
-+#
-+# tmake configuration for haiku-g++
-+#
-+
-+TEMPLATE		= app
-+CONFIG			= qt warn_on release
-+
-+TMAKE_CC		= gcc
-+TMAKE_CFLAGS		=
-+TMAKE_CFLAGS_WARN_ON	= -Wall -W
-+TMAKE_CFLAGS_WARN_OFF	=
-+TMAKE_CFLAGS_RELEASE	=
-+TMAKE_CFLAGS_DEBUG	= -g
-+TMAKE_CFLAGS_SHLIB	= -fPIC
-+TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-+
-+TMAKE_CXX		= g++
-+TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-+TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-+TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-+TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-+TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-+TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-+TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-+
-+TMAKE_INCDIR		=
-+TMAKE_LIBDIR		=
-+TMAKE_INCDIR_QT		= $(QTDIR)/include
-+TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-+
-+TMAKE_LINK		= g++
-+TMAKE_LINK_SHLIB	= g++
-+TMAKE_LFLAGS		= -Wl,-rpath=/lib:$(QTDIR)/lib
-+TMAKE_LFLAGS_RELEASE	=
-+TMAKE_LFLAGS_DEBUG	=
-+TMAKE_LFLAGS_SHLIB	= -shared
-+TMAKE_LFLAGS_SONAME	= -Wl,-soname,
-+
-+TMAKE_LIBS		=
-+TMAKE_LIBS_QT		= -lqt
-+TMAKE_LIBS_QT_MT	= -lqt-mt
-+
-+TMAKE_MOC		= moc
-+
-+TMAKE_AR		= ar cqs
-+TMAKE_RANLIB		=
-+
-+TMAKE_TAR		= tar -cf
-+TMAKE_GZIP		= gzip -9f