Remove -I$(includedir) from the header search path (in spirit of

buildlink).

9 files changed, 113 insertions, 6 deletions

diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo
index 46150d79ebe..bc511e8269a 100644
--- a/x11/gnome-libs/distinfo
+++ b/x11/gnome-libs/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2001/05/21 05:27:58 tron Exp $
+$NetBSD: distinfo,v 1.3 2001/06/16 20:04:51 jlam Exp $
 
 SHA1 (gnome-libs-1.2.13.tar.gz) = 21142d1afc826b7bca54be91a398c6f896d81696
 Size (gnome-libs-1.2.13.tar.gz) = 3387481 bytes
-SHA1 (patch-aa) = 43d905e1412c823f17fd6d08dd4a56ce138dc12d
+SHA1 (patch-aa) = 9475ac31c08d3aa547874d932fe5c2a3d01873bc
 SHA1 (patch-ac) = fb2cb590552da0473b67c2ad88baabe4fa208c25
-SHA1 (patch-ad) = 391d4f12b6c2989a5526ca26f2dc89555109c485
+SHA1 (patch-ad) = fff2bbe36ba7f0ed588cbaf2efc646909511ad03
 SHA1 (patch-ae) = 98fe6bb0850778702bbe0b3d0a3810d551b7d695
 SHA1 (patch-af) = c66a96dac08232fcfc0ee7f73701e877c60483a3
 SHA1 (patch-aj) = 292c4efccc9650c8244348bdcf22c3c1cbd3ebe6
@@ -13,3 +13,10 @@ SHA1 (patch-an) = 94189a17d893cc7290354ddb200bea41dffb7953
 SHA1 (patch-ao) = 31724d3e4eb9d44b6a701f4317fc5ae35c4f2f66
 SHA1 (patch-ap) = 31e535a78dfb1fe38d7a1bb0e651b9189e88bdff
 SHA1 (patch-aq) = 58ea5945277d08678988eb6598eb82c724376842
+SHA1 (patch-ar) = acfd15b6e3e1962d6dc288472328730c7d18605d
+SHA1 (patch-as) = 9d37cbf46669af688d20841d90c23e43052f22cf
+SHA1 (patch-at) = ce82e3f8090f3b00c8a8c8ac0809180d2febed70
+SHA1 (patch-au) = d694b7105570fbe8ad8ce5a5079678db2cd2fc8e
+SHA1 (patch-av) = 7dfccc25c7f764106b61f62f11f92bed0161b4b8
+SHA1 (patch-aw) = 03cf4cbeeaeb0f852c072dfb97bbd47c3d627a7c
+SHA1 (patch-ax) = 4814683fc21c63c8dc282c8f30466ebbbc7ba349
diff --git a/x11/gnome-libs/patches/patch-ad b/x11/gnome-libs/patches/patch-ad
index a655df0fb23..274ba5aecb1 100644
--- a/x11/gnome-libs/patches/patch-ad
+++ b/x11/gnome-libs/patches/patch-ad
@@ -1,7 +1,16 @@
-$NetBSD: patch-ad,v 1.8 2000/10/17 23:57:45 jlam Exp $
+$NetBSD: patch-ad,v 1.9 2001/06/16 20:04:51 jlam Exp $
 
---- libgnome/Makefile.in.orig	Thu Oct 12 23:03:30 2000
-+++ libgnome/Makefile.in
+--- libgnome/Makefile.in.orig	Fri Mar 16 14:47:28 2001
++++ libgnome/Makefile.in	Sat Jun 16 08:58:22 2001
+@@ -154,7 +154,7 @@
+ 
+ libgnomeincludedir = $(includedir)/libgnome
+ 
+-INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) 	-I$(top_srcdir)/intl -I$(top_builddir)/intl 	-I$(includedir) $(GLIB_CFLAGS) $(GDK_IMLIB_CFLAGS)  	$(AUDIOFILE_CFLAGS) $(ESD_CFLAGS) 	-DGNOMELIBDIR=\""$(libdir)"\" 	-DGNOMEDATADIR=\""$(datadir)"\" 	-DGNOMEBINDIR=\""$(bindir)"\" 	-DGNOMELOCALSTATEDIR=\""$(localstatedir)"\" 	-DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" 	-DGNOMESYSCONFDIR=\""$(sysconfdir)"\" 	-DVERSION=\""$(VERSION)"\" 	-DG_LOG_DOMAIN=\"Gnome\"
++INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) 	-I$(top_srcdir)/intl -I$(top_builddir)/intl 	$(GLIB_CFLAGS) $(GDK_IMLIB_CFLAGS)  	$(AUDIOFILE_CFLAGS) $(ESD_CFLAGS) 	-DGNOMELIBDIR=\""$(libdir)"\" 	-DGNOMEDATADIR=\""$(datadir)"\" 	-DGNOMEBINDIR=\""$(bindir)"\" 	-DGNOMELOCALSTATEDIR=\""$(localstatedir)"\" 	-DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" 	-DGNOMESYSCONFDIR=\""$(sysconfdir)"\" 	-DVERSION=\""$(VERSION)"\" 	-DG_LOG_DOMAIN=\"Gnome\"
+ 
+ 
+ libgnome_la_SOURCES =  	gnome-config.c			gnome-dentry.c          	gnome-exec.c			gnome-fileconvert.c		gnome-help.c			gnome-history.c			gnome-i18n.c			gnome-magic.c			gnome-metadata.c		gnome-mime.c			gnome-mime-info.c		gnome-popt.c			gnome-regex.c			gnome-remote.c			gnome-score.c			gnome-sound.c			gnome-triggers.c		gnome-url.c			gnome-util.c			gnome-paper.c			gnomelib-init.c
 @@ -233,7 +233,7 @@
  gnome_gen_mimedb_LDFLAGS = 
  CFLAGS = @CFLAGS@
diff --git a/x11/gnome-libs/patches/patch-ar b/x11/gnome-libs/patches/patch-ar
new file mode 100644
index 00000000000..a7b37f12971
--- /dev/null
+++ b/x11/gnome-libs/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.4 2001/06/16 20:04:51 jlam Exp $
+
+--- gtk-xmhtml/Makefile.in.orig	Fri Mar 16 14:47:33 2001
++++ gtk-xmhtml/Makefile.in	Sat Jun 16 09:00:26 2001
+@@ -146,7 +146,7 @@
+ 
+ libgtkxmhtmlincludedir = $(includedir)/gtk-xmhtml
+ 
+-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) @GTK_CFLAGS@            -DWITH_GTK -DDEBUG -DGNOME_LIB
++INCLUDES = -I.. -I$(srcdir)/.. @GTK_CFLAGS@            -DWITH_GTK -DDEBUG -DGNOME_LIB
+ 
+ 
+ lib_LTLIBRARIES = libgtkxmhtml.la
diff --git a/x11/gnome-libs/patches/patch-as b/x11/gnome-libs/patches/patch-as
new file mode 100644
index 00000000000..8116822d84e
--- /dev/null
+++ b/x11/gnome-libs/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1 2001/06/16 20:04:51 jlam Exp $
+
+--- libgnomeui/Makefile.in.orig	Fri Mar 16 14:47:30 2001
++++ libgnomeui/Makefile.in	Sat Jun 16 09:01:07 2001
+@@ -158,7 +158,7 @@
+ #
+ libgnomeuiincludedir = $(includedir)/libgnomeui
+ 
+-INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) 	-I$(top_srcdir)/intl -I$(top_builddir)/intl 	-I$(includedir) $(GDK_IMLIB_CFLAGS) 	$(AUDIOFILE_CFLAGS) $(ESD_CFLAGS)         -DGNOMELIBDIR=\""$(libdir)"\"         -DGNOMEDATADIR=\""$(datadir)"\"         -DGNOMEBINDIR=\""$(bindir)"\"         -DGNOMELOCALSTATEDIR=\""$(localstatedir)"\"         -DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" 	-DG_LOG_DOMAIN=\"GnomeUI\"
++INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) 	-I$(top_srcdir)/intl -I$(top_builddir)/intl 	$(GDK_IMLIB_CFLAGS) 	$(AUDIOFILE_CFLAGS) $(ESD_CFLAGS)         -DGNOMELIBDIR=\""$(libdir)"\"         -DGNOMEDATADIR=\""$(datadir)"\"         -DGNOMEBINDIR=\""$(bindir)"\"         -DGNOMELOCALSTATEDIR=\""$(localstatedir)"\"         -DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" 	-DG_LOG_DOMAIN=\"GnomeUI\"
+ 
+ 
+ EXTRA_HEADERS = 
diff --git a/x11/gnome-libs/patches/patch-at b/x11/gnome-libs/patches/patch-at
new file mode 100644
index 00000000000..697cbaeaffa
--- /dev/null
+++ b/x11/gnome-libs/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1 2001/06/16 20:04:51 jlam Exp $
+
+--- libgnorba/Makefile.in.orig	Fri Mar 16 14:47:35 2001
++++ libgnorba/Makefile.in	Sat Jun 16 09:02:25 2001
+@@ -153,7 +153,7 @@
+ 
+ EXTRA_DIST = yes.xpm no.xpm
+ 
+-INCLUDES =  	-I.. 							-I$(srcdir)/..						$(SUPPORTINCS) 						-I$(includedir) 				        $(GNOME_INCLUDES)  					$(ORBIT_CFLAGS) 					$(GLIB_INCLUDES) 					$(AUDIOFILE_CFLAGS) $(ESD_CFLAGS) 			$(GDK_IMLIB_CFLAGS)					-DGNOMEBINDIR=$(bindir) 				-DGNOMESYSCONFDIR=\"$(sysconfdir)\" 			-DVERSION=\""$(VERSION)"\"
++INCLUDES =  	-I.. 							-I$(srcdir)/..						$(SUPPORTINCS) 						$(GNOME_INCLUDES)  					$(ORBIT_CFLAGS) 					$(GLIB_INCLUDES) 					$(AUDIOFILE_CFLAGS) $(ESD_CFLAGS) 			$(GDK_IMLIB_CFLAGS)					-DGNOMEBINDIR=$(bindir) 				-DGNOMESYSCONFDIR=\"$(sysconfdir)\" 			-DVERSION=\""$(VERSION)"\"
+ 
+ 
+ gnome_factory_built =  	gnome-factory.h 					gnome-factory-skels.c 					gnome-factory-stubs.c 					gnome-factory-common.c
diff --git a/x11/gnome-libs/patches/patch-au b/x11/gnome-libs/patches/patch-au
new file mode 100644
index 00000000000..d44e5785de7
--- /dev/null
+++ b/x11/gnome-libs/patches/patch-au
@@ -0,0 +1,13 @@
+$NetBSD: patch-au,v 1.1 2001/06/16 20:04:51 jlam Exp $
+
+--- test-gnome/Makefile.in.orig	Fri Mar 16 14:47:36 2001
++++ test-gnome/Makefile.in	Sat Jun 16 09:03:03 2001
+@@ -144,7 +144,7 @@
+ l = @l@
+ need_gnome_support = @need_gnome_support@
+ 
+-INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) 	-I$(top_srcdir)/intl -I$(top_builddir)/intl 	-I$(includedir) $(GDK_IMLIB_CFLAGS) 	-DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" 	-DLOCALEDIR=\""$(gnomelocaledir)"\"
++INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) 	-I$(top_srcdir)/intl -I$(top_builddir)/intl 	$(GDK_IMLIB_CFLAGS) 	-DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" 	-DLOCALEDIR=\""$(gnomelocaledir)"\"
+ 
+ 
+ noinst_PROGRAMS = test-gnome
diff --git a/x11/gnome-libs/patches/patch-av b/x11/gnome-libs/patches/patch-av
new file mode 100644
index 00000000000..4e0acda2eb7
--- /dev/null
+++ b/x11/gnome-libs/patches/patch-av
@@ -0,0 +1,13 @@
+$NetBSD: patch-av,v 1.1 2001/06/16 20:04:52 jlam Exp $
+
+--- test-suite/tests/Makefile.in.orig	Fri Mar 16 14:47:37 2001
++++ test-suite/tests/Makefile.in	Sat Jun 16 09:29:35 2001
+@@ -146,7 +146,7 @@
+ 
+ noinst_PROGRAMS = fileconvert metadata parse-path skel split trigs
+ 
+-INCLUDES =  	-I$(top_builddir) -I$(top_srcdir)		$(SUPPORTINCS)					$(GDK_IMLIB_CFLAGS)				-I$(includedir)					@GTK_CFLAGS@
++INCLUDES =  	-I$(top_builddir) -I$(top_srcdir)		$(SUPPORTINCS)					$(GDK_IMLIB_CFLAGS)				@GTK_CFLAGS@
+ 
+ 
+ LDADD = $(top_builddir)/libgnomeui/libgnomeui.la		$(top_builddir)/libgnome/libgnome.la			$(top_builddir)/libart_lgpl/libart_lgpl.la		@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) $(INTLLIBS)
diff --git a/x11/gnome-libs/patches/patch-aw b/x11/gnome-libs/patches/patch-aw
new file mode 100644
index 00000000000..0da22d2dba5
--- /dev/null
+++ b/x11/gnome-libs/patches/patch-aw
@@ -0,0 +1,13 @@
+$NetBSD: patch-aw,v 1.1 2001/06/16 20:04:52 jlam Exp $
+
+--- tools/convertrgb/Makefile.in.orig	Fri Mar 16 14:47:25 2001
++++ tools/convertrgb/Makefile.in	Sat Jun 16 08:55:45 2001
+@@ -144,7 +144,7 @@
+ l = @l@
+ need_gnome_support = @need_gnome_support@
+ 
+-INCLUDES =          -I$(includedir) @GLIB_CFLAGS@
++INCLUDES =          @GLIB_CFLAGS@
+ 
+ 
+ noinst_PROGRAMS = convertrgb
diff --git a/x11/gnome-libs/patches/patch-ax b/x11/gnome-libs/patches/patch-ax
new file mode 100644
index 00000000000..45557de4b18
--- /dev/null
+++ b/x11/gnome-libs/patches/patch-ax
@@ -0,0 +1,13 @@
+$NetBSD: patch-ax,v 1.1 2001/06/16 20:04:52 jlam Exp $
+
+--- zvt/Makefile.in.orig	Fri Mar 16 14:47:34 2001
++++ zvt/Makefile.in	Sat Jun 16 09:03:34 2001
+@@ -150,7 +150,7 @@
+ 
+ libzvtincludedir = $(includedir)/zvt
+ 
+-INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS)			-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(includedir) $(GTK_CFLAGS)  				$(GDK_IMLIB_CFLAGS)					-DGNOMESBINDIR=\""$(sbindir)"\"
++INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS)			-I$(top_srcdir)/intl -I$(top_builddir)/intl		$(GTK_CFLAGS)  				$(GDK_IMLIB_CFLAGS)					-DGNOMESBINDIR=\""$(sbindir)"\"
+ 
+ 
+ libzvt_la_SOURCES =  	gnome-login-support.h		gnome-login-support.c		lists.c				subshell.h			subshell.c			subshell-includes.h		update.c			vt.c				zvtterm.c