Update to 1.3.9.

6 files changed, 49 insertions, 76 deletions

diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index a6dcb4e23d2a..c1b8ac4b55b9 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	1.3.6
+PORTVERSION=	1.3.9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@@ -19,8 +19,8 @@ DISTNAME=	gtk+-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	glib-1.3.6:${PORTSDIR}/devel/glib13 \
-		atk.2:${PORTSDIR}/devel/atk \
+LIB_DEPENDS=	glib-1.3.9:${PORTSDIR}/devel/glib13 \
+		atk.5:${PORTSDIR}/devel/atk \
 		pango.0:${PORTSDIR}/x11-toolkits/pango \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
@@ -38,7 +38,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 PLIST_SUB=	GTK_VERSION="${PORTVERSION}"
 
-MAN1=		gtk-config-2.0.1
+MAN1=		gdk-pixbuf-csource.1
 
 post-extract:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 0e9ba5742a08..9862e28b26c3 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.3.6.tar.gz) = ba55389ec8a540d5f489a92d58bfc1a3
+MD5 (gtk+-1.3.9.tar.gz) = 741bb0a9caf3d9c4f44a4a4458c07501
diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad
index 592577b0bd6c..9c59e21c2577 100644
--- a/x11-toolkits/gtk20/files/patch-ad
+++ b/x11-toolkits/gtk20/files/patch-ad
@@ -1,23 +1,23 @@
 
 $FreeBSD$
 
---- gtk/gtkrc.c.orig	Sun Apr 29 00:15:37 2001
-+++ gtk/gtkrc.c	Mon May 14 14:49:02 2001
-@@ -333,7 +333,7 @@
+--- gtk/gtkrc.c.orig	Fri Sep 21 22:06:14 2001
++++ gtk/gtkrc.c	Wed Oct 24 10:31:00 2001
+@@ -359,7 +359,7 @@
  	result = g_strdup (im_module_file);
        else
  #ifndef G_OS_WIN32
--	result = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules");
-+	result = g_strdup (GTK_DATA_PREFIX G_DIR_SEPARATOR_S "etc" G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules");
+-	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);
  #else
- 	result = g_strdup_printf ("%s\\gtk.immodules", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ()));
+ 	result = g_build_filename (get_gtk_win32_directory ("gtk-2.0"), "gtk.immodules", NULL);
  #endif
-@@ -439,7 +439,7 @@
+@@ -453,7 +453,7 @@
    else
      {
  #ifndef G_OS_WIN32
--      str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc");
-+      str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtkrc");
+-      str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
++      str = g_build_filename (GTK_SYSCONFDIR, "gtkrc", NULL);
  #else
-       str = g_strdup_printf ("%s\\gtkrc", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ()));
+       str = g_build_filename (get_gtk_win32_directory (""), "gtkrc", NULL);
  #endif
diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag
index 80e8096f3e26..a7e7df3d7490 100644
--- a/x11-toolkits/gtk20/files/patch-ag
+++ b/x11-toolkits/gtk20/files/patch-ag
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- gtk/Makefile.in.orig	Mon May 14 13:48:47 2001
-+++ gtk/Makefile.in	Mon May 14 13:50:45 2001
-@@ -158,7 +158,7 @@
+--- gtk/Makefile.in.orig	Wed Oct 24 10:31:32 2001
++++ gtk/Makefile.in	Wed Oct 24 10:33:05 2001
+@@ -166,7 +166,7 @@
  
  SUBDIRS = stock-icons
  
--INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_DISABLE_COMPAT_H					-DGTK_LIBDIR=\"$(libdir)\"				-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(sysconfdir)\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-DGTK_VERSION=\"@GTK_VERSION@\"				-DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"		-DG_DISABLE_CONST_RETURNS				-I$(top_builddir)/gtk					-I$(top_srcdir) -I../gdk				-I$(top_srcdir)/gdk					-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf		@GTK_DEP_CFLAGS@				@STRIP_END@
-+INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_DISABLE_COMPAT_H					-DGTK_LIBDIR=\"$(libdir)\"				-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-DGTK_VERSION=\"@GTK_VERSION@\"				-DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"		-DG_DISABLE_CONST_RETURNS				-I$(top_builddir)/gtk					-I$(top_srcdir) -I../gdk				-I$(top_srcdir)/gdk					-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf		@GTK_DEP_CFLAGS@				@STRIP_END@
+-INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_LIBDIR=\"$(libdir)\"				-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(sysconfdir)\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-DGTK_VERSION=\"@GTK_VERSION@\"				-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"		-DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"		-DG_DISABLE_CONST_RETURNS				-I$(top_builddir)/gtk					-I$(top_srcdir) -I../gdk				-I$(top_srcdir)/gdk					-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf		@GTK_DEBUG_FLAGS@					@GTK_DEP_CFLAGS@				@STRIP_END@
++INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_LIBDIR=\"$(libdir)\"				-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-DGTK_VERSION=\"@GTK_VERSION@\"				-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"		-DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"		-DG_DISABLE_CONST_RETURNS				-I$(top_builddir)/gtk					-I$(top_srcdir) -I../gdk				-I$(top_srcdir)/gdk					-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf		@GTK_DEBUG_FLAGS@					@GTK_DEP_CFLAGS@				@STRIP_END@
  
  
  gtarget = @gdktarget@
diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah
index e2d0389ddd02..32c2663f049f 100644
--- a/x11-toolkits/gtk20/files/patch-ah
+++ b/x11-toolkits/gtk20/files/patch-ah
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- docs/Makefile.in.orig	Mon May 14 13:52:10 2001
-+++ docs/Makefile.in	Mon May 14 13:52:40 2001
-@@ -130,7 +130,7 @@
+--- docs/Makefile.in.orig	Wed Oct 24 10:33:45 2001
++++ docs/Makefile.in	Wed Oct 24 10:33:46 2001
+@@ -136,7 +136,7 @@
  LT_RELEASE = @LT_RELEASE@
  LT_REVISION = @LT_REVISION@
  MAINT = @MAINT@
@@ -11,30 +11,4 @@ $FreeBSD$
 +MAKEINFO = @MAKEINFO@ --no-split
  MKINSTALLDIRS = @MKINSTALLDIRS@
  OBJDUMP = @OBJDUMP@
- PACKAGE = @PACKAGE@
-@@ -156,13 +156,13 @@
- 
- SUBDIRS = tutorial faq reference
- 
--man_MANS = gtk-config.1
-+man_MANS = gtk-config-2.0.1
- 
- EXTRA_DIST =  	Changes-1.2.txt				Changes-2.0.txt				debugging.txt				defsformat.txt				developers.txt				dnd_internals.txt			make-todo				refcounting.txt				styles.txt				text_widget.txt 			widget_system.txt 			generation.txt			        README.linux-fb  	                gtk-config.txt  	        	gtk-config.1.in				gtkdocs_fix
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES =  gtk-config.1
-+CONFIG_CLEAN_FILES =  gtk-config-2.0.1
- man1dir = $(mandir)/man1
- MANS = $(man_MANS)
- 
-@@ -185,6 +185,9 @@
- 
- gtk-config.1: $(top_builddir)/config.status gtk-config.1.in
- 	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+gtk-config-2.0.1: gtk-config.1
-+	cp gtk-config.1 gtk-config-2.0.1
- 
- install-man1:
- 	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+ OBJEXT = @OBJEXT@
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 7c5cca7ce9a3..2bf7bf0ed34f 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,15 +1,17 @@
+bin/gdk-pixbuf-csource
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
-bin/make-inline-pixbuf
 etc/gtk-2.0/gtk.immodules
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
+include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
+include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
+include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
 include/gtk-2.0/gdk/gdk.h
 include/gtk-2.0/gdk/gdkcolor.h
-include/gtk-2.0/gdk/gdkcompat.h
 include/gtk-2.0/gdk/gdkcursor.h
 include/gtk-2.0/gdk/gdkcursors.h
 include/gtk-2.0/gdk/gdkdnd.h
@@ -35,9 +37,6 @@ include/gtk-2.0/gdk/gdktypes.h
 include/gtk-2.0/gdk/gdkvisual.h
 include/gtk-2.0/gdk/gdkwindow.h
 include/gtk-2.0/gdk/gdkx.h
-include/gtk-2.0/gdk/x11/gdkdrawable-x11.h
-include/gtk-2.0/gdk/x11/gdkpixmap-x11.h
-include/gtk-2.0/gdk/x11/gdkwindow-x11.h
 include/gtk-2.0/gtk/gdkconfig.h
 include/gtk-2.0/gtk/gtk.h
 include/gtk-2.0/gtk/gtkaccelgroup.h
@@ -45,7 +44,6 @@ include/gtk-2.0/gtk/gtkaccellabel.h
 include/gtk-2.0/gtk/gtkaccessible.h
 include/gtk-2.0/gtk/gtkadjustment.h
 include/gtk-2.0/gtk/gtkalignment.h
-include/gtk-2.0/gtk/gtkarg.h
 include/gtk-2.0/gtk/gtkarrow.h
 include/gtk-2.0/gtk/gtkaspectframe.h
 include/gtk-2.0/gtk/gtkbbox.h
@@ -54,10 +52,10 @@ include/gtk-2.0/gtk/gtkbindings.h
 include/gtk-2.0/gtk/gtkbox.h
 include/gtk-2.0/gtk/gtkbutton.h
 include/gtk-2.0/gtk/gtkcalendar.h
+include/gtk-2.0/gtk/gtkcelleditable.h
 include/gtk-2.0/gtk/gtkcellrenderer.h
 include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
 include/gtk-2.0/gtk/gtkcellrenderertext.h
-include/gtk-2.0/gtk/gtkcellrenderertextpixbuf.h
 include/gtk-2.0/gtk/gtkcellrenderertoggle.h
 include/gtk-2.0/gtk/gtkcheckbutton.h
 include/gtk-2.0/gtk/gtkcheckmenuitem.h
@@ -66,7 +64,6 @@ include/gtk-2.0/gtk/gtkclist.h
 include/gtk-2.0/gtk/gtkcolorsel.h
 include/gtk-2.0/gtk/gtkcolorseldialog.h
 include/gtk-2.0/gtk/gtkcombo.h
-include/gtk-2.0/gtk/gtkcompat.h
 include/gtk-2.0/gtk/gtkcontainer.h
 include/gtk-2.0/gtk/gtkctree.h
 include/gtk-2.0/gtk/gtkcurve.h
@@ -120,7 +117,6 @@ include/gtk-2.0/gtk/gtknotebook.h
 include/gtk-2.0/gtk/gtkobject.h
 include/gtk-2.0/gtk/gtkoldeditable.h
 include/gtk-2.0/gtk/gtkoptionmenu.h
-include/gtk-2.0/gtk/gtkpacker.h
 include/gtk-2.0/gtk/gtkpaned.h
 include/gtk-2.0/gtk/gtkpixmap.h
 include/gtk-2.0/gtk/gtkplug.h
@@ -177,6 +173,7 @@ include/gtk-2.0/gtk/gtktypebuiltins.h
 include/gtk-2.0/gtk/gtktypeutils.h
 include/gtk-2.0/gtk/gtkvbbox.h
 include/gtk-2.0/gtk/gtkvbox.h
+include/gtk-2.0/gtk/gtkversion.h
 include/gtk-2.0/gtk/gtkviewport.h
 include/gtk-2.0/gtk/gtkvpaned.h
 include/gtk-2.0/gtk/gtkvruler.h
@@ -185,18 +182,6 @@ include/gtk-2.0/gtk/gtkvscrollbar.h
 include/gtk-2.0/gtk/gtkvseparator.h
 include/gtk-2.0/gtk/gtkwidget.h
 include/gtk-2.0/gtk/gtkwindow.h
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a
@@ -211,6 +196,8 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a
@@ -219,18 +206,30 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
+lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-cyrillic-translit.a
+lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-cyrillic-translit.so
+lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-inuktitut.a
+lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-inuktitut.so
+lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ipa.a
+lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ipa.so
+lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-thai-broken.a
+lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-thai-broken.so
+lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-viqr.a
+lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-viqr.so
+lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-xim.a
+lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-xim.so
 lib/libgdk-x11-1.3.a
 lib/libgdk-x11-1.3.so
-lib/libgdk-x11-1.3.so.6
+lib/libgdk-x11-1.3.so.9
 lib/libgdk_pixbuf-1.3.a
 lib/libgdk_pixbuf-1.3.so
-lib/libgdk_pixbuf-1.3.so.6
+lib/libgdk_pixbuf-1.3.so.9
 lib/libgdk_pixbuf_xlib-1.3.a
 lib/libgdk_pixbuf_xlib-1.3.so
 lib/libgdk_pixbuf_xlib-1.3.so.0
 lib/libgtk-x11-1.3.a
 lib/libgtk-x11-1.3.so
-lib/libgtk-x11-1.3.so.6
+lib/libgtk-x11-1.3.so.9
 libdata/pkgconfig/gdk-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
 libdata/pkgconfig/gdk-x11-2.0.pc
@@ -309,12 +308,12 @@ share/locale/zh_TW/LC_MESSAGES/gtk20.mo
 @dirrm share/themes/Default
 @dirrm share/gtk-2.0/demo
 @dirrm share/gtk-2.0
+@dirrm lib/gtk-2.0/immodules/%%GTK_VERSION%%
+@dirrm lib/gtk-2.0/immodules
 @dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders
-@dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules
 @dirrm lib/gtk-2.0/%%GTK_VERSION%%
 @dirrm lib/gtk-2.0
 @dirrm include/gtk-2.0/gtk
-@dirrm include/gtk-2.0/gdk/x11
 @dirrm include/gtk-2.0/gdk-pixbuf-xlib
 @dirrm include/gtk-2.0/gdk-pixbuf
 @dirrm include/gtk-2.0/gdk