Update to 1.3.6.

12 files changed, 147 insertions, 30 deletions

diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile
index fbc0068baea1..84bb0a63bd8c 100644
--- a/x11-toolkits/gtk13/Makefile
+++ b/x11-toolkits/gtk13/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	1.3.5
+PORTVERSION=	1.3.6
 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.5:${PORTSDIR}/devel/glib13 \
-		atk.0:${PORTSDIR}/devel/atk \
+LIB_DEPENDS=	glib-1.3.6:${PORTSDIR}/devel/glib13 \
+		atk.2:${PORTSDIR}/devel/atk \
 		pango.0:${PORTSDIR}/x11-toolkits/pango \
 		png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
@@ -32,8 +32,8 @@ NO_LATEST_LINK=	"Unstable, development version."
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_PERL5=	yes
-USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 PLIST_SUB=	GTK_VERSION="${PORTVERSION}"
diff --git a/x11-toolkits/gtk13/distinfo b/x11-toolkits/gtk13/distinfo
index 9ead9e2f1a95..0e9ba5742a08 100644
--- a/x11-toolkits/gtk13/distinfo
+++ b/x11-toolkits/gtk13/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.3.5.tar.gz) = 17a6f0453cfd79e5b99bcbc4ebbb45df
+MD5 (gtk+-1.3.6.tar.gz) = ba55389ec8a540d5f489a92d58bfc1a3
diff --git a/x11-toolkits/gtk13/files/patch-ltmain.sh b/x11-toolkits/gtk13/files/patch-ltmain.sh
new file mode 100644
index 000000000000..0c594216b0e1
--- /dev/null
+++ b/x11-toolkits/gtk13/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/07/23 09:45:58	1.1
++++ ltmain.sh	2001/07/23 09:46:28
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist
index 95f40dd604ac..7c5cca7ce9a3 100644
--- a/x11-toolkits/gtk13/pkg-plist
+++ b/x11-toolkits/gtk13/pkg-plist
@@ -8,7 +8,6 @@ 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/gtk/gtkaccessible.h
 include/gtk-2.0/gdk/gdkcolor.h
 include/gtk-2.0/gdk/gdkcompat.h
 include/gtk-2.0/gdk/gdkcursor.h
@@ -43,6 +42,7 @@ include/gtk-2.0/gtk/gdkconfig.h
 include/gtk-2.0/gtk/gtk.h
 include/gtk-2.0/gtk/gtkaccelgroup.h
 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
@@ -141,6 +141,7 @@ 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/gtksizegroup.h
 include/gtk-2.0/gtk/gtksocket.h
 include/gtk-2.0/gtk/gtkspinbutton.h
 include/gtk-2.0/gtk/gtkstatusbar.h
@@ -184,49 +185,67 @@ 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
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
+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-tiff.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a
 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.a
 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.5
+lib/libgdk-x11-1.3.so.6
 lib/libgdk_pixbuf-1.3.a
 lib/libgdk_pixbuf-1.3.so
-lib/libgdk_pixbuf-1.3.so.5
+lib/libgdk_pixbuf-1.3.so.6
 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.5
+lib/libgtk-x11-1.3.so.6
 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/alphatest.png
 share/gtk-2.0/demo/apple-red.png
+share/gtk-2.0/demo/appwindow.c
 share/gtk-2.0/demo/background.jpg
 share/gtk-2.0/demo/button_box.c
 share/gtk-2.0/demo/colorsel.c
 share/gtk-2.0/demo/dialog.c
 share/gtk-2.0/demo/drawingarea.c
+share/gtk-2.0/demo/floppybuddy.gif
 share/gtk-2.0/demo/gnome-applets.png
 share/gtk-2.0/demo/gnome-calendar.png
 share/gtk-2.0/demo/gnome-foot.png
@@ -240,6 +259,8 @@ 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/pixbufs.c
+share/gtk-2.0/demo/sizegroup.c
+share/gtk-2.0/demo/stock_browser.c
 share/gtk-2.0/demo/textview.c
 share/locale/az/LC_MESSAGES/gtk20.mo
 share/locale/ca/LC_MESSAGES/gtk20.mo
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index fbc0068baea1..84bb0a63bd8c 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	1.3.5
+PORTVERSION=	1.3.6
 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.5:${PORTSDIR}/devel/glib13 \
-		atk.0:${PORTSDIR}/devel/atk \
+LIB_DEPENDS=	glib-1.3.6:${PORTSDIR}/devel/glib13 \
+		atk.2:${PORTSDIR}/devel/atk \
 		pango.0:${PORTSDIR}/x11-toolkits/pango \
 		png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
@@ -32,8 +32,8 @@ NO_LATEST_LINK=	"Unstable, development version."
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_PERL5=	yes
-USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 PLIST_SUB=	GTK_VERSION="${PORTVERSION}"
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 9ead9e2f1a95..0e9ba5742a08 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.3.5.tar.gz) = 17a6f0453cfd79e5b99bcbc4ebbb45df
+MD5 (gtk+-1.3.6.tar.gz) = ba55389ec8a540d5f489a92d58bfc1a3
diff --git a/x11-toolkits/gtk20/files/patch-ltmain.sh b/x11-toolkits/gtk20/files/patch-ltmain.sh
new file mode 100644
index 000000000000..0c594216b0e1
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/07/23 09:45:58	1.1
++++ ltmain.sh	2001/07/23 09:46:28
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 95f40dd604ac..7c5cca7ce9a3 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -8,7 +8,6 @@ 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/gtk/gtkaccessible.h
 include/gtk-2.0/gdk/gdkcolor.h
 include/gtk-2.0/gdk/gdkcompat.h
 include/gtk-2.0/gdk/gdkcursor.h
@@ -43,6 +42,7 @@ include/gtk-2.0/gtk/gdkconfig.h
 include/gtk-2.0/gtk/gtk.h
 include/gtk-2.0/gtk/gtkaccelgroup.h
 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
@@ -141,6 +141,7 @@ 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/gtksizegroup.h
 include/gtk-2.0/gtk/gtksocket.h
 include/gtk-2.0/gtk/gtkspinbutton.h
 include/gtk-2.0/gtk/gtkstatusbar.h
@@ -184,49 +185,67 @@ 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
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
+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-tiff.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a
 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.a
 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.5
+lib/libgdk-x11-1.3.so.6
 lib/libgdk_pixbuf-1.3.a
 lib/libgdk_pixbuf-1.3.so
-lib/libgdk_pixbuf-1.3.so.5
+lib/libgdk_pixbuf-1.3.so.6
 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.5
+lib/libgtk-x11-1.3.so.6
 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/alphatest.png
 share/gtk-2.0/demo/apple-red.png
+share/gtk-2.0/demo/appwindow.c
 share/gtk-2.0/demo/background.jpg
 share/gtk-2.0/demo/button_box.c
 share/gtk-2.0/demo/colorsel.c
 share/gtk-2.0/demo/dialog.c
 share/gtk-2.0/demo/drawingarea.c
+share/gtk-2.0/demo/floppybuddy.gif
 share/gtk-2.0/demo/gnome-applets.png
 share/gtk-2.0/demo/gnome-calendar.png
 share/gtk-2.0/demo/gnome-foot.png
@@ -240,6 +259,8 @@ 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/pixbufs.c
+share/gtk-2.0/demo/sizegroup.c
+share/gtk-2.0/demo/stock_browser.c
 share/gtk-2.0/demo/textview.c
 share/locale/az/LC_MESSAGES/gtk20.mo
 share/locale/ca/LC_MESSAGES/gtk20.mo
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index fbc0068baea1..84bb0a63bd8c 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	1.3.5
+PORTVERSION=	1.3.6
 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.5:${PORTSDIR}/devel/glib13 \
-		atk.0:${PORTSDIR}/devel/atk \
+LIB_DEPENDS=	glib-1.3.6:${PORTSDIR}/devel/glib13 \
+		atk.2:${PORTSDIR}/devel/atk \
 		pango.0:${PORTSDIR}/x11-toolkits/pango \
 		png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
@@ -32,8 +32,8 @@ NO_LATEST_LINK=	"Unstable, development version."
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_PERL5=	yes
-USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 PLIST_SUB=	GTK_VERSION="${PORTVERSION}"
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 9ead9e2f1a95..0e9ba5742a08 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.3.5.tar.gz) = 17a6f0453cfd79e5b99bcbc4ebbb45df
+MD5 (gtk+-1.3.6.tar.gz) = ba55389ec8a540d5f489a92d58bfc1a3
diff --git a/x11-toolkits/gtk30/files/patch-ltmain.sh b/x11-toolkits/gtk30/files/patch-ltmain.sh
new file mode 100644
index 000000000000..0c594216b0e1
--- /dev/null
+++ b/x11-toolkits/gtk30/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/07/23 09:45:58	1.1
++++ ltmain.sh	2001/07/23 09:46:28
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 95f40dd604ac..7c5cca7ce9a3 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -8,7 +8,6 @@ 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/gtk/gtkaccessible.h
 include/gtk-2.0/gdk/gdkcolor.h
 include/gtk-2.0/gdk/gdkcompat.h
 include/gtk-2.0/gdk/gdkcursor.h
@@ -43,6 +42,7 @@ include/gtk-2.0/gtk/gdkconfig.h
 include/gtk-2.0/gtk/gtk.h
 include/gtk-2.0/gtk/gtkaccelgroup.h
 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
@@ -141,6 +141,7 @@ 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/gtksizegroup.h
 include/gtk-2.0/gtk/gtksocket.h
 include/gtk-2.0/gtk/gtkspinbutton.h
 include/gtk-2.0/gtk/gtkstatusbar.h
@@ -184,49 +185,67 @@ 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
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
+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-tiff.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a
 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.a
 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.5
+lib/libgdk-x11-1.3.so.6
 lib/libgdk_pixbuf-1.3.a
 lib/libgdk_pixbuf-1.3.so
-lib/libgdk_pixbuf-1.3.so.5
+lib/libgdk_pixbuf-1.3.so.6
 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.5
+lib/libgtk-x11-1.3.so.6
 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/alphatest.png
 share/gtk-2.0/demo/apple-red.png
+share/gtk-2.0/demo/appwindow.c
 share/gtk-2.0/demo/background.jpg
 share/gtk-2.0/demo/button_box.c
 share/gtk-2.0/demo/colorsel.c
 share/gtk-2.0/demo/dialog.c
 share/gtk-2.0/demo/drawingarea.c
+share/gtk-2.0/demo/floppybuddy.gif
 share/gtk-2.0/demo/gnome-applets.png
 share/gtk-2.0/demo/gnome-calendar.png
 share/gtk-2.0/demo/gnome-foot.png
@@ -240,6 +259,8 @@ 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/pixbufs.c
+share/gtk-2.0/demo/sizegroup.c
+share/gtk-2.0/demo/stock_browser.c
 share/gtk-2.0/demo/textview.c
 share/locale/az/LC_MESSAGES/gtk20.mo
 share/locale/ca/LC_MESSAGES/gtk20.mo