diff --git a/media-libs/dumb/dumb-0.9.3.recipe b/media-libs/dumb/dumb-0.9.3.recipe
index 187e82fb2..d5b5691d7 100644
--- a/media-libs/dumb/dumb-0.9.3.recipe
+++ b/media-libs/dumb/dumb-0.9.3.recipe
@@ -1,33 +1,84 @@
-DESCRIPTION="dumb - Dynamic Universal Music Bibliotheque" 
+SUMMARY="A Dynamic Universal Music Library"
+DESCRIPTION="DUMB is an IT, XM, S3M and MOD player library" 
 HOMEPAGE="http://dumb.sourceforge.net/" 
+LICENSE="DUMB-0.9.3"
+COPYRIGHT="2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere"
 SRC_URI="http://downloads.sourceforge.net/project/dumb/dumb/0.9.3/dumb-0.9.3.tar.gz"
+CHECKSUM_SHA256="8d44fbc9e57f3bac9f761c3b12ce102d47d717f0dd846657fb988e0bb5d1ea33"
+SRC_URI_2="http://prdownloads.sourceforge.net/dumb/dumb-0.9.3-autotools.tar.gz"
+CHECKSUM_SHA256_2="9e3fa1e0932e00e31f2314cefb3ea0343ee4f850b6a8e6a6a9627a35b2dc0dbd"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/allegro >= 4.4.1.1"
-CHECKSUM_MD5="f48da5b990aa8aa822d3b6a951baf5c2"
+
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	dumb$secondaryArchSuffix = $portVersion
+	lib:libdumb_0.9.3$secondaryArchSuffix = 0.9.3 compat >= 0.9
+	lib:libaldmb_0.9.3$secondaryArchSuffix = 0.9.3 compat >= 0.9
+	cmd:dumb2wav$secondaryArchSuffix = $portVersion
+	cmd:dumbout$secondaryArchSuffix = $portVersion
+	cmd:dumbplay$secondaryArchSuffix = $portVersion
+	"
+
+PROVIDES_devel="
+	dumb${secondaryArchSuffix}_devel = $portVersion
+	devel:libdumb$secondaryArchSuffix = $portVersion
+	devel:libdumb_0.9.3$secondaryArchSuffix = 0.9.3 compat >= 0.9
+	devel:libaldmb$secondaryArchSuffix = $portVersion
+	devel:libaldmb_0.9.3$secondaryArchSuffix = 0.9.3 compat >= 0.9
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:liballeg$secondaryArchSuffix
+	"
+
+REQUIRES_devel="
+	dumb$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:liballeg$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:make
+	"
+
 BUILD()
 {
-	if [ ! -f dumb-0.9.3-autotools.tar.gz ]; then
-#	get the autotools to help in building dumb	
-	wget http://prdownloads.sourceforge.net/dumb/dumb-0.9.3-autotools.tar.gz?download
-	fi
-	tar -xvf dumb-0.9.3-autotools.tar.gz
-	cd dumb-0.9.3
 	mkdir -p m4
-	haikuporter -y -b allegro-4.4.1.1
-	cp $(haikuporter -t)/media-libs/allegro/work/allegro-4.4.1.1/misc/allegro.m4 m4
+	cp -R ../../sources-2/dumb-0.9.3 ../
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in
+	echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
 	libtoolize --force --copy --install
 	aclocal -I m4 --warnings=none
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make 
+	runConfigure --omit-dirs "dataRootDir" ./configure
+
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd dumb-0.9.3
-		make install DESTDIR=${DESTDIR}
+	make install
+	prepareInstalledDevelLibs libdumb libaldmb libdumb-0.9.3 libaldmb-0.9.3
+
+	# devel package
+	packageEntries devel \
+		$developDir
+
 }
-LICENSE="DUMB-0.9.3"
-COPYRIGHT="2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere"
diff --git a/media-libs/dumb/patches/dumb-0.9.3.patch b/media-libs/dumb/patches/dumb-0.9.3.patch
deleted file mode 100644
index 427c09857..000000000
--- a/media-libs/dumb/patches/dumb-0.9.3.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -urN dumb-0.9.3/Makefile dumb-0.9.3-haiku/Makefile
---- dumb-0.9.3/Makefile	2005-08-08 00:18:41.049283072 +0000
-+++ dumb-0.9.3-haiku/Makefile	2010-09-04 07:41:53.857473024 +0000
-@@ -64,11 +64,11 @@
- -include make/config.txt
- 
- 
--ifeq "$(OSTYPE)" "beos"
-+ifeq "$(OSTYPE)" "haiku"
- 
--INCLUDE_INSTALL_PATH := /boot/develop/headers
--LIB_INSTALL_PATH := /boot/develop/lib/x86
--BIN_INSTALL_PATH := /boot/home/config/bin
-+INCLUDE_INSTALL_PATH := /boot/common/include
-+LIB_INSTALL_PATH := /boot/common/lib
-+BIN_INSTALL_PATH := /boot/common/bin
- # DEFAULT_PREFIX is not set, so config.sh will not prompt for PREFIX.
- LINK_MATH :=
- 
-@@ -80,9 +80,9 @@
- DEFAULT_PREFIX := /usr/local
- endif
- export DEFAULT_PREFIX
--INCLUDE_INSTALL_PATH := $(PREFIX)/include
--LIB_INSTALL_PATH := $(PREFIX)/lib
--BIN_INSTALL_PATH := $(PREFIX)/bin
-+INCLUDE_INSTALL_PATH := $(DESTDIR)$(PREFIX)/include
-+LIB_INSTALL_PATH := $(DESTDIR)$(PREFIX)/lib
-+BIN_INSTALL_PATH := $(DESTDIR)$(PREFIX)/bin
- 
- endif
- 
-diff -urN dumb-0.9.3/make/dumbask.c dumb-0.9.3-haiku/make/dumbask.c
---- dumb-0.9.3/make/dumbask.c	2005-08-08 00:18:40.048758784 +0000
-+++ dumb-0.9.3-haiku/make/dumbask.c	2010-09-04 07:20:26.941621248 +0000
-@@ -21,10 +21,10 @@
- 	printf("%s", argv[1]);
- 
- 	for (;;) {
-+		int i;
- 		char c = getchar();
- 		if (c == EOF) return 0;
- 		c = toupper(c);
--		int i;
- 		for (i = 0; options[i]; i++)
- 			if (c == toupper(options[i]))
- 				return i;
-diff -urN dumb-0.9.3/make/unix.inc dumb-0.9.3-haiku/make/unix.inc
---- dumb-0.9.3/make/unix.inc	2005-08-08 00:18:40.048496640 +0000
-+++ dumb-0.9.3-haiku/make/unix.inc	2010-09-04 07:29:01.080216064 +0000
-@@ -15,7 +15,7 @@
- 
- EXE_SUFFIX :=
- 
--LINK_MATH := -lm
-+LINK_MATH :=
- LINK_ALLEGRO := `allegro-config --libs`
- 
- # PREFIX is set by config.sh.
-diff -urN dumb-0.9.3/make/config.sh dumb-0.9.3-haiku/make/config.sh
---- dumb-0.9.3/make/config.sh	2005-08-08 00:18:40.012320768 +0000
-+++ dumb-0.9.3-haiku/make/config.sh	2010-09-07 23:23:38.653787136 +0000
-@@ -14,24 +14,14 @@
- 
- echo 'ALL_TARGETS := core core-examples core-headers' >> make/config.tmp
- 
--if make/dumbask 'Would you like support for Allegro (Y/N)? ' YN; then
--  echo 'ALL_TARGETS += allegro allegro-examples allegro-headers' >> make/config.tmp
--fi
-+echo 'ALL_TARGETS += allegro allegro-examples allegro-headers' >> make/config.tmp
- 
--
--if [ ! -z $DEFAULT_PREFIX ]; then
--echo "Please specify an installation prefix (default $DEFAULT_PREFIX)."
--echo -n '> '
--read PREFIX
-+PREFIX := `/boot/common`
- if [ -z $PREFIX ]; then PREFIX=$DEFAULT_PREFIX; fi
- echo "PREFIX := `echo "$PREFIX" | \
-   sed -e 's/\${\([A-Za-z_][A-Za-z0-9_]*\)}/$(\1)/g' \
-       -e 's/\$\([A-Za-z_][A-Za-z0-9_]*\)/$(\1)/g'`" >> make/config.tmp
--fi
- 
- mv -f make/config.tmp make/config.txt
- 
- echo 'Configuration complete.'
--echo "Run 'make config' to change it in the future."
--echo -n 'Press Enter to continue ... '
--read dummy