From 46688eac4cf28734b048a5088c84257e3b153211 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 7 Sep 2010 23:47:46 +0000 Subject: [PATCH] Fixed bep and patch files for dumb to allow for building of the .so libs as well as the .a ones. --- media-libs/dumb/dumb-0.9.3.bep | 20 ++++++++++------ media-libs/dumb/patches/dumb-0.9.3.patch | 30 ++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/media-libs/dumb/dumb-0.9.3.bep b/media-libs/dumb/dumb-0.9.3.bep index d11c34823..5e0c805f8 100644 --- a/media-libs/dumb/dumb-0.9.3.bep +++ b/media-libs/dumb/dumb-0.9.3.bep @@ -1,26 +1,32 @@ DESCRIPTION="dumb - Dynamic Universal Music Bibliotheque" HOMEPAGE="http://dumb.sourceforge.net/" 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="f48da5b990aa8aa822d3b6a951baf5c2" BUILD { + if [ -n 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 + gunzip dumb-0.9.3-autotools.tar.gz + tar -xf dumb-0.9.3-autotools.tar cd dumb-0.9.3 mkdir -p m4 - haikuporter -b -y allegro-4.4.1.1 + haikuporter -y -b 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 - make PREFIX=`finddir B_COMMON_DIRECTORY` + aclocal -I m4 --warnings=none + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make } INSTALL { cd dumb-0.9.3 - make install PREFIX=`finddir B_COMMON_DIRECTORY` DESTDIR=${DESTDIR} + make install 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 index d97b17cdb..427c09857 100644 --- a/media-libs/dumb/patches/dumb-0.9.3.patch +++ b/media-libs/dumb/patches/dumb-0.9.3.patch @@ -57,3 +57,33 @@ diff -urN dumb-0.9.3/make/unix.inc dumb-0.9.3-haiku/make/unix.inc 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