Fix the build when it enables gobject-introspection. Without it, I get this:

---------------------------
gnome-config: not found
Package babl was not found in the pkg-config search path.
Perhaps you should add the directory containing `babl.pc'
to the PKG_CONFIG_PATH environment variable
No package 'babl' found
---------------------------

Clearly, there is no way for babl to depends on babl (itself). O_o A weird
bug, so remove that '--pkg babl' to fix the build. While I am here, reorder
the pkg-plist to make it easier to read. No function change.

2 files changed, 31 insertions, 21 deletions

diff --git a/x11/babl/files/patch-babl_Makefile.in b/x11/babl/files/patch-babl_Makefile.in
new file mode 100644
index 000000000000..90638c81585e
--- /dev/null
+++ b/x11/babl/files/patch-babl_Makefile.in
@@ -0,0 +1,10 @@
+--- babl/Makefile.in.orig	2011-06-29 09:41:40.000000000 -0500
++++ babl/Makefile.in	2011-06-29 09:42:07.000000000 -0500
+@@ -930,7 +930,6 @@
+ @HAVE_INTROSPECTION_TRUE@            --library=babl-$(BABL_API_VERSION) \
+ @HAVE_INTROSPECTION_TRUE@            --libtool="$(LIBTOOL)" \
+ @HAVE_INTROSPECTION_TRUE@            --output $@ \
+-@HAVE_INTROSPECTION_TRUE@            --pkg babl \
+ @HAVE_INTROSPECTION_TRUE@            -DBABL_IS_BEING_COMPILED \
+ @HAVE_INTROSPECTION_TRUE@	    -I$(top_srcdir) \
+ @HAVE_INTROSPECTION_TRUE@	    -I$(top_builddir) \
diff --git a/x11/babl/pkg-plist b/x11/babl/pkg-plist
index ed21ce877a90..134e901007bc 100644
--- a/x11/babl/pkg-plist
+++ b/x11/babl/pkg-plist
@@ -2,36 +2,36 @@ include/babl-0.1/babl/babl-macros.h
 include/babl-0.1/babl/babl-types.h
 include/babl-0.1/babl/babl-version.h
 include/babl-0.1/babl/babl.h
-lib/libbabl-0.1.so.0
-lib/libbabl-0.1.so
-lib/libbabl-0.1.la
-lib/libbabl-0.1.a
-lib/babl-0.1/CIE.so
-lib/babl-0.1/CIE.la
-lib/babl-0.1/gegl-fixups.so
-lib/babl-0.1/gegl-fixups.la
-lib/babl-0.1/gggl-lies.so
-lib/babl-0.1/gggl-lies.la
-lib/babl-0.1/gggl.so
-lib/babl-0.1/gggl.la
-lib/babl-0.1/gimp-8bit.so
-lib/babl-0.1/gimp-8bit.la
-lib/babl-0.1/naive-CMYK.so
-lib/babl-0.1/naive-CMYK.la
-lib/babl-0.1/sse-fixups.so
-lib/babl-0.1/sse-fixups.la
 lib/babl-0.1/CIE.a
+lib/babl-0.1/CIE.la
+lib/babl-0.1/CIE.so
 lib/babl-0.1/gegl-fixups.a
+lib/babl-0.1/gegl-fixups.la
+lib/babl-0.1/gegl-fixups.so
 lib/babl-0.1/gggl-lies.a
+lib/babl-0.1/gggl-lies.la
+lib/babl-0.1/gggl-lies.so
 lib/babl-0.1/gggl.a
+lib/babl-0.1/gggl.la
+lib/babl-0.1/gggl.so
 lib/babl-0.1/gimp-8bit.a
+lib/babl-0.1/gimp-8bit.la
+lib/babl-0.1/gimp-8bit.so
 lib/babl-0.1/naive-CMYK.a
+lib/babl-0.1/naive-CMYK.la
+lib/babl-0.1/naive-CMYK.so
 lib/babl-0.1/sse-fixups.a
+lib/babl-0.1/sse-fixups.la
+lib/babl-0.1/sse-fixups.so
 lib/girepository-1.0/Babl-0.1.typelib
-share/gir-1.0/Babl-0.1.gir
+lib/libbabl-0.1.a
+lib/libbabl-0.1.la
+lib/libbabl-0.1.so
+lib/libbabl-0.1.so.0
 libdata/pkgconfig/babl.pc
+share/gir-1.0/Babl-0.1.gir
+@dirrmtry share/gir-1.0
+@dirrmtry lib/girepository-1.0
 @dirrm lib/babl-0.1
 @dirrm include/babl-0.1/babl
 @dirrm include/babl-0.1
-@dirrmtry lib/girepository-1.0
-@dirrmtry share/gir-1.0