From 9a5c8ba18b3ebf4c19450e096a2084d49a255c18 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Fri, 21 May 2010 16:10:16 +0000
Subject: [PATCH] Moved previous glib diffs/patches to patches directory. 
 Removed extra lines from 2.22.2.bep file but it's still not building
 completely.

---
 dev-libs/glib/glib-2.22.2.bep                                 | 4 +---
 dev-libs/glib/{ => patches}/glib-2.18.3-haiku-more.diff       | 0
 dev-libs/glib/{ => patches}/glib-2.18.3-haiku-some.diff       | 0
 dev-libs/glib/{ => patches}/glib-2.18.3-haiku.diff            | 0
 dev-libs/glib/{ => patches}/glib-2.19.2-haiku.diff            | 0
 .../glib-2.19.6-haiku.patch}                                  | 0
 dev-libs/glib/{ => patches}/glib-trunk.diff                   | 0
 .../glib/{ => patches}/pkgconfig_glib-1.2.10-installable.diff | 0
 8 files changed, 1 insertion(+), 3 deletions(-)
 rename dev-libs/glib/{ => patches}/glib-2.18.3-haiku-more.diff (100%)
 rename dev-libs/glib/{ => patches}/glib-2.18.3-haiku-some.diff (100%)
 rename dev-libs/glib/{ => patches}/glib-2.18.3-haiku.diff (100%)
 rename dev-libs/glib/{ => patches}/glib-2.19.2-haiku.diff (100%)
 rename dev-libs/glib/{glib-2.19.6-haiku.diff => patches/glib-2.19.6-haiku.patch} (100%)
 rename dev-libs/glib/{ => patches}/glib-trunk.diff (100%)
 rename dev-libs/glib/{ => patches}/pkgconfig_glib-1.2.10-installable.diff (100%)

diff --git a/dev-libs/glib/glib-2.22.2.bep b/dev-libs/glib/glib-2.22.2.bep
index 7ea35a378..d6139ceac 100644
--- a/dev-libs/glib/glib-2.22.2.bep
+++ b/dev-libs/glib/glib-2.22.2.bep
@@ -16,12 +16,10 @@ BUILD {
 	cp /boot/common/share/aclocal/lt~obsolete.m4 m4
 	libtoolize --force --copy --install
 	aclocal -I m4
-	automake
+#	automake
 	autoconf
 	./configure --prefix=/boot/common
 	make
-	./configure --prefix=/boot/common
-	make
 }
 
 INSTALL {
diff --git a/dev-libs/glib/glib-2.18.3-haiku-more.diff b/dev-libs/glib/patches/glib-2.18.3-haiku-more.diff
similarity index 100%
rename from dev-libs/glib/glib-2.18.3-haiku-more.diff
rename to dev-libs/glib/patches/glib-2.18.3-haiku-more.diff
diff --git a/dev-libs/glib/glib-2.18.3-haiku-some.diff b/dev-libs/glib/patches/glib-2.18.3-haiku-some.diff
similarity index 100%
rename from dev-libs/glib/glib-2.18.3-haiku-some.diff
rename to dev-libs/glib/patches/glib-2.18.3-haiku-some.diff
diff --git a/dev-libs/glib/glib-2.18.3-haiku.diff b/dev-libs/glib/patches/glib-2.18.3-haiku.diff
similarity index 100%
rename from dev-libs/glib/glib-2.18.3-haiku.diff
rename to dev-libs/glib/patches/glib-2.18.3-haiku.diff
diff --git a/dev-libs/glib/glib-2.19.2-haiku.diff b/dev-libs/glib/patches/glib-2.19.2-haiku.diff
similarity index 100%
rename from dev-libs/glib/glib-2.19.2-haiku.diff
rename to dev-libs/glib/patches/glib-2.19.2-haiku.diff
diff --git a/dev-libs/glib/glib-2.19.6-haiku.diff b/dev-libs/glib/patches/glib-2.19.6-haiku.patch
similarity index 100%
rename from dev-libs/glib/glib-2.19.6-haiku.diff
rename to dev-libs/glib/patches/glib-2.19.6-haiku.patch
diff --git a/dev-libs/glib/glib-trunk.diff b/dev-libs/glib/patches/glib-trunk.diff
similarity index 100%
rename from dev-libs/glib/glib-trunk.diff
rename to dev-libs/glib/patches/glib-trunk.diff
diff --git a/dev-libs/glib/pkgconfig_glib-1.2.10-installable.diff b/dev-libs/glib/patches/pkgconfig_glib-1.2.10-installable.diff
similarity index 100%
rename from dev-libs/glib/pkgconfig_glib-1.2.10-installable.diff
rename to dev-libs/glib/patches/pkgconfig_glib-1.2.10-installable.diff