From af9853e6bddab94ba5258c4c7463bfbf8df82043 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sat, 4 Sep 2010 07:57:58 +0000
Subject: [PATCH] added patch to enable building of dumb.  TODO: get it to
 build to a DESTDIR, and make a .so lib.

---
 media-libs/dumb/dumb-0.9.3.bep           | 18 ++++----
 media-libs/dumb/patches/dumb-0.9.3.patch | 59 ++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 10 deletions(-)
 create mode 100644 media-libs/dumb/patches/dumb-0.9.3.patch

diff --git a/media-libs/dumb/dumb-0.9.3.bep b/media-libs/dumb/dumb-0.9.3.bep
index 6685b50b6..d11c34823 100644
--- a/media-libs/dumb/dumb-0.9.3.bep
+++ b/media-libs/dumb/dumb-0.9.3.bep
@@ -1,28 +1,26 @@
 DESCRIPTION="dumb - Dynamic Universal Music Bibliotheque" 
 HOMEPAGE="http://dumb.sourceforge.net/" 
-SRC_URI="http://www.bedrivers.com/dumb-0.9.3.zip"
+SRC_URI="http://downloads.sourceforge.net/project/dumb/dumb/0.9.3/dumb-0.9.3.tar.gz"
 # dumb-0.9.3.zip was created by extracting dumb-0.9.3.tar.gz and dumb-0.9.3-autotools.tar.gz and then zipping up the combined directory.
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/allegro >= 4.4.1.1"
-CHECKSUM_MD5="be3d9f2755b19aab805dccd4ae0bc04a"
+CHECKSUM_MD5="f48da5b990aa8aa822d3b6a951baf5c2"
 BUILD {
 	cd dumb-0.9.3
 	mkdir -p m4
-	haikuporter -b allegro-4.4.1.1
+	haikuporter -b -y allegro-4.4.1.1
 	cp $(haikuporter -t)/media-libs/allegro/work/allegro-4.4.1.1/misc/allegro.m4 m4
-	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in
+#	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in
 	libtoolize --force --copy --install
-	aclocal -I m4 --warnings=none
-	autoconf
-	chmod 777 configure
-	./configure --prefix=/boot/common
-	make
+#	aclocal -I m4 --warnings=none
+#	autoconf
+	make PREFIX=`finddir B_COMMON_DIRECTORY`
 }
 
 INSTALL {
 	cd dumb-0.9.3
-	make install
+	make install PREFIX=`finddir B_COMMON_DIRECTORY` DESTDIR=${DESTDIR}
 }
 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
new file mode 100644
index 000000000..d97b17cdb
--- /dev/null
+++ b/media-libs/dumb/patches/dumb-0.9.3.patch
@@ -0,0 +1,59 @@
+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.