Update to 1.3.4.

Approved by:	maintainer

7 files changed, 55 insertions, 49 deletions

diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile
index 2104fc21b099..141cf7c7c69f 100644
--- a/x11-toolkits/gtk13/Makefile
+++ b/x11-toolkits/gtk13/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTVERSION=	1.3.4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@@ -19,12 +18,14 @@ DISTNAME=	gtk+-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	glib-1.3.2:${PORTSDIR}/devel/glib13 \
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+LIB_DEPENDS=	glib-1.3.4:${PORTSDIR}/devel/glib13 \
 		pango.0:${PORTSDIR}/x11-toolkits/pango \
 		png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		intl.1:${PORTSDIR}/devel/gettext
+RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 NO_LATEST_LINK=	"Unstable, development version."
 USE_X_PREFIX=	yes
@@ -41,6 +42,8 @@ MAN1=		gtk-config-2.0.1
 post-extract:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \
 		xargs ${PERL} -pi -e 's|-lgmodule|\@GMODULE_LIBS\@|g'
+	@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
+		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
 
 pre-build:
 	${RM} -rf ${WRKSRC}/docs/gtk.info*
diff --git a/x11-toolkits/gtk13/distinfo b/x11-toolkits/gtk13/distinfo
index 79177b300d22..daff3ee96489 100644
--- a/x11-toolkits/gtk13/distinfo
+++ b/x11-toolkits/gtk13/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.3.2.tar.gz) = a5d03294104fb4950e93114931209128
+MD5 (gtk+-1.3.4.tar.gz) = 95d17ee35ce43c1109296189d2546c52
diff --git a/x11-toolkits/gtk13/files/patch-ae b/x11-toolkits/gtk13/files/patch-ae
index 162619848409..cd62bea5ac85 100644
--- a/x11-toolkits/gtk13/files/patch-ae
+++ b/x11-toolkits/gtk13/files/patch-ae
@@ -1,6 +1,9 @@
---- configure.orig	Tue Jul 18 13:28:55 2000
-+++ configure	Tue Jul 18 13:31:30 2000
-@@ -3821,7 +3821,7 @@
+
+$FreeBSD$
+
+--- configure.orig	Tue Apr 17 23:13:16 2001
++++ configure	Sun Apr 29 14:55:08 2001
+@@ -3842,7 +3842,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -9,7 +12,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -3831,7 +3831,7 @@
+@@ -3852,7 +3852,7 @@
  	    # Added by Martin Baulig 12/15/98 for libc5 systems
  	    if test "$gt_cv_func_dgettext_libc" != "yes" \
  	       && test "$gt_cv_func_dgettext_libintl" = "yes"; then
@@ -18,11 +21,3 @@
  	       LIBS=`echo $LIBS | sed -e 's/-lintl//'`
  	    fi
  	
-@@ -4598,6 +4598,7 @@
-   glib_thread_cflags="$GLIB_CFLAGS"
-   glib_libs=`$GLIB_CONFIG_2_0 glib gobject gmodule --libs`
-   glib_thread_libs="$GLIB_LIBS"
-+  GLIB_CFLAGS="$glib_cflags"
-   GLIB_LIBS="$glib_libs"
-   GLIB_DEPLIBS="$glib_libs"
- else
diff --git a/x11-toolkits/gtk13/files/patch-ag b/x11-toolkits/gtk13/files/patch-ag
index 5ad8703ea846..5ebe46b50b9a 100644
--- a/x11-toolkits/gtk13/files/patch-ag
+++ b/x11-toolkits/gtk13/files/patch-ag
@@ -1,11 +1,14 @@
---- gtk/Makefile.in.orig	Sat Nov 18 03:17:08 2000
-+++ gtk/Makefile.in	Mon Nov 20 15:30:40 2000
-@@ -164,7 +164,7 @@
+
+$FreeBSD$
+
+--- gtk/Makefile.in.orig	Sun Apr 29 14:57:36 2001
++++ gtk/Makefile.in	Sun Apr 29 14:59:46 2001
+@@ -166,7 +166,7 @@
  
  SUBDIRS = stock-icons
  
--INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_DISABLE_COMPAT_H					-DGTK_EXE_PREFIX=\"$(exec_prefix)\"			-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(sysconfdir)\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-DGTK_VERSION=\"@GTK_VERSION@\"				-DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"		-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_XIM_FLAGS@						@GTK_LOCALE_FLAGS@					@PANGO_CFLAGS@						@GLIB_CFLAGS@						@more_cflags@					@STRIP_END@
-+INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_DISABLE_COMPAT_H					-DGTK_EXE_PREFIX=\"$(exec_prefix)\"			-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-DGTK_VERSION=\"@GTK_VERSION@\"				-DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"		-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_XIM_FLAGS@						@GTK_LOCALE_FLAGS@					@PANGO_CFLAGS@						@GLIB_CFLAGS@						@more_cflags@					@STRIP_END@
+-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_DEBUG_FLAGS@					@GTK_XIM_FLAGS@						@GTK_LOCALE_FLAGS@					@PANGO_CFLAGS@						@GLIB_CFLAGS@						@more_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_DEBUG_FLAGS@					@GTK_XIM_FLAGS@						@GTK_LOCALE_FLAGS@					@PANGO_CFLAGS@						@GLIB_CFLAGS@						@more_cflags@					@STRIP_END@
  
  
  gtarget = @gdktarget@
diff --git a/x11-toolkits/gtk13/files/patch-ah b/x11-toolkits/gtk13/files/patch-ah
index c1c1d5f4c4ab..ff8d93004b4a 100644
--- a/x11-toolkits/gtk13/files/patch-ah
+++ b/x11-toolkits/gtk13/files/patch-ah
@@ -1,6 +1,9 @@
---- docs/Makefile.in.orig	Sat Nov 18 03:17:12 2000
-+++ docs/Makefile.in	Mon Nov 20 15:32:30 2000
-@@ -120,7 +120,7 @@
+
+$FreeBSD$
+
+--- docs/Makefile.in.orig	Sun Apr 29 15:00:49 2001
++++ docs/Makefile.in	Sun Apr 29 15:01:48 2001
+@@ -124,7 +124,7 @@
  LT_RELEASE = @LT_RELEASE@
  LT_REVISION = @LT_REVISION@
  MAINT = @MAINT@
@@ -9,14 +12,14 @@
  MATH_LIB = @MATH_LIB@
  MKINSTALLDIRS = @MKINSTALLDIRS@
  OBJDUMP = @OBJDUMP@
-@@ -162,13 +162,13 @@
+@@ -164,13 +164,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			        gtk-config.txt  	        	gtk-config.1.in				gtkdocs_fix
+ 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
@@ -25,7 +28,7 @@
  man1dir = $(mandir)/man1
  MANS = $(man_MANS)
  
-@@ -191,6 +191,9 @@
+@@ -193,6 +193,9 @@
  
  gtk-config.1: $(top_builddir)/config.status gtk-config.1.in
  	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/x11-toolkits/gtk13/files/patch-aj b/x11-toolkits/gtk13/files/patch-aj
deleted file mode 100644
index d28f0b867d39..000000000000
--- a/x11-toolkits/gtk13/files/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in	2000/11/20 14:46:22	1.1
-+++ Makefile.in	2000/11/20 14:46:25
-@@ -493,7 +493,7 @@
- install-exec-am: install-binSCRIPTS
- install-exec: install-exec-recursive
- 
--install-data-am: install-m4dataDATA install-pkgconfigDATA
-+install-data-am: install-m4dataDATA
- install-data: install-data-recursive
- 
- install-am: all-am
diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist
index 5bf925ac1a89..3d3e71a31031 100644
--- a/x11-toolkits/gtk13/pkg-plist
+++ b/x11-toolkits/gtk13/pkg-plist
@@ -1,4 +1,3 @@
-bin/gtk-config-2.0
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
 bin/make-inline-pixbuf
@@ -6,22 +5,23 @@ 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-features.h
+include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
 include/gtk-2.0/gdk/gdk.h
-include/gtk-2.0/gdk/gdkcc.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
 include/gtk-2.0/gdk/gdkdrawable.h
+include/gtk-2.0/gdk/gdkenumtypes.h
 include/gtk-2.0/gdk/gdkevents.h
 include/gtk-2.0/gdk/gdkfont.h
 include/gtk-2.0/gdk/gdkgc.h
 include/gtk-2.0/gdk/gdki18n.h
-include/gtk-2.0/gdk/gdkim.h
 include/gtk-2.0/gdk/gdkimage.h
 include/gtk-2.0/gdk/gdkinput.h
+include/gtk-2.0/gdk/gdkkeys.h
 include/gtk-2.0/gdk/gdkkeysyms.h
 include/gtk-2.0/gdk/gdkpango.h
 include/gtk-2.0/gdk/gdkpixbuf.h
@@ -38,7 +38,6 @@ 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/gdk-pixbuf-loader.h
 include/gtk-2.0/gtk/gdkconfig.h
 include/gtk-2.0/gtk/gtk.h
 include/gtk-2.0/gtk/gtkaccelgroup.h
@@ -70,7 +69,6 @@ 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
-include/gtk-2.0/gtk/gtkdata.h
 include/gtk-2.0/gtk/gtkdebug.h
 include/gtk-2.0/gtk/gtkdialog.h
 include/gtk-2.0/gtk/gtkdnd.h
@@ -96,6 +94,7 @@ include/gtk-2.0/gtk/gtkhseparator.h
 include/gtk-2.0/gtk/gtkhsv.h
 include/gtk-2.0/gtk/gtkiconfactory.h
 include/gtk-2.0/gtk/gtkimage.h
+include/gtk-2.0/gtk/gtkimagemenuitem.h
 include/gtk-2.0/gtk/gtkimcontext.h
 include/gtk-2.0/gtk/gtkimmodule.h
 include/gtk-2.0/gtk/gtkimmulticontext.h
@@ -112,12 +111,10 @@ include/gtk-2.0/gtk/gtkmain.h
 include/gtk-2.0/gtk/gtkmarshal.h
 include/gtk-2.0/gtk/gtkmenu.h
 include/gtk-2.0/gtk/gtkmenubar.h
-include/gtk-2.0/gtk/gtkmenufactory.h
 include/gtk-2.0/gtk/gtkmenuitem.h
 include/gtk-2.0/gtk/gtkmenushell.h
 include/gtk-2.0/gtk/gtkmessagedialog.h
 include/gtk-2.0/gtk/gtkmisc.h
-include/gtk-2.0/gtk/gtkmodelsimple.h
 include/gtk-2.0/gtk/gtknotebook.h
 include/gtk-2.0/gtk/gtkobject.h
 include/gtk-2.0/gtk/gtkoldeditable.h
@@ -140,6 +137,8 @@ include/gtk-2.0/gtk/gtkscrollbar.h
 include/gtk-2.0/gtk/gtkscrolledwindow.h
 include/gtk-2.0/gtk/gtkselection.h
 include/gtk-2.0/gtk/gtkseparator.h
+include/gtk-2.0/gtk/gtkseparatormenuitem.h
+include/gtk-2.0/gtk/gtksettings.h
 include/gtk-2.0/gtk/gtksignal.h
 include/gtk-2.0/gtk/gtksocket.h
 include/gtk-2.0/gtk/gtkspinbutton.h
@@ -163,10 +162,12 @@ include/gtk-2.0/gtk/gtktogglebutton.h
 include/gtk-2.0/gtk/gtktoolbar.h
 include/gtk-2.0/gtk/gtktooltips.h
 include/gtk-2.0/gtk/gtktree.h
+include/gtk-2.0/gtk/gtktreednd.h
 include/gtk-2.0/gtk/gtktreeitem.h
 include/gtk-2.0/gtk/gtktreemodel.h
 include/gtk-2.0/gtk/gtktreemodelsort.h
 include/gtk-2.0/gtk/gtktreeselection.h
+include/gtk-2.0/gtk/gtktreesortable.h
 include/gtk-2.0/gtk/gtktreestore.h
 include/gtk-2.0/gtk/gtktreeview.h
 include/gtk-2.0/gtk/gtktreeviewcolumn.h
@@ -184,6 +185,7 @@ include/gtk-2.0/gtk/gtkwidget.h
 include/gtk-2.0/gtk/gtkwindow.h
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
@@ -196,25 +198,35 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so
+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-xbm.so.1
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
 lib/libgdk-x11-1.3.a
 lib/libgdk-x11-1.3.so
-lib/libgdk-x11-1.3.so.2
+lib/libgdk-x11-1.3.so.4
 lib/libgdk_pixbuf-1.3.a
 lib/libgdk_pixbuf-1.3.so
-lib/libgdk_pixbuf-1.3.so.2
+lib/libgdk_pixbuf-1.3.so.4
 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.2
+lib/libgtk-x11-1.3.so.4
+libdata/pkgconfig/gdk-2.0.pc
+libdata/pkgconfig/gdk-pixbuf-2.0.pc
+libdata/pkgconfig/gdk-x11-2.0.pc
+libdata/pkgconfig/gtk+-2.0.pc
+libdata/pkgconfig/gtk+-x11-2.0.pc
 share/aclocal/gtk-2.0.m4
 share/gtk-2.0/demo/button_box.c
+share/gtk-2.0/demo/dialog.c
 share/gtk-2.0/demo/item_factory.c
 share/gtk-2.0/demo/menus.c
 share/gtk-2.0/demo/panes.c
 share/gtk-2.0/demo/textview.c
+share/locale/az/LC_MESSAGES/gtk20.mo
 share/locale/ca/LC_MESSAGES/gtk20.mo
 share/locale/cs/LC_MESSAGES/gtk20.mo
 share/locale/da/LC_MESSAGES/gtk20.mo
@@ -239,6 +251,7 @@ share/locale/ja/LC_MESSAGES/gtk20.mo
 share/locale/ko/LC_MESSAGES/gtk20.mo
 share/locale/lt/LC_MESSAGES/gtk20.mo
 share/locale/nl/LC_MESSAGES/gtk20.mo
+share/locale/nn/LC_MESSAGES/gtk20.mo
 share/locale/no/LC_MESSAGES/gtk20.mo
 share/locale/pl/LC_MESSAGES/gtk20.mo
 share/locale/pt/LC_MESSAGES/gtk20.mo
@@ -252,10 +265,10 @@ share/locale/sr/LC_MESSAGES/gtk20.mo
 share/locale/sv/LC_MESSAGES/gtk20.mo
 share/locale/tr/LC_MESSAGES/gtk20.mo
 share/locale/uk/LC_MESSAGES/gtk20.mo
+share/locale/vi/LC_MESSAGES/gtk20.mo
 share/locale/wa/LC_MESSAGES/gtk20.mo
 share/locale/zh_CN/LC_MESSAGES/gtk20.mo
 share/locale/zh_TW/LC_MESSAGES/gtk20.mo
-share/themes/Default/gtk-2.0/gtkrc
 @dirrm share/themes/Default/gtk-2.0
 @dirrm share/themes/Default
 @dirrm share/gtk-2.0/demo