8 files changed, 46 insertions, 44 deletions

diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 6e68aa5b0bec..06f529bf6283 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.0.2
+PORTVERSION=	2.0.3
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020525,} \
+MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v2.0/ \
+		${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020525,} \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 9ed7ac4e0f57..3ba12f41a23e 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtk+-2.0.2.tar.bz2) = b8df4c513323b9efc9a157703f25a07f
+MD5 (gnome2/gtk+-2.0.3.tar.bz2) = ede2b96a3de02b5e2c29de741529b358
diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae
index dcab8a06d6e8..591824a7d638 100644
--- a/x11-toolkits/gtk20/files/patch-ae
+++ b/x11-toolkits/gtk20/files/patch-ae
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Apr  2 14:45:37 2002
-+++ configure	Fri Apr 26 11:36:40 2002
-@@ -5671,6 +5671,7 @@
+--- configure.orig	Thu May 23 17:20:40 2002
++++ configure	Sat Jun  1 14:26:00 2002
+@@ -7192,6 +7192,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +11,12 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7864,7 +7865,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
+@@ -10107,7 +10108,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ CATOBJEXT=.mo
 -	         DATADIRNAME=lib
 +	         DATADIRNAME=share
  fi
- rm -f conftest*
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  	      INSTOBJEXT=.mo
diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag
index bbdd42614731..b3df848c80aa 100644
--- a/x11-toolkits/gtk20/files/patch-ag
+++ b/x11-toolkits/gtk20/files/patch-ag
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- gtk/Makefile.in.orig	Fri Apr 26 11:39:34 2002
-+++ gtk/Makefile.in	Fri Apr 26 11:40:56 2002
-@@ -176,7 +176,7 @@
- 
- SUBDIRS = stock-icons theme-bits
- 
--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@\"		-DGTK_HOST=\"@host@\"	                        	-DGTK_COMPILATION					-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@\"		-DGTK_HOST=\"@host@\"	                        	-DGTK_COMPILATION					-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@
+--- gtk/Makefile.in.orig	Sat Jun  1 14:27:02 2002
++++ gtk/Makefile.in	Sat Jun  1 14:29:10 2002
+@@ -182,7 +182,7 @@
+ 	-DG_LOG_DOMAIN=\"Gtk\"				\
+ 	-DGTK_LIBDIR=\"$(libdir)\"			\
+ 	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
+-	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
++	-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"		\
+ 	-DGTK_LOCALEDIR=\"$(gtklocaledir)\"		\
+ 	-DGTK_VERSION=\"@GTK_VERSION@\"			\
+ 	-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"	\
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 6e68aa5b0bec..06f529bf6283 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.0.2
+PORTVERSION=	2.0.3
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020525,} \
+MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v2.0/ \
+		${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020525,} \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 9ed7ac4e0f57..3ba12f41a23e 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtk+-2.0.2.tar.bz2) = b8df4c513323b9efc9a157703f25a07f
+MD5 (gnome2/gtk+-2.0.3.tar.bz2) = ede2b96a3de02b5e2c29de741529b358
diff --git a/x11-toolkits/gtk30/files/patch-ae b/x11-toolkits/gtk30/files/patch-ae
index dcab8a06d6e8..591824a7d638 100644
--- a/x11-toolkits/gtk30/files/patch-ae
+++ b/x11-toolkits/gtk30/files/patch-ae
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Apr  2 14:45:37 2002
-+++ configure	Fri Apr 26 11:36:40 2002
-@@ -5671,6 +5671,7 @@
+--- configure.orig	Thu May 23 17:20:40 2002
++++ configure	Sat Jun  1 14:26:00 2002
+@@ -7192,6 +7192,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +11,12 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7864,7 +7865,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
+@@ -10107,7 +10108,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ CATOBJEXT=.mo
 -	         DATADIRNAME=lib
 +	         DATADIRNAME=share
  fi
- rm -f conftest*
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  	      INSTOBJEXT=.mo
diff --git a/x11-toolkits/gtk30/files/patch-ag b/x11-toolkits/gtk30/files/patch-ag
index bbdd42614731..b3df848c80aa 100644
--- a/x11-toolkits/gtk30/files/patch-ag
+++ b/x11-toolkits/gtk30/files/patch-ag
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- gtk/Makefile.in.orig	Fri Apr 26 11:39:34 2002
-+++ gtk/Makefile.in	Fri Apr 26 11:40:56 2002
-@@ -176,7 +176,7 @@
- 
- SUBDIRS = stock-icons theme-bits
- 
--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@\"		-DGTK_HOST=\"@host@\"	                        	-DGTK_COMPILATION					-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@\"		-DGTK_HOST=\"@host@\"	                        	-DGTK_COMPILATION					-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@
+--- gtk/Makefile.in.orig	Sat Jun  1 14:27:02 2002
++++ gtk/Makefile.in	Sat Jun  1 14:29:10 2002
+@@ -182,7 +182,7 @@
+ 	-DG_LOG_DOMAIN=\"Gtk\"				\
+ 	-DGTK_LIBDIR=\"$(libdir)\"			\
+ 	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
+-	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
++	-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"		\
+ 	-DGTK_LOCALEDIR=\"$(gtklocaledir)\"		\
+ 	-DGTK_VERSION=\"@GTK_VERSION@\"			\
+ 	-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"	\