18 files changed, 364 insertions, 88 deletions

diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index b1baf0547860..820c07883343 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gtk11-devel
-# Version required:		1.1.7
+# Version required:		1.1.9
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.34 1998/12/22 07:56:14 asami Exp $
+# $Id: Makefile,v 1.35 1998/12/22 09:06:28 asami Exp $
 #
 
-DISTNAME=	gtk+-1.1.7
-PKGNAME=	gtk-1.1.7
+DISTNAME=	gtk+-1.1.9
+PKGNAME=	gtk-1.1.9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -15,17 +15,19 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
+RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	glib11d.1:${PORTSDIR}/devel/glib11-devel
 
 USE_X_PREFIX=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} <= 300000
-BROKEN=		requires perl5
+USE_PERL5=	yes
 .endif
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	INSTALL='$${INSTALL} -c' \
-		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
+		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
+		CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk11d
 
 post-install:
diff --git a/x11-toolkits/gtk12/distinfo b/x11-toolkits/gtk12/distinfo
index 072f73bca142..8e06e730ee13 100644
--- a/x11-toolkits/gtk12/distinfo
+++ b/x11-toolkits/gtk12/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.1.7.tar.gz) = 751cbeb13fb579626b7fec33ff9a10ee
+MD5 (gtk+-1.1.9.tar.gz) = dc66f1faba2462f6b6b9e3c0f9a43805
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index 07dc1262ae58..c507b7c8312d 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,10 +1,10 @@
---- Makefile.in.orig	Fri Dec 11 14:20:23 1998
-+++ Makefile.in	Sat Dec 12 11:35:00 1998
-@@ -100,9 +100,9 @@
+--- Makefile.in.orig	Thu Dec 17 14:33:47 1998
++++ Makefile.in	Sun Dec 27 00:28:05 1998
+@@ -118,9 +118,9 @@
  xinput_progs = @xinput_progs@
  
  SRC_SUBDIRS = gdk gtk
--SUBDIRS = $(SRC_SUBDIRS) docs
+-SUBDIRS = po $(SRC_SUBDIRS) docs
 +SUBDIRS = $(SRC_SUBDIRS)
  
 -bin_SCRIPTS = gtk-config
@@ -12,7 +12,7 @@
  
  EXTRA_DIST =	\
  	HACKING		\
-@@ -187,7 +187,7 @@
+@@ -205,7 +205,7 @@
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
@@ -21,19 +21,19 @@
  SCRIPTS =  $(bin_SCRIPTS)
  
  DATA =  $(m4data_DATA)
-@@ -240,7 +240,10 @@
+@@ -259,7 +259,10 @@
  	-rm -f config.h
  
  maintainer-clean-hdr:
 -gtk-config: $(top_builddir)/config.status gtk-config.in
 +gtk11d-config.in: gtk-config.in
-+	cp gtk-config.in gtk11d-config.in
++	cp gtk-config.in gtk11-config.in
 +
 +gtk11d-config: $(top_builddir)/config.status gtk11d-config.in
  	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
  
  install-binSCRIPTS: $(bin_SCRIPTS)
-@@ -262,25 +265,6 @@
+@@ -281,25 +284,6 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
  	done
  
@@ -59,7 +59,7 @@
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
  # To change the values of `make' variables: instead of editing Makefiles,
-@@ -420,21 +404,19 @@
+@@ -439,21 +423,19 @@
  all-recursive-am: config.h
  	$(MAKE) all-recursive
  
@@ -85,7 +85,7 @@
  	@:
  
  uninstall: uninstall-recursive uninstall-am
-@@ -482,15 +464,15 @@
+@@ -501,15 +483,15 @@
  	-rm -f config.status
  
  .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
@@ -104,9 +104,9 @@
  uninstall-am install-exec install-data install uninstall all \
  installdirs mostlyclean-generic distclean-generic clean-generic \
  maintainer-clean-generic clean mostlyclean distclean maintainer-clean
---- gdk/Makefile.in.orig	Fri Dec 11 14:20:26 1998
-+++ gdk/Makefile.in	Sat Dec 12 11:42:19 1998
-@@ -101,7 +101,7 @@
+--- gdk/Makefile.in.orig	Thu Dec 17 14:33:51 1998
++++ gdk/Makefile.in	Sun Dec 27 00:28:05 1998
+@@ -119,7 +119,7 @@
  
  gdkincludedir = $(includedir)/gdk
  
@@ -115,7 +115,7 @@
  
  INCLUDES = \
  	-DG_LOG_DOMAIN=\"Gdk\"	\
-@@ -113,7 +113,7 @@
+@@ -130,7 +130,7 @@
  	@GLIB_CFLAGS@		\
  	@x_cflags@ 
  
@@ -124,18 +124,18 @@
  	gdk.c		\
  	gdkcc.c		\
  	gdkcolor.c	\
-@@ -156,8 +156,8 @@
- 	gdktypes.h	\
- 	gdkx.h
+@@ -179,8 +179,8 @@
+ 	@GLIB_LIBS@	\
+ 	-lm
  
 -libgdk_la_LDFLAGS = \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
 +libgdk11d_la_LDFLAGS = \
-+	-version-info 1:0:0 \
-          @x_ldflags@ @x_libs@
- 
- EXTRA_PROGRAMS = gxid
-@@ -184,8 +184,8 @@
++	-version-info 1:1:0 \
+          @GLIB_LIBS@	\
+          @x_ldflags@	\
+          @x_libs@	\
+@@ -207,8 +207,8 @@
  X_LIBS = @X_LIBS@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
  X_PRE_LIBS = @X_PRE_LIBS@
@@ -143,10 +143,10 @@
 -libgdk_la_OBJECTS =  gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \
 +libgdk11d_la_LIBADD = 
 +libgdk11d_la_OBJECTS =  gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \
- gdkdraw.lo gdkfont.lo gdkgc.lo gdkglobals.lo gdkim.lo gdkimage.lo \
- gdkinput.lo gdkpixmap.lo gdkproperty.lo gdkrgb.lo gdkrectangle.lo \
- gdkregion.lo gdkselection.lo gdkthreads.lo gdkvisual.lo gdkwindow.lo \
-@@ -208,8 +208,8 @@
+ gdkdraw.lo gdkevents.lo gdkfont.lo gdkgc.lo gdkglobals.lo gdkim.lo \
+ gdkimage.lo gdkinput.lo gdkpixmap.lo gdkproperty.lo gdkrgb.lo \
+ gdkrectangle.lo gdkregion.lo gdkselection.lo gdkvisual.lo gdkwindow.lo \
+@@ -231,8 +231,8 @@
  
  TAR = tar
  GZIP = --best
@@ -157,7 +157,7 @@
  
  all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
  
-@@ -286,8 +286,8 @@
+@@ -309,8 +309,8 @@
  
  maintainer-clean-libtool:
  
@@ -168,9 +168,9 @@
  
  mostlyclean-binPROGRAMS:
  
---- gtk/Makefile.in.orig	Fri Dec 11 14:20:27 1998
-+++ gtk/Makefile.in	Sat Dec 12 11:35:00 1998
-@@ -103,7 +103,7 @@
+--- gtk/Makefile.in.orig	Thu Dec 17 14:33:52 1998
++++ gtk/Makefile.in	Sun Dec 27 00:28:05 1998
+@@ -121,7 +121,7 @@
  
  gtkincludedir = $(includedir)/gtk
  
@@ -179,7 +179,7 @@
  
  static_sources = \
  	gtkaccelgroup.c		\
-@@ -214,7 +214,7 @@
+@@ -231,7 +231,7 @@
  	fnmatch.c		\
  	fnmatch.h
  
@@ -188,19 +188,19 @@
  	$(static_sources)	\
  	gtkmarshal.c
  
-@@ -351,8 +351,8 @@
+@@ -368,8 +368,8 @@
  	../gdk/gdktypes.h \
  	../gdk/gdkrgb.h
  
 -libgtk_la_LDFLAGS = \
--	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
+-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
 +libgtk11d_la_LDFLAGS = \
-+	-version-info 1:0:0
- 
- EXTRA_DIST = \
- 	line-arrow.xbm 		\
-@@ -400,12 +400,12 @@
- noinst_PROGRAMS = testgtk testinput testselection testthreads testrgb testdnd simple 
++	-version-info 1:1:0 \
+ 	@GLIB_LIBS@ 			\
+ 	@x_ldflags@			\
+ 	@x_libs@ 			\
+@@ -422,12 +422,12 @@
+ # testthreads
  
  DEPS =	\
 -	libgtk.la					\
@@ -216,7 +216,7 @@
  	@x_ldflags@					\
  	@x_libs@					\
  	@GLIB_LIBS@                                     \
-@@ -440,8 +440,8 @@
+@@ -462,8 +462,8 @@
  X_LIBS = @X_LIBS@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
  X_PRE_LIBS = @X_PRE_LIBS@
@@ -227,21 +227,21 @@
  gtkalignment.lo gtkarg.lo gtkarrow.lo gtkaspectframe.lo gtkbin.lo \
  gtkbindings.lo gtkbbox.lo gtkbox.lo gtkbutton.lo gtkcalendar.lo \
  gtkcheckbutton.lo gtkcheckmenuitem.lo gtkclist.lo gtkcolorsel.lo \
-@@ -501,10 +501,10 @@
+@@ -519,10 +519,10 @@
  
  TAR = tar
  GZIP = --best
--SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c testrgb.c testdnd.c simple.c
--OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o testrgb.o testdnd.o simple.o
-+SOURCES = $(libgtk11d_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c testrgb.c testdnd.c simple.c
-+OBJECTS = $(libgtk11d_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o testrgb.o testdnd.o simple.o
+-SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c testrgb.c testdnd.c simple.c
+-OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o testrgb.o testdnd.o simple.o
++SOURCES = $(libgtk11d_la_SOURCES) testgtk.c testinput.c testselection.c testrgb.c testdnd.c simple.c
++OBJECTS = $(libgtk11d_la_OBJECTS) testgtk.o testinput.o testselection.o testrgb.o testdnd.o simple.o
  
 -all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
 +all: Makefile $(LTLIBRARIES) $(HEADERS)
  
  .SUFFIXES:
  .SUFFIXES: .S .c .lo .o .s
-@@ -581,8 +581,8 @@
+@@ -599,8 +599,8 @@
  
  maintainer-clean-libtool:
  
diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-ab
index ba04baf37278..5985d8cefdef 100644
--- a/x11-toolkits/gtk12/files/patch-ab
+++ b/x11-toolkits/gtk12/files/patch-ab
@@ -1,5 +1,5 @@
 --- gtk-config.in.orig	Mon Nov  2 16:41:19 1998
-+++ gtk-config.in	Fri Dec 11 21:42:44 1998
++++ gtk-config.in	Sun Dec 27 00:28:06 1998
 @@ -8,7 +8,7 @@
  exec_prefix_set=no
  
@@ -14,7 +14,7 @@
          fi
        done
 -      echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @x_libs@ @GDK_WLIBS@ -lm
-+      echo $libdirs @x_ldflags@ -lgtk11d -lgdk11d $my_glib_libs @x_libs@ @GDK_WLIBS@ -lm
++      echo $libdirs @x_ldflags@ -lgtk11d -lgdk11d $my_glib_libs @x_libs@ @GDK_WLIBS@ -lintl -lm
        ;;
      *)
        echo "${usage}" 1>&2
diff --git a/x11-toolkits/gtk12/files/patch-ad b/x11-toolkits/gtk12/files/patch-ad
new file mode 100644
index 000000000000..4825e812d250
--- /dev/null
+++ b/x11-toolkits/gtk12/files/patch-ad
@@ -0,0 +1,67 @@
+--- gtk/gtkrc.c.orig	Wed Dec 16 09:42:10 1998
++++ gtk/gtkrc.c	Sun Dec 27 01:04:11 1998
+@@ -26,6 +26,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
++#ifdef X_LOCALE
++#include <locale.h>
++#endif
++
+ #include "gtkrc.h"
+ #include "gtkbindings.h"
+ #include "gtkthemes.h"
+@@ -228,13 +232,13 @@
+   var = getenv("GTK_EXE_PREFIX");
+   if (var)
+     {
+-      path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1);
+-      sprintf(path, "%s%s", var, "/lib/gtk/themes/engines");
++      path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1);
++      sprintf(path, "%s%s", var, "/share/themes/engines");
+     }
+   else
+     {
+-      path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1);
+-      sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
++      path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1);
++      sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines");
+     }
+   return path;
+ }
+@@ -248,13 +252,13 @@
+   var = getenv("GTK_DATA_PREFIX");
+   if (var)
+     {
+-      path = g_malloc(strlen(var) + strlen("/share/gtk/themes") +1);
+-      sprintf(path, "%s%s", var, "/share/gtk/themes");
++      path = g_malloc(strlen(var) + strlen("/share/themes") +1);
++      sprintf(path, "%s%s", var, "/share/themes");
+     }
+   else
+     {
+-      path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/gtk/themes") +1);
+-      sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/gtk/themes");
++      path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/themes") +1);
++      sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/themes");
+     }
+   
+   for (n = 0; pixmap_path[n]; n++) ;
+@@ -290,13 +294,13 @@
+   var = getenv("GTK_EXE_PREFIX");
+   if (var)
+     {
+-      path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1);
+-      sprintf(path, "%s%s", var, "/lib/gtk/themes/engines");
++      path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1);
++      sprintf(path, "%s%s", var, "/share/themes/engines");
+     }
+   else
+     {
+-      path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1);
+-      sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
++      path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1);
++      sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines");
+     }
+   module_path[n++] = g_strdup(path);
+   g_free(path);
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index 4bbc747f9bf4..8793d6985823 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -35,7 +35,6 @@ include/gtk11d/gtk/gtkdebug.h
 include/gtk11d/gtk/gtkdialog.h
 include/gtk11d/gtk/gtkdnd.h
 include/gtk11d/gtk/gtkdrawingarea.h
-include/gtk11d/gtk/gtkdrawwindow.h
 include/gtk11d/gtk/gtkeditable.h
 include/gtk11d/gtk/gtkentry.h
 include/gtk11d/gtk/gtkenums.h
@@ -58,6 +57,7 @@ include/gtk11d/gtk/gtkhseparator.h
 include/gtk11d/gtk/gtkimage.h
 include/gtk11d/gtk/gtkinputdialog.h
 include/gtk11d/gtk/gtkinvisible.h
+include/gtk11d/gtk/gtkintl.h
 include/gtk11d/gtk/gtkitem.h
 include/gtk11d/gtk/gtkitemfactory.h
 include/gtk11d/gtk/gtklabel.h
@@ -123,11 +123,11 @@ include/gtk11d/gtk/gtkwindow.h
 lib/libgdk11d.a
 lib/libgdk11d.la
 lib/libgdk11d.so
-lib/libgdk11d.so.1
+lib/libgdk11d.so.1.1
 lib/libgtk11d.a
 lib/libgtk11d.la
 lib/libgtk11d.so
-lib/libgtk11d.so.1
+lib/libgtk11d.so.1.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/themes/Default/gtk/gtkrc
diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile
index b1baf0547860..820c07883343 100644
--- a/x11-toolkits/gtk13/Makefile
+++ b/x11-toolkits/gtk13/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gtk11-devel
-# Version required:		1.1.7
+# Version required:		1.1.9
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.34 1998/12/22 07:56:14 asami Exp $
+# $Id: Makefile,v 1.35 1998/12/22 09:06:28 asami Exp $
 #
 
-DISTNAME=	gtk+-1.1.7
-PKGNAME=	gtk-1.1.7
+DISTNAME=	gtk+-1.1.9
+PKGNAME=	gtk-1.1.9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -15,17 +15,19 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
+RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	glib11d.1:${PORTSDIR}/devel/glib11-devel
 
 USE_X_PREFIX=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} <= 300000
-BROKEN=		requires perl5
+USE_PERL5=	yes
 .endif
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	INSTALL='$${INSTALL} -c' \
-		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
+		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
+		CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk11d
 
 post-install:
diff --git a/x11-toolkits/gtk13/distinfo b/x11-toolkits/gtk13/distinfo
index 072f73bca142..8e06e730ee13 100644
--- a/x11-toolkits/gtk13/distinfo
+++ b/x11-toolkits/gtk13/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.1.7.tar.gz) = 751cbeb13fb579626b7fec33ff9a10ee
+MD5 (gtk+-1.1.9.tar.gz) = dc66f1faba2462f6b6b9e3c0f9a43805
diff --git a/x11-toolkits/gtk13/files/patch-ad b/x11-toolkits/gtk13/files/patch-ad
new file mode 100644
index 000000000000..4825e812d250
--- /dev/null
+++ b/x11-toolkits/gtk13/files/patch-ad
@@ -0,0 +1,67 @@
+--- gtk/gtkrc.c.orig	Wed Dec 16 09:42:10 1998
++++ gtk/gtkrc.c	Sun Dec 27 01:04:11 1998
+@@ -26,6 +26,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
++#ifdef X_LOCALE
++#include <locale.h>
++#endif
++
+ #include "gtkrc.h"
+ #include "gtkbindings.h"
+ #include "gtkthemes.h"
+@@ -228,13 +232,13 @@
+   var = getenv("GTK_EXE_PREFIX");
+   if (var)
+     {
+-      path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1);
+-      sprintf(path, "%s%s", var, "/lib/gtk/themes/engines");
++      path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1);
++      sprintf(path, "%s%s", var, "/share/themes/engines");
+     }
+   else
+     {
+-      path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1);
+-      sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
++      path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1);
++      sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines");
+     }
+   return path;
+ }
+@@ -248,13 +252,13 @@
+   var = getenv("GTK_DATA_PREFIX");
+   if (var)
+     {
+-      path = g_malloc(strlen(var) + strlen("/share/gtk/themes") +1);
+-      sprintf(path, "%s%s", var, "/share/gtk/themes");
++      path = g_malloc(strlen(var) + strlen("/share/themes") +1);
++      sprintf(path, "%s%s", var, "/share/themes");
+     }
+   else
+     {
+-      path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/gtk/themes") +1);
+-      sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/gtk/themes");
++      path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/themes") +1);
++      sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/themes");
+     }
+   
+   for (n = 0; pixmap_path[n]; n++) ;
+@@ -290,13 +294,13 @@
+   var = getenv("GTK_EXE_PREFIX");
+   if (var)
+     {
+-      path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1);
+-      sprintf(path, "%s%s", var, "/lib/gtk/themes/engines");
++      path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1);
++      sprintf(path, "%s%s", var, "/share/themes/engines");
+     }
+   else
+     {
+-      path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1);
+-      sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
++      path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1);
++      sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines");
+     }
+   module_path[n++] = g_strdup(path);
+   g_free(path);
diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist
index 4bbc747f9bf4..8793d6985823 100644
--- a/x11-toolkits/gtk13/pkg-plist
+++ b/x11-toolkits/gtk13/pkg-plist
@@ -35,7 +35,6 @@ include/gtk11d/gtk/gtkdebug.h
 include/gtk11d/gtk/gtkdialog.h
 include/gtk11d/gtk/gtkdnd.h
 include/gtk11d/gtk/gtkdrawingarea.h
-include/gtk11d/gtk/gtkdrawwindow.h
 include/gtk11d/gtk/gtkeditable.h
 include/gtk11d/gtk/gtkentry.h
 include/gtk11d/gtk/gtkenums.h
@@ -58,6 +57,7 @@ include/gtk11d/gtk/gtkhseparator.h
 include/gtk11d/gtk/gtkimage.h
 include/gtk11d/gtk/gtkinputdialog.h
 include/gtk11d/gtk/gtkinvisible.h
+include/gtk11d/gtk/gtkintl.h
 include/gtk11d/gtk/gtkitem.h
 include/gtk11d/gtk/gtkitemfactory.h
 include/gtk11d/gtk/gtklabel.h
@@ -123,11 +123,11 @@ include/gtk11d/gtk/gtkwindow.h
 lib/libgdk11d.a
 lib/libgdk11d.la
 lib/libgdk11d.so
-lib/libgdk11d.so.1
+lib/libgdk11d.so.1.1
 lib/libgtk11d.a
 lib/libgtk11d.la
 lib/libgtk11d.so
-lib/libgtk11d.so.1
+lib/libgtk11d.so.1.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/themes/Default/gtk/gtkrc
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index b1baf0547860..820c07883343 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gtk11-devel
-# Version required:		1.1.7
+# Version required:		1.1.9
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.34 1998/12/22 07:56:14 asami Exp $
+# $Id: Makefile,v 1.35 1998/12/22 09:06:28 asami Exp $
 #
 
-DISTNAME=	gtk+-1.1.7
-PKGNAME=	gtk-1.1.7
+DISTNAME=	gtk+-1.1.9
+PKGNAME=	gtk-1.1.9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -15,17 +15,19 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
+RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	glib11d.1:${PORTSDIR}/devel/glib11-devel
 
 USE_X_PREFIX=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} <= 300000
-BROKEN=		requires perl5
+USE_PERL5=	yes
 .endif
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	INSTALL='$${INSTALL} -c' \
-		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
+		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
+		CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk11d
 
 post-install:
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 072f73bca142..8e06e730ee13 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.1.7.tar.gz) = 751cbeb13fb579626b7fec33ff9a10ee
+MD5 (gtk+-1.1.9.tar.gz) = dc66f1faba2462f6b6b9e3c0f9a43805
diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad
new file mode 100644
index 000000000000..4825e812d250
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ad
@@ -0,0 +1,67 @@
+--- gtk/gtkrc.c.orig	Wed Dec 16 09:42:10 1998
++++ gtk/gtkrc.c	Sun Dec 27 01:04:11 1998
+@@ -26,6 +26,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
++#ifdef X_LOCALE
++#include <locale.h>
++#endif
++
+ #include "gtkrc.h"
+ #include "gtkbindings.h"
+ #include "gtkthemes.h"
+@@ -228,13 +232,13 @@
+   var = getenv("GTK_EXE_PREFIX");
+   if (var)
+     {
+-      path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1);
+-      sprintf(path, "%s%s", var, "/lib/gtk/themes/engines");
++      path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1);
++      sprintf(path, "%s%s", var, "/share/themes/engines");
+     }
+   else
+     {
+-      path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1);
+-      sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
++      path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1);
++      sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines");
+     }
+   return path;
+ }
+@@ -248,13 +252,13 @@
+   var = getenv("GTK_DATA_PREFIX");
+   if (var)
+     {
+-      path = g_malloc(strlen(var) + strlen("/share/gtk/themes") +1);
+-      sprintf(path, "%s%s", var, "/share/gtk/themes");
++      path = g_malloc(strlen(var) + strlen("/share/themes") +1);
++      sprintf(path, "%s%s", var, "/share/themes");
+     }
+   else
+     {
+-      path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/gtk/themes") +1);
+-      sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/gtk/themes");
++      path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/themes") +1);
++      sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/themes");
+     }
+   
+   for (n = 0; pixmap_path[n]; n++) ;
+@@ -290,13 +294,13 @@
+   var = getenv("GTK_EXE_PREFIX");
+   if (var)
+     {
+-      path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1);
+-      sprintf(path, "%s%s", var, "/lib/gtk/themes/engines");
++      path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1);
++      sprintf(path, "%s%s", var, "/share/themes/engines");
+     }
+   else
+     {
+-      path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1);
+-      sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
++      path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1);
++      sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines");
+     }
+   module_path[n++] = g_strdup(path);
+   g_free(path);
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 4bbc747f9bf4..8793d6985823 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -35,7 +35,6 @@ include/gtk11d/gtk/gtkdebug.h
 include/gtk11d/gtk/gtkdialog.h
 include/gtk11d/gtk/gtkdnd.h
 include/gtk11d/gtk/gtkdrawingarea.h
-include/gtk11d/gtk/gtkdrawwindow.h
 include/gtk11d/gtk/gtkeditable.h
 include/gtk11d/gtk/gtkentry.h
 include/gtk11d/gtk/gtkenums.h
@@ -58,6 +57,7 @@ include/gtk11d/gtk/gtkhseparator.h
 include/gtk11d/gtk/gtkimage.h
 include/gtk11d/gtk/gtkinputdialog.h
 include/gtk11d/gtk/gtkinvisible.h
+include/gtk11d/gtk/gtkintl.h
 include/gtk11d/gtk/gtkitem.h
 include/gtk11d/gtk/gtkitemfactory.h
 include/gtk11d/gtk/gtklabel.h
@@ -123,11 +123,11 @@ include/gtk11d/gtk/gtkwindow.h
 lib/libgdk11d.a
 lib/libgdk11d.la
 lib/libgdk11d.so
-lib/libgdk11d.so.1
+lib/libgdk11d.so.1.1
 lib/libgtk11d.a
 lib/libgtk11d.la
 lib/libgtk11d.so
-lib/libgtk11d.so.1
+lib/libgtk11d.so.1.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/themes/Default/gtk/gtkrc
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index b1baf0547860..820c07883343 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gtk11-devel
-# Version required:		1.1.7
+# Version required:		1.1.9
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.34 1998/12/22 07:56:14 asami Exp $
+# $Id: Makefile,v 1.35 1998/12/22 09:06:28 asami Exp $
 #
 
-DISTNAME=	gtk+-1.1.7
-PKGNAME=	gtk-1.1.7
+DISTNAME=	gtk+-1.1.9
+PKGNAME=	gtk-1.1.9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -15,17 +15,19 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
+RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	glib11d.1:${PORTSDIR}/devel/glib11-devel
 
 USE_X_PREFIX=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} <= 300000
-BROKEN=		requires perl5
+USE_PERL5=	yes
 .endif
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	INSTALL='$${INSTALL} -c' \
-		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
+		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
+		CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk11d
 
 post-install:
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 072f73bca142..8e06e730ee13 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.1.7.tar.gz) = 751cbeb13fb579626b7fec33ff9a10ee
+MD5 (gtk+-1.1.9.tar.gz) = dc66f1faba2462f6b6b9e3c0f9a43805
diff --git a/x11-toolkits/gtk30/files/patch-ad b/x11-toolkits/gtk30/files/patch-ad
new file mode 100644
index 000000000000..4825e812d250
--- /dev/null
+++ b/x11-toolkits/gtk30/files/patch-ad
@@ -0,0 +1,67 @@
+--- gtk/gtkrc.c.orig	Wed Dec 16 09:42:10 1998
++++ gtk/gtkrc.c	Sun Dec 27 01:04:11 1998
+@@ -26,6 +26,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
++#ifdef X_LOCALE
++#include <locale.h>
++#endif
++
+ #include "gtkrc.h"
+ #include "gtkbindings.h"
+ #include "gtkthemes.h"
+@@ -228,13 +232,13 @@
+   var = getenv("GTK_EXE_PREFIX");
+   if (var)
+     {
+-      path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1);
+-      sprintf(path, "%s%s", var, "/lib/gtk/themes/engines");
++      path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1);
++      sprintf(path, "%s%s", var, "/share/themes/engines");
+     }
+   else
+     {
+-      path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1);
+-      sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
++      path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1);
++      sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines");
+     }
+   return path;
+ }
+@@ -248,13 +252,13 @@
+   var = getenv("GTK_DATA_PREFIX");
+   if (var)
+     {
+-      path = g_malloc(strlen(var) + strlen("/share/gtk/themes") +1);
+-      sprintf(path, "%s%s", var, "/share/gtk/themes");
++      path = g_malloc(strlen(var) + strlen("/share/themes") +1);
++      sprintf(path, "%s%s", var, "/share/themes");
+     }
+   else
+     {
+-      path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/gtk/themes") +1);
+-      sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/gtk/themes");
++      path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/themes") +1);
++      sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/themes");
+     }
+   
+   for (n = 0; pixmap_path[n]; n++) ;
+@@ -290,13 +294,13 @@
+   var = getenv("GTK_EXE_PREFIX");
+   if (var)
+     {
+-      path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1);
+-      sprintf(path, "%s%s", var, "/lib/gtk/themes/engines");
++      path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1);
++      sprintf(path, "%s%s", var, "/share/themes/engines");
+     }
+   else
+     {
+-      path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1);
+-      sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
++      path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1);
++      sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines");
+     }
+   module_path[n++] = g_strdup(path);
+   g_free(path);
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 4bbc747f9bf4..8793d6985823 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -35,7 +35,6 @@ include/gtk11d/gtk/gtkdebug.h
 include/gtk11d/gtk/gtkdialog.h
 include/gtk11d/gtk/gtkdnd.h
 include/gtk11d/gtk/gtkdrawingarea.h
-include/gtk11d/gtk/gtkdrawwindow.h
 include/gtk11d/gtk/gtkeditable.h
 include/gtk11d/gtk/gtkentry.h
 include/gtk11d/gtk/gtkenums.h
@@ -58,6 +57,7 @@ include/gtk11d/gtk/gtkhseparator.h
 include/gtk11d/gtk/gtkimage.h
 include/gtk11d/gtk/gtkinputdialog.h
 include/gtk11d/gtk/gtkinvisible.h
+include/gtk11d/gtk/gtkintl.h
 include/gtk11d/gtk/gtkitem.h
 include/gtk11d/gtk/gtkitemfactory.h
 include/gtk11d/gtk/gtklabel.h
@@ -123,11 +123,11 @@ include/gtk11d/gtk/gtkwindow.h
 lib/libgdk11d.a
 lib/libgdk11d.la
 lib/libgdk11d.so
-lib/libgdk11d.so.1
+lib/libgdk11d.so.1.1
 lib/libgtk11d.a
 lib/libgtk11d.la
 lib/libgtk11d.so
-lib/libgtk11d.so.1
+lib/libgtk11d.so.1.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/themes/Default/gtk/gtkrc