Update to 2.3.0.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1297 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 115 insertions, 0 deletions

diff --git a/x11-toolkits/gtk20/files/patch-Makefile.in b/x11-toolkits/gtk20/files/patch-Makefile.in
new file mode 100644
index 000000000..27096d3af
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD: ports/x11-toolkits/gtk20/files/patch-Makefile.in,v 1.2 2003/02/07 18:42:22 marcus Exp $
+
+--- Makefile.in	2002/02/12 13:29:11	1.1
++++ Makefile.in	2002/02/12 13:29:28
+@@ -168,7 +168,7 @@
+ ms_librarian = @ms_librarian@
+ xinput_progs = @xinput_progs@
+ 
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules contrib
+ SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
+ 
+ # require automake 1.4
diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad
new file mode 100644
index 000000000..856950d64
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ad
@@ -0,0 +1,23 @@
+
+$FreeBSD: ports/x11-toolkits/gtk20/files/patch-ad,v 1.12 2003/02/07 18:42:22 marcus Exp $
+
+--- gtk/gtkrc.c.orig	Thu Dec 13 21:51:18 2001
++++ gtk/gtkrc.c	Fri Jan 18 11:14:14 2002
+@@ -336,7 +336,7 @@
+       if (im_module_file)
+ 	result = g_strdup (im_module_file);
+       else
+-	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
++	result = g_build_filename (GTK_DATA_PREFIX, "etc", "gtk-2.0", "gtk.immodules", NULL);
+     }
+ 
+   return result;
+@@ -418,7 +418,7 @@
+     }
+   else
+     {
+-      str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
++      str = g_build_filename (GTK_SYSCONFDIR, "gtk", NULL);
+ 
+       gtk_rc_add_default_file (str);
+       g_free (str);
diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae
new file mode 100644
index 000000000..f195f07b4
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ae
@@ -0,0 +1,10 @@
+--- configure.orig	Wed Dec 11 18:31:51 2002
++++ configure	Thu Dec 12 12:07:17 2002
+@@ -7414,6 +7414,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag
new file mode 100644
index 000000000..b34d2b3f2
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ag
@@ -0,0 +1,19 @@
+--- gtk/Makefile.in.orig	Fri Oct 24 21:45:12 2003
++++ gtk/Makefile.in	Fri Oct 24 21:46:49 2003
+@@ -301,7 +301,7 @@
+ 	-DGTK_LIBDIR=\"$(libdir)\"			\
+ 	-DGTK_DATADIR=\"$(datadir)\"			\
+ 	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
+-	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
++	-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"	\
+ 	-DGTK_VERSION=\"$(GTK_VERSION)\"		\
+ 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
+ 	-DGTK_HOST=\"$(host)\"				\
+@@ -856,6 +856,7 @@
+ TEST_DEPS = $(DEPS) gtk.immodules
+ 
+ LDADDS = \
++	$(GLIB_LIBS)							\
+ 	$(gtktargetlib)							\
+ 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+ 	$(top_builddir)/gdk/$(gdktargetlib)
diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah
new file mode 100644
index 000000000..88bfe209d
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ah
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig	Fri Oct 24 21:47:52 2003
++++ docs/Makefile.in	Fri Oct 24 23:35:09 2003
+@@ -179,7 +179,7 @@
+ MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = @MAKEINFO@ --no-split
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@
diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai
new file mode 100644
index 000000000..a04d08ef5
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ai
@@ -0,0 +1,11 @@
+--- docs/reference/Makefile.in.orig	Fri Oct 24 23:38:06 2003
++++ docs/reference/Makefile.in	Fri Oct 24 23:48:00 2003
+@@ -286,7 +286,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-SUBDIRS = gdk-pixbuf gdk gtk
++SUBDIRS = #gdk-pixbuf gdk gtk
+ subdir = docs/reference
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak
new file mode 100644
index 000000000..a682acb21
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ak
@@ -0,0 +1,14 @@
+
+$FreeBSD: ports/x11-toolkits/gtk20/files/patch-ak,v 1.4 2003/02/07 18:42:22 marcus Exp $
+
+--- gdk/Makefile.in.orig	Thu Feb 14 12:38:26 2002
++++ gdk/Makefile.in	Thu Feb 14 12:45:37 2002
+@@ -315,7 +315,7 @@
+ #
+ # Rule to install gdkconfig.h header file
+ #
+-configexecincludedir = $(libdir)/gtk-2.0/include
++configexecincludedir = $(prefix)/include/gtk-2.0
+ 
+ #note: not gdkconfig.h
+ BUILT_SOURCES = stamp-gc-h @REBUILD@ gdkenumtypes.c gdkenumtypes.h
diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
new file mode 100644
index 000000000..fa3e1270f
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
@@ -0,0 +1,13 @@
+--- gdk-pixbuf/Makefile.in.orig	Sat May  3 02:51:31 2003
++++ gdk-pixbuf/Makefile.in	Sat May  3 02:51:59 2003
+@@ -384,7 +384,9 @@
+ 
+ 
+ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
+-LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
++LDADDS = \
++	 $(GLIB_LIBS)				\
++	 libgdk_pixbuf-$(GTK_API_VERSION).la
+ 
+ noinst_PROGRAMS = test-gdk-pixbuf
+ test_gdk_pixbuf_LDADD = $(LDADDS)