From 9d3730988f4332ef97d9e9d27a7e1b3d2396237c Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Wed, 8 Sep 2010 07:17:32 +0000
Subject: [PATCH] Added a few more items to the libpak.  Fixed the speex build.
  Adjusted the fontconfig .bep file to use finddir, but this doesn't yet fix
 it's build.  Updated the dependency list for jgmod.

---
 media-libs/fontconfig/fontconfig-2.8.0.bep |  2 +-
 media-libs/jgmod/jgmod-0.99.bep            |  2 +-
 media-libs/speex/speex-1.2-git.bep         |  4 +-
 packs/libpak/libpak-0.9.bep                | 44 ++++++++++++----------
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/media-libs/fontconfig/fontconfig-2.8.0.bep b/media-libs/fontconfig/fontconfig-2.8.0.bep
index fb1363570..12c084014 100644
--- a/media-libs/fontconfig/fontconfig-2.8.0.bep
+++ b/media-libs/fontconfig/fontconfig-2.8.0.bep
@@ -7,7 +7,7 @@ STATUS_HAIKU="broken"
 DEPEND="dev-util/pkgconfig >= 0.23"
 BUILD {
 	cd fontconfig-2.8.0
-	mkdir -p /boot/home/config/cache
+	mkdir -p `finddir B_USER_CACHE_DIRECTORY`
 	libtoolize --force --copy --install
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in
 	aclocal
diff --git a/media-libs/jgmod/jgmod-0.99.bep b/media-libs/jgmod/jgmod-0.99.bep
index e1f28eddd..102e2a658 100644
--- a/media-libs/jgmod/jgmod-0.99.bep
+++ b/media-libs/jgmod/jgmod-0.99.bep
@@ -6,7 +6,7 @@ LICENSE="JGMOD"
 SRC_URI="http://guan.is-a-geek.com/jgmod/jgmod.zip"
 REVISION="1"
 STATUS_HAIKU="stable"
-DEPEND="allegro >= 4.4"
+DEPEND="media-libs/allegro >= 4.4"
 CHECKSUM_MD5="ecc08a8200df6a6f6073635bb092c03b"
 
 BUILD {
diff --git a/media-libs/speex/speex-1.2-git.bep b/media-libs/speex/speex-1.2-git.bep
index e86bdd33c..ede179a72 100644
--- a/media-libs/speex/speex-1.2-git.bep
+++ b/media-libs/speex/speex-1.2-git.bep
@@ -6,7 +6,7 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="libogg >= 1.2.0"
 BUILD {
-	cd speex-1.2
+	cd speex-1.2-git
 	libtoolize --copy --force --install
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
 	autogen.sh --prefix=`finddir B_COMMON_DIRECTORY`
@@ -15,7 +15,7 @@ BUILD {
 }
 
 INSTALL {
-	cd speex-1.2
+	cd speex-1.2-git
 	make install
 }
 LICENSE="Speex"
diff --git a/packs/libpak/libpak-0.9.bep b/packs/libpak/libpak-0.9.bep
index a32750002..21506d84a 100644
--- a/packs/libpak/libpak-0.9.bep
+++ b/packs/libpak/libpak-0.9.bep
@@ -12,8 +12,12 @@ BUILD {
 
 ##	these are needed for building package in the libpak
 	haikuporter -i cmake-2.8.1
-	haikuporter -i dos2unix
-	haikuporter -i pkgconfig-0.25
+	haikuporter -i -d -y dos2unix
+	mv ${HPLOC}/app-text/dos2unix/*.zip .
+	haikuporter -i -d -y pkgconfig-0.25
+	mv ${HPLOC}/dev-util/pkgconfig/*.zip .
+	haikuporter -i -d -y gperf-3.0.4
+	mv ${HPLOC}/dev-util/gperf/*.zip .
 ##
 	haikuporter -y -d -i readline-6.0
 	mv ${HPLOC}/sys-libs/readline/*.zip .
@@ -23,6 +27,14 @@ BUILD {
 	mv ${HPLOC}/sys-devel/gettext/*.zip .
 	haikuporter -y -d -i libiconv-1.13.1
 	mv ${HPLOC}/dev-libs/libiconv/*.zip .
+	haikuporter -y -d -i fribidi-0.19.2
+	mv ${HPLOC}/dev-libs/fribidi/*.zip .
+	haikuporter -y -d -i libpaper-1.1.24
+	mv ${HPLOC}/app-text/libpaper/*.zip .
+	haikuporter -y -d -i flac-1.2.1
+	mv ${HPLOC}/media-libs/flac/*.zip .
+	haikuporter -y -d -i speex-1.2-git
+	mv ${HPLOC}/media-libs/speex/*.zip .
 	haikuporter -y -d -i jpeg-7
 	mv ${HPLOC}/media-libs/jpeg/*.zip .
 	haikuporter -y -d -i libpng-1.2.44
@@ -77,34 +89,26 @@ BUILD {
 		mv ${HPLOC}/media-libs/libmad/*.zip .
 		haikuporter -y -d -i allegro-4.4.1.1
 		mv ${HPLOC}/media-libs/allegro/*.zip .
+		haikuporter -y -d -i dumb-0.9.3
+		mv ${HPLOC}/media-libs/dumb/*.zip .
+		haikuporter -y -d -i jgmod-0.99
+		mv ${HPLOC}/media-libs/jgmod/*.zip .
 	fi
 ## these don't build correctly yet
-##	haikuporter -y -d -i freetype-2.4.2
-##	mv ${HPLOC}/media-libs/freetype/*.zip .
-##	haikuporter -y -d -i fribidi-0.19.2
-##	mv ${HPLOC}/dev-libs/fribidi/*.zip .
-##	haikuporter -y -d -i flac-1.2.1
-##	mv ${HPLOC}/media-libs/flac/*.zip .
-##	haikuporter -y -d -i speex-1.2rc1
-##	mv ${HPLOC}/media-libs/speex/*.zip .
-##	haikuporter -y -d -i jgmod-0.99
-##	mv ${HPLOC}/media-libs/jgmod/*.zip .
-##	haikuporter -y -d -i dumb-0.9.3
-##	mv ${HPLOC}/media-libs/dumb/*.zip .
 ##	haikuporter -y -d -i fblend-0.4
 ##	mv ${HPLOC}/media-libs/fblend/*.zip .
 }
 
 INSTALL {
 	cd libpak-0.9
-	mkdir -p ${DESTDIR}
-	echo "" > ${DESTDIR}/.opd
+	mkdir -p ${DESTDIR}/boot
+	echo "" > ${DESTDIR}/boot/.opd
 	for z in *.zip;
-		do unzip -o $z -d ${DESTDIR}
-		echo -e "\n" >> ${DESTDIR}/.opd
-		cat ${DESTDIR}/.OptionalPackageDescription >> ${DESTDIR}/.opd
+		do unzip -o $z -d ${DESTDIR}/boot
+		echo -e "\n" >> ${DESTDIR}/boot/.opd
+		cat ${DESTDIR}/boot/.OptionalPackageDescription >> ${DESTDIR}/boot/.opd
 	done
-	cp ${DESTDIR}/.opd ${DESTDIR}/.OptionalPackageDescription
+	cp ${DESTDIR}/boot/.opd ${DESTDIR}/boot/.OptionalPackageDescription
 }
 
 #LICENSE=""