Fix a breakage resulted from path to gdk-pixbuf's includes being

hardcoded.

Reported by:	Patrik Backlund <pbacklun@cc.hut.fi>

6 files changed, 75 insertions, 8 deletions

diff --git a/x11-toolkits/guile-gnome/files/patch-ad b/x11-toolkits/guile-gnome/files/patch-ad
index 090457d9b8e5..5b9bc809fe99 100644
--- a/x11-toolkits/guile-gnome/files/patch-ad
+++ b/x11-toolkits/guile-gnome/files/patch-ad
@@ -4,11 +4,4 @@
  
 -GLADE_LIBS = -lglade -lglade-gnome 
 +GLADE_LIBS = `libglade-config --libs gnome`
- 
---- guile-gnome/bonobo/Makefile.in.orig	Sun Feb  4 20:53:42 2001
-+++ guile-gnome/bonobo/Makefile.in	Wed Feb 28 11:15:12 2001
-@@ -103,3 +103,3 @@
- 
--BONOBO_LIBS = -lbonobo 
-+BONOBO_LIBS = `gnome-config --libs bonobo`
- 
+  
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::bonobo::Makefile.in b/x11-toolkits/guile-gnome/files/patch-guile-gnome::bonobo::Makefile.in
new file mode 100644
index 000000000000..b8a85cdc531d
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::bonobo::Makefile.in
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- guile-gnome/bonobo/Makefile.in.orig	Fri Mar  9 19:07:48 2001
++++ guile-gnome/bonobo/Makefile.in	Mon Nov 12 14:05:21 2001
+@@ -98,10 +98,10 @@
+ VERSION = @VERSION@
+ ZVT_LIBS = @ZVT_LIBS@
+ 
+-INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk 	-I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR)
++INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk 	-I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR) `$(GNOME_CONFIG) --cflags bonobo`
+ 
+ 
+-BONOBO_LIBS = -lbonobo 
++BONOBO_LIBS = `$(GNOME_CONFIG) --libs bonobo`
+ 
+ lib_LTLIBRARIES = libguilebonobo.la
+ libguilebonobo_la_SOURCES = bonobo-glue.c 
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gdk-pixbuf::Makefile.in b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gdk-pixbuf::Makefile.in
new file mode 100644
index 000000000000..98da7a4aaa2f
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gdk-pixbuf::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- guile-gnome/gdk-pixbuf/Makefile.in	2001/11/12 12:09:05	1.1
++++ guile-gnome/gdk-pixbuf/Makefile.in	2001/11/12 12:09:54
+@@ -98,7 +98,7 @@
+ VERSION = @VERSION@
+ ZVT_LIBS = @ZVT_LIBS@
+ 
+-INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk 	-I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR)
++INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk 	-I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR) `$(GNOME_CONFIG) --cflags gdk_pixbuf`
+ 
+ 
+ GDKPIXBUF_LIBS = -lgdk_pixbuf
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::Makefile.in b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::Makefile.in
new file mode 100644
index 000000000000..bd9cdc0cbc76
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- guile-gnome/gtkhtml/Makefile.in	2001/11/12 12:07:17	1.1
++++ guile-gnome/gtkhtml/Makefile.in	2001/11/12 12:07:44
+@@ -98,7 +98,7 @@
+ VERSION = @VERSION@
+ ZVT_LIBS = @ZVT_LIBS@
+ 
+-INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk 	-I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR)
++INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk 	-I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR) `$(GNOME_CONFIG) --cflags gtkhtml`
+ 
+ 
+ GTKHTML_LIBS = -lgtkhtml -lgdk_pixbuf
diff --git a/x11-toolkits/py-gnome/files/patch-pygnome::Makefile.in b/x11-toolkits/py-gnome/files/patch-pygnome::Makefile.in
new file mode 100644
index 000000000000..98d71436ee2c
--- /dev/null
+++ b/x11-toolkits/py-gnome/files/patch-pygnome::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- pygnome/Makefile.in	2001/11/12 11:58:04	1.1
++++ pygnome/Makefile.in	2001/11/12 12:00:19
+@@ -134,7 +134,7 @@
+ SUBDIRS = generate gnome
+ 
+ INCLUDES = $(PYTHON_INCLUDES) $(GNOME_INCLUDEDIR) \
+-	$(LIBGLADE_CFLAGS)
++	$(LIBGLADE_CFLAGS) `$(GNOME_CONFIG) --cflags gtkhtml`
+ 
+ 
+ @WITH_APPLETS_TRUE@appletmodule = _appletmodule.la
diff --git a/x11-toolkits/py-gnome2/files/patch-pygnome::Makefile.in b/x11-toolkits/py-gnome2/files/patch-pygnome::Makefile.in
new file mode 100644
index 000000000000..98d71436ee2c
--- /dev/null
+++ b/x11-toolkits/py-gnome2/files/patch-pygnome::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- pygnome/Makefile.in	2001/11/12 11:58:04	1.1
++++ pygnome/Makefile.in	2001/11/12 12:00:19
+@@ -134,7 +134,7 @@
+ SUBDIRS = generate gnome
+ 
+ INCLUDES = $(PYTHON_INCLUDES) $(GNOME_INCLUDEDIR) \
+-	$(LIBGLADE_CFLAGS)
++	$(LIBGLADE_CFLAGS) `$(GNOME_CONFIG) --cflags gtkhtml`
+ 
+ 
+ @WITH_APPLETS_TRUE@appletmodule = _appletmodule.la