Upgrade to GNOME 1.0. The following are the details:

 ports/audio/esound			0.2.7    ->  0.2.8	PR ports/10422
 ports/audio/gnomeaudio			0.99.8   ->  1.0.0	PR ports/10426
 ports/audio/libaudiofile		0.1.5    ->  0.1.6	PR ports/10421
 ports/deskutils/gnomepim		0.99.8.1 ->  1.0.1	PR ports/10435
 ports/devel/ORBit			0.3.98   ->  0.4.0	PR ports/10423
 ports/devel/gettext			shared libs now		PR ports/10293
 ports/devel/glib12			1.1.16   ->  1.2.0	PR ports/10419
 ports/devel/libgtop			0.99.8   ->  1.0.1	PR ports/10430
 ports/games/gnomegames			0.99.8   ->  1.0.1	PR ports/10436
 ports/graphics/electriceyes		distfile moved		PR ports/10437
 ports/graphics/imlib			1.9.3    ->  1.9.4	PR ports/10424
 ports/lang/gnomeobjc			0.99.3   ->  1.0.1	PR ports/10441
 ports/math/gnumeric			0.6      ->  0.15	PR ports/10439
 ports/misc/gnomeutils			0.99.5   ->  1.0.1	PR ports/10442
 ports/sysutils/gnomeadmin		0.99.1   ->  1.0.1	PR ports/10445
 ports/sysutils/gnomecontrolcenter	0.99.3.1 ->  1.0.1	PR ports/10446
 ports/sysutils/gtop			0.99.2   ->  1.0.1	PR ports/10477
 ports/textproc/libxml			0.99.8   ->  1.0.0	PR ports/10438
 ports/www/libghttp			distfile moved		PR ports/10429
 ports/x11/gnome			0.99.3   ->  1.0.0	PR ports/10450
 ports/x11/gnomecore			0.99.8.1 ->  1.0.1	PR ports/10432
 ports/x11/gnomelibs			0.99.8.1 ->  1.0.1	PR ports/10425
 ports/x11-fm/gnomemc			4.5.10   ->  4.5.23	PR ports/10448
 ports/x11-toolkits/gtk-engines		0.1      ->  0.5	PR ports/10427
 ports/x11-toolkits/gtk12		1.1.6    ->  1.2.0	PR ports/10420

Note that repository copies were made before this commit, as follows:

 ports/devel/glib11-devel       -> ports/devel/glib12
 ports/x11-toolkits/gtk11-devel -> ports/x11-toolkits/gtk12

Submitted by:	Jeremy Lea <reg@shale.csir.co.za>

8 files changed, 297 insertions, 279 deletions

diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 47d3fc8e8399..0136c7202403 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -1,43 +1,49 @@
-# New ports collection makefile for:   gtk11-devel
-# Version required:		1.1.16
+# New ports collection makefile for:   gtk12
+# Version required:		1.2.0
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $Id: Makefile,v 1.44 1999/02/18 04:49:25 vanilla Exp $
 #
 
-DISTNAME=	gtk+-1.1.16
-PKGNAME=	gtk-1.1.16
+DISTNAME=	gtk+-1.2.0
+PKGNAME=	gtk-1.2.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
-		http://www.ameth.org/gimp/gtk/v1.1/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
+		http://www.ameth.org/gimp/gtk/v1.2/
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
 BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	glib11d.2:${PORTSDIR}/devel/glib11-devel
+LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk11d
+CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk12
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
+		GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN1=		gtk-config.1
+MAN1=		gtk12-config.1
 
 pre-build:
 	${RM} -rf ${WRKSRC}/docs/gtk.info*
 
 post-install:
-	@${MKDIR} ${LOCALBASE}/share/aclocal
-	@${INSTALL_DATA} ${WRKSRC}/gtk.m4 ${LOCALBASE}/share/aclocal/gtk11d.m4
+	@${MKDIR} ${PREFIX}/share/themes/engines
 	@if [ ! -f ${PREFIX}/share/info ]; then \
 	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	 fi
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+	@${ECHO} '*********************************************************'
+	@${ECHO} '*                                                       *'
+	@${ECHO} '*     If you want to use autoconf with gtk,             *'
+	@${ECHO} '*     Please copy gtk.m4 to /usr/local/share/aclocal    *'
+	@${ECHO} '*     by yourself, thanks.                              *'
+	@${ECHO} '*                                                       *'
+	@${ECHO} '*********************************************************'
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk12/distinfo b/x11-toolkits/gtk12/distinfo
index 992dadfae7e1..b648580fc3d6 100644
--- a/x11-toolkits/gtk12/distinfo
+++ b/x11-toolkits/gtk12/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.1.16.tar.gz) = 6de7a1a397eac37d7fc1f8ef008a9f02
+MD5 (gtk+-1.2.0.tar.gz) = d935cf94a4b0167b6b3570580a1013b9
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index 89e094d9c3bf..bea450001131 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,207 +1,170 @@
 --- Makefile.in.orig	Sun Jan 31 23:26:39 1999
 +++ Makefile.in	Sun Jan 31 23:31:06 1999
-@@ -124,7 +124,7 @@
+@@ -126,7 +126,7 @@
  SRC_SUBDIRS = gdk gtk
  SUBDIRS = po $(SRC_SUBDIRS) docs
  
 -bin_SCRIPTS = gtk-config
-+bin_SCRIPTS = gtk11d-config
++bin_SCRIPTS = gtk12-config
  
- EXTRA_DIST =  	HACKING			gtk+.spec	        gtk.m4          	makecopyright		TODO			NEWS.pre-1-0		ChangeLog.pre-1-0		README.cvs-commits		intl/libgettext.h		intl/po2tbl.sed.in		examples/Makefile		examples/README.1ST		examples/extract.awk		examples/extract.sh		examples/aspectframe/Makefile  	examples/aspectframe/aspectframe.c  	examples/base/Makefile		examples/base/base.c 	examples/buttons/Makefile  	examples/buttons/buttons.c  	examples/buttons/info.xpm  	examples/clist/clist.c 	examples/entry/Makefile  	examples/entry/entry.c  	examples/eventbox/Makefile  	examples/eventbox/eventbox.c  	examples/filesel/Makefile  	examples/filesel/filesel.c  	examples/gtkdial/Makefile  	examples/gtkdial/dial_test.c  	examples/gtkdial/gtkdial.c  	examples/gtkdial/gtkdial.h  	examples/helloworld/Makefile  	examples/helloworld/helloworld.c  	examples/helloworld2/Makefile  	examples/helloworld2/helloworld2.c  	examples/list/Makefile  	examples/list/list.c  	examples/menu/Makefile  	examples/menu/menu.c  	examples/menu/menufactory.c  	examples/menu/menufactory.h  	examples/menu/mfmain.c  	examples/menu/mfmain.h  	examples/notebook/Makefile  	examples/notebook/notebook.c  	examples/packer/Makefile  	examples/packer/pack.c 	examples/packbox/Makefile  	examples/packbox/packbox.c  	examples/paned/Makefile  	examples/paned/paned.c  	examples/pixmap/Makefile  	examples/pixmap/pixmap.c  	examples/progressbar/Makefile  	examples/progressbar/progressbar.c  	examples/radiobuttons/Makefile  	examples/radiobuttons/radiobuttons.c  	examples/rulers/Makefile  	examples/rulers/rulers.c  	examples/scribble-simple/Makefile  	examples/scribble-simple/scribble-simple.c  	examples/scrolledwin/Makefile  	examples/scrolledwin/scrolledwin.c  	examples/selection/Makefile  	examples/selection/gettargets.c  	examples/selection/setselection.c  	examples/statusbar/Makefile  	examples/statusbar/statusbar.c  	examples/table/Makefile  	examples/table/table.c  	examples/tictactoe/Makefile  	examples/tictactoe/tictactoe.c  	examples/tictactoe/tictactoe.h  	examples/tictactoe/ttt_test.c  	examples/wheelbarrow/Makefile  	examples/wheelbarrow/wheelbarrow.c  	examples/find-examples.sh
+ EXTRA_DIST =  	HACKING			gtk+.spec.in	        gtk.m4          	makecopyright		TODO			NEWS.pre-1-0		ChangeLog.pre-1-0		README.cvs-commits		intl/libgettext.h		intl/po2tbl.sed.in		examples/aspectframe/Makefile  	examples/aspectframe/aspectframe.c  	examples/Makefile  	examples/README.1ST  	examples/extract.awk  	examples/extract.sh  	examples/base/Makefile  	examples/base/base.c  	examples/buttons/Makefile  	examples/buttons/buttons.c  	examples/buttons/info.xpm  	examples/calendar/Makefile  	examples/calendar/gcalendar.c  	examples/clist/Makefile  	examples/clist/clist.c  	examples/entry/Makefile  	examples/entry/entry.c  	examples/eventbox/Makefile  	examples/eventbox/eventbox.c  	examples/filesel/Makefile  	examples/filesel/filesel.c  	examples/gtkdial/Makefile  	examples/gtkdial/dial_test.c  	examples/gtkdial/gtkdial.c  	examples/gtkdial/gtkdial.h  	examples/helloworld/Makefile  	examples/helloworld/helloworld.c  	examples/helloworld2/Makefile  	examples/helloworld2/helloworld2.c  	examples/list/Makefile  	examples/list/list.c  	examples/menu/Makefile  	examples/menu/menu.c  	examples/menu/itemfactory.c  	examples/notebook/Makefile  	examples/notebook/notebook.c  	examples/packbox/Makefile  	examples/packbox/packbox.c  	examples/packer/Makefile  	examples/packer/pack.c  	examples/paned/Makefile  	examples/paned/paned.c  	examples/pixmap/Makefile  	examples/pixmap/pixmap.c  	examples/progressbar/Makefile  	examples/progressbar/progressbar.c  	examples/radiobuttons/Makefile  	examples/radiobuttons/radiobuttons.c  	examples/rangewidgets/Makefile  	examples/rangewidgets/rangewidgets.c  	examples/rulers/Makefile  	examples/rulers/rulers.c  	examples/scribble-simple/Makefile  	examples/scribble-simple/scribble-simple.c  	examples/scrolledwin/Makefile  	examples/scrolledwin/scrolledwin.c  	examples/selection/Makefile  	examples/selection/gettargets.c  	examples/selection/setselection.c  	examples/statusbar/Makefile  	examples/statusbar/statusbar.c  	examples/table/Makefile  	examples/table/table.c  	examples/text/Makefile  	examples/text/text.c  	examples/tictactoe/Makefile  	examples/tictactoe/tictactoe.c  	examples/tictactoe/tictactoe.h  	examples/tictactoe/ttt_test.c  	examples/tree/Makefile  	examples/tree/tree.c  	examples/wheelbarrow/Makefile  	examples/wheelbarrow/wheelbarrow.c  	examples/fixed/fixed.c  	examples/fixed/Makefile  	examples/frame/frame.c  	examples/frame/Makefile  	examples/spinbutton/spinbutton.c  	examples/spinbutton/Makefile  	examples/find-examples.sh
  
-@@ -134,7 +134,7 @@
+@@ -136,7 +136,7 @@
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES =  gtk-config
-+CONFIG_CLEAN_FILES =  gtk11d-config
+-CONFIG_CLEAN_FILES =  gtk+.spec gtk-config
++CONFIG_CLEAN_FILES =  gtk-config
  SCRIPTS =  $(bin_SCRIPTS)
  
  DATA =  $(m4data_DATA)
-@@ -193,7 +193,10 @@
- 	-rm -f config.h
- 
+@@ -198,7 +198,10 @@
  maintainer-clean-hdr:
+ gtk+.spec: $(top_builddir)/config.status gtk+.spec.in
+ 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 -gtk-config: $(top_builddir)/config.status gtk-config.in
-+gtk11d-config.in: gtk-config.in
-+	cp gtk-config.in gtk11d-config.in
++gtk12-config.in: gtk-config.in
++	cp gtk-config.in gtk12-config.in
 +
-+gtk11d-config: $(top_builddir)/config.status gtk11d-config.in
++gtk12-config: $(top_builddir)/config.status gtk12-config.in
  	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  
  install-binSCRIPTS: $(bin_SCRIPTS)
-@@ -411,15 +414,14 @@
+@@ -407,7 +410,6 @@
+ 	      || exit 1; \
+ 	  fi; \
+ 	done
+-	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
+ info-am:
+ info: info-recursive
+ dvi-am:
+@@ -422,13 +424,13 @@
  install-exec-am: install-binSCRIPTS
  install-exec: install-exec-recursive
  
 -install-data-am: install-m4dataDATA
++install-data-am: 
  install-data: install-data-recursive
  
  install-am: all-am
--	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
  install: install-recursive
 -uninstall-am: uninstall-binSCRIPTS uninstall-m4dataDATA
 +uninstall-am: uninstall-binSCRIPTS
  uninstall: uninstall-recursive
--all-am: Makefile $(SCRIPTS) $(DATA) config.h
-+all-am: Makefile $(SCRIPTS) config.h
+ all-am: Makefile $(SCRIPTS) $(DATA) config.h
  all-redirect: all-recursive-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 --- gdk/Makefile.in.orig	Sun Jan 31 23:33:26 1999
 +++ gdk/Makefile.in	Sun Jan 31 23:35:01 1999
-@@ -123,12 +123,12 @@
+@@ -125,7 +125,7 @@
  
  gdkincludedir = $(includedir)/gdk
  
 -lib_LTLIBRARIES = libgdk.la
-+lib_LTLIBRARIES = libgdk11d.la
++lib_LTLIBRARIES = libgdk12.la
  
  INCLUDES =  	-DG_LOG_DOMAIN=\"Gdk\"		-I$(top_srcdir)			@GTK_DEBUG_FLAGS@ 		@GTK_XIM_FLAGS@			@GTK_LOCALE_FLAGS@		@GLIB_CFLAGS@			@x_cflags@ 
  
- 
--libgdk_la_SOURCES =  	gdk.c			gdkcc.c			gdkcolor.c		gdkcursor.c		gdkdnd.c		gdkdraw.c		gdkevents.c     	gdkfont.c		gdkgc.c			gdkglobals.c		gdkim.c			gdkimage.c		gdkinput.c		gdkinput.h		gdkinputnone.h  	gdkinputcommon.h 	gdkinputgxi.h		gdkinputxfree.h		gdkpixmap.c		gdkproperty.c		gdkrgb.c		gdkrectangle.c		gdkregion.c		gdkselection.c		gdkvisual.c		gdkwindow.c		gdkxid.c 		MwmUtil.h       	gxid_lib.h		gxid_proto.h	        gxid_lib.c
-+libgdk11d_la_SOURCES =  	gdk.c			gdkcc.c			gdkcolor.c		gdkcursor.c		gdkdnd.c		gdkdraw.c		gdkevents.c     	gdkfont.c		gdkgc.c			gdkglobals.c		gdkim.c			gdkimage.c		gdkinput.c		gdkinput.h		gdkinputnone.h  	gdkinputcommon.h 	gdkinputgxi.h		gdkinputxfree.h		gdkpixmap.c		gdkproperty.c		gdkrgb.c		gdkrectangle.c		gdkregion.c		gdkselection.c		gdkvisual.c		gdkwindow.c		gdkxid.c 		MwmUtil.h       	gxid_lib.h		gxid_proto.h	        gxid_lib.c
- 
- 
- gdkinclude_HEADERS =  	gdk.h			gdkcursors.h		gdkrgb.h		gdki18n.h		gdkkeysyms.h		gdkprivate.h		gdktypes.h		gdkx.h
-@@ -137,7 +137,7 @@
+@@ -139,7 +139,7 @@
  LDADDS =  	@x_ldflags@		@x_libs@		@GLIB_LIBS@		-lm
  
  
 -libgdk_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)          @GLIB_DEPLIBS@	         @x_ldflags@	         @x_libs@	         -lm
-+libgdk11d_la_LDFLAGS =  	-version-info 1:3:0 @GLIB_DEPLIBS@	         @x_ldflags@	         @x_libs@	         -lm
++libgdk_la_LDFLAGS =  	-version-info 1:0:0 @GLIB_DEPLIBS@	         @x_ldflags@	         @x_libs@	         -lm
  
  
  EXTRA_PROGRAMS = gxid
-@@ -161,8 +161,8 @@
- X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--libgdk_la_LIBADD = 
--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 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 \
-@@ -186,8 +186,8 @@
- 
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(libgdk_la_SOURCES) $(gxid_SOURCES)
--OBJECTS = $(libgdk_la_OBJECTS) $(gxid_OBJECTS)
-+SOURCES = $(libgdk11d_la_SOURCES) $(gxid_SOURCES)
-+OBJECTS = $(libgdk11d_la_OBJECTS) $(gxid_OBJECTS)
- 
- all: all-redirect
- .SUFFIXES:
-@@ -263,8 +263,8 @@
+@@ -265,7 +265,7 @@
  
  maintainer-clean-libtool:
  
 -libgdk.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES)
--	$(LINK) -rpath $(libdir) $(libgdk_la_LDFLAGS) $(libgdk_la_OBJECTS) $(libgdk_la_LIBADD) $(LIBS)
-+libgdk11d.la: $(libgdk11d_la_OBJECTS) $(libgdk11d_la_DEPENDENCIES)
-+	$(LINK) -rpath $(libdir) $(libgdk11d_la_LDFLAGS) $(libgdk11d_la_OBJECTS) $(libgdk11d_la_LIBADD) $(LIBS)
++libgdk12.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES)
+ 	$(LINK) -rpath $(libdir) $(libgdk_la_LDFLAGS) $(libgdk_la_OBJECTS) $(libgdk_la_LIBADD) $(LIBS)
  
  mostlyclean-binPROGRAMS:
- 
 --- gtk/Makefile.in.orig	Sun Jan 31 23:35:10 1999
 +++ gtk/Makefile.in	Sun Jan 31 23:37:31 1999
-@@ -125,12 +125,12 @@
+@@ -127,7 +127,7 @@
  
  gtkincludedir = $(includedir)/gtk
  
 -lib_LTLIBRARIES = libgtk.la
-+lib_LTLIBRARIES = libgtk11d.la
++lib_LTLIBRARIES = libgtk12.la
  
  static_SOURCES =  	gtkaccelgroup.c			gtkaccellabel.c			gtkadjustment.c			gtkalignment.c			gtkarg.c			gtkarrow.c			gtkaspectframe.c		gtkbin.c			gtkbindings.c			gtkbbox.c			gtkbox.c			gtkbutton.c			gtkcalendar.c			gtkcheckbutton.c		gtkcheckmenuitem.c		gtkclist.c			gtkcolorsel.c			gtkcombo.c			gtkcontainer.c			gtkctree.c			gtkcurve.c			gtkdata.c			gtkdialog.c			gtkdnd.c			gtkdrawingarea.c		gtkeditable.c           	gtkentry.c			gtkeventbox.c			gtkfilesel.c			gtkfixed.c			gtkfontsel.c            	gtkframe.c			gtkgamma.c			gtkgc.c				gtkhandlebox.c			gtkhbbox.c			gtkhbox.c			gtkhpaned.c			gtkhruler.c			gtkhscale.c			gtkhscrollbar.c			gtkhseparator.c			gtkimage.c			gtkinputdialog.c		gtkintl.h			gtkinvisible.c			gtkitem.c			gtkitemfactory.c		gtklabel.c			gtklayout.c			gtklist.c			gtklistitem.c			gtkmain.c			gtkmenu.c			gtkmenubar.c			gtkmenufactory.c		gtkmenuitem.c			gtkmenushell.c			gtkmisc.c			gtknotebook.c			gtkobject.c			gtkoptionmenu.c			gtkpacker.c			gtkpaned.c			gtkpixmap.c			gtkplug.c               	gtkpreview.c			gtkprogress.c			gtkprogressbar.c		gtkradiobutton.c		gtkradiomenuitem.c		gtkrange.c			gtkrc.c				gtkruler.c			gtkscale.c			gtkscrollbar.c			gtkscrolledwindow.c		gtkselection.c			gtkseparator.c			gtksignal.c			gtksocket.c             	gtkspinbutton.c			gtkstyle.c			gtkstatusbar.c			gtktable.c			gtktearoffmenuitem.c    	gtktext.c			gtkthemes.c			gtktipsquery.c			gtktogglebutton.c		gtktoolbar.c			gtktooltips.c			gtktree.c			gtktreeitem.c			gtktypeutils.c			gtkvbbox.c			gtkvbox.c			gtkviewport.c			gtkvpaned.c			gtkvruler.c			gtkvscale.c			gtkvscrollbar.c			gtkvseparator.c			gtkwidget.c			gtkwindow.c			fnmatch.c			fnmatch.h
  
+@@ -152,26 +152,26 @@
+ gdk_headers =  	../gdk/gdktypes.h 	../gdk/gdkrgb.h
  
--libgtk_la_SOURCES =  	$(static_SOURCES)		gtkmarshal.c
-+libgtk11d_la_SOURCES =  	$(static_SOURCES)		gtkmarshal.c
  
+-libgtk_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)		-release $(LT_RELEASE) 						@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm
++libgtk_la_LDFLAGS =  	-version-info 1:0:0 @GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm
  
- # Source headers which are non-autogenerated headers
-@@ -150,7 +150,7 @@
- gdk_headers =  	../gdk/gdktypes.h 	../gdk/gdkrgb.h
+ #	$(top_builddir)/gdk/libgdk.la
  
+-gtkconfdir = $(sysconfdir)/gtk
++gtkconfdir = $(datadir)/themes/Default/gtk
+ gtkconf_DATA = gtkrc gtkrc.ja gtkrc.ko gtkrc.ru
  
--libgtk_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)		-release $(LT_RELEASE) 						@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm
-+libgtk11d_la_LDFLAGS =  	-version-info 1:3:0 @GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm
+ EXTRA_DIST =  	line-arrow.xbm 			line-wrap.xbm 			testgtk.1 			testgtkrc 			testgtkrc2 			gtkfeatures.h.in		makeenums.pl			makeenums.awk			maketypes.awk			makeenums.h			gtkargcollector.c		gtktypebuiltins_vars.c		gtktypebuiltins_ids.c		gtktypebuiltins_evals.c		gtk-boxed.defs			gtk.defs			genmarshal.pl			gtkmarshal.list			check-y.xpm			check-n.xpm			test.xpm			marble.xpm			3DRings.xpm			FilesQueue.xpm			Modeller.xpm			tree_plus.xpm			tree_minus.xpm			tree_plus.xbm			tree_minus.xbm                  circles.xbm			gtkrc.ja 			gtkrc.ko			gtkrc.ru
+ 
+ 
+-INCLUDES =  	-DGTK_DISABLE_COMPAT_H					-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_EXE_PREFIX=\"$(exec_prefix)\"			-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(sysconfdir)\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-I$(top_srcdir)						@GTK_DEBUG_FLAGS@					@GTK_XIM_FLAGS@						@GTK_LOCALE_FLAGS@					@GLIB_CFLAGS@						@x_cflags@
++INCLUDES =  	-DGTK_DISABLE_COMPAT_H					-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_EXE_PREFIX=\"$(exec_prefix)\"			-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(gtkconfdir)\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-I$(top_srcdir)						@GTK_DEBUG_FLAGS@					@GTK_XIM_FLAGS@						@GTK_LOCALE_FLAGS@					@GLIB_CFLAGS@						@x_cflags@
  
  
- EXTRA_DIST =  	line-arrow.xbm 			line-wrap.xbm 			testgtk.1 			testgtkrc 			testgtkrc2 			gtkfeatures.h.in		makeenums.pl			makeenums.awk			maketypes.awk			makeenums.h			gtkargcollector.c		gtktypebuiltins_vars.c		gtktypebuiltins_ids.c		gtktypebuiltins_evals.c		gtk-boxed.defs			gtk.defs			genmarshal.pl			gtkmarshal.list			check-y.xpm			check-n.xpm			test.xpm			marble.xpm			3DRings.xpm			FilesQueue.xpm			Modeller.xpm			tree_plus.xpm			tree_minus.xpm			tree_plus.xbm			tree_minus.xbm                  circles.xbm
-@@ -162,10 +162,10 @@
  noinst_PROGRAMS = testgtk testinput testselection testrgb testdnd simple 
  # testthreads
  
 -DEPS =  	libgtk.la						$(top_builddir)/gdk/libgdk.la
-+DEPS =  	libgtk11d.la						$(top_builddir)/gdk/libgdk11d.la
++DEPS =  	libgtk12.la						$(top_builddir)/gdk/libgdk12.la
  
  
 -LDADDS =  	libgtk.la						$(top_builddir)/gdk/libgdk.la				@x_ldflags@						@x_libs@						@GLIB_LIBS@                                     	-lm
-+LDADDS =  	libgtk11d.la						$(top_builddir)/gdk/libgdk11d.la				@x_ldflags@						@x_libs@						@GLIB_LIBS@                                     	-lm
++LDADDS =  	libgtk12.la						$(top_builddir)/gdk/libgdk12.la				@x_ldflags@						@x_libs@						@GLIB_LIBS@                                     	-lm
  
  
  testgtk_DEPENDENCIES = $(DEPS)
-@@ -197,8 +197,8 @@
- X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--libgtk_la_LIBADD = 
--libgtk_la_OBJECTS =  gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \
-+libgtk11d_la_LIBADD = 
-+libgtk11d_la_OBJECTS =  gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \
- 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 \
-@@ -255,8 +255,8 @@
- 
- TAR = tar
- GZIP_ENV = --best
--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: all-redirect
- .SUFFIXES:
-@@ -334,8 +334,8 @@
+@@ -342,7 +342,7 @@
  
  maintainer-clean-libtool:
  
 -libgtk.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES)
--	$(LINK) -rpath $(libdir) $(libgtk_la_LDFLAGS) $(libgtk_la_OBJECTS) $(libgtk_la_LIBADD) $(LIBS)
-+libgtk11d.la: $(libgtk11d_la_OBJECTS) $(libgtk11d_la_DEPENDENCIES)
-+	$(LINK) -rpath $(libdir) $(libgtk11d_la_LDFLAGS) $(libgtk11d_la_OBJECTS) $(libgtk11d_la_LIBADD) $(LIBS)
++libgtk12.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES)
+ 	$(LINK) -rpath $(libdir) $(libgtk_la_LDFLAGS) $(libgtk_la_OBJECTS) $(libgtk_la_LIBADD) $(LIBS)
  
  mostlyclean-noinstPROGRAMS:
- 
-@@ -450,7 +450,7 @@
- uninstall-am: uninstall-libLTLIBRARIES uninstall-gtkincludeHEADERS \
- 		uninstall-local
+@@ -478,7 +478,7 @@
+ uninstall-am: uninstall-libLTLIBRARIES uninstall-gtkconfDATA \
+ 		uninstall-gtkincludeHEADERS uninstall-local
  uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
++all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
  all-redirect: all-am
  install-strip:
  	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
---- po/Makefile.in.in.orig	Sun Jan 31 23:37:42 1999
-+++ po/Makefile.in.in	Sun Jan 31 23:37:51 1999
-@@ -18,7 +18,7 @@
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--datadir = $(prefix)/@DATADIRNAME@
-+datadir = $(prefix)/share
- localedir = $(datadir)/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
---- docs/Makefile.in.orig	Tue Feb  2 03:29:59 1999
-+++ docs/Makefile.in	Tue Feb  2 03:30:15 1999
+@@ -599,17 +599,11 @@
+ 	&& echo timestamp > stamp-m
+ 
+ gtkrc:
+-	:
+-
+-# We create a dummy theme for the default GTK+ theme
++	echo "# Empty gtkrc for default theme" > gtkrc
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk
+-	echo "# Empty gtkrc for default theme" > \
+-	    $(DESTDIR)$(datadir)/themes/Default/gtk/gtkrc
+ 
+ uninstall-local:
+-	rm -f $(DESTDIR)$(datadir)/themes/Default/gtkrc
+ 
+ .PHONY: files test test-debug
+ 
+--- docs/Makefile.in.orig	Thu Feb 25 22:17:02 1999
++++ docs/Makefile.in	Tue Mar  2 11:39:50 1999
 @@ -99,7 +99,7 @@
  LT_RELEASE = @LT_RELEASE@
  LT_REVISION = @LT_REVISION@
@@ -211,3 +174,30 @@
  MKINSTALLDIRS = @MKINSTALLDIRS@
  NM = @NM@
  PACKAGE = @PACKAGE@
+@@ -125,7 +125,7 @@
+ 
+ info_TEXINFOS = gdk.texi gtk.texi 
+ 
+-man_MANS = gtk-config.1
++man_MANS = gtk12-config.1
+ 
+ TUTORIAL_FR_FILES = html/gtk_tut_fr-1.html   	html/gtk_tut_fr-2.html   	html/gtk_tut_fr-3.html   	html/gtk_tut_fr-4.html   	html/gtk_tut_fr-5.html   	html/gtk_tut_fr-6.html   	html/gtk_tut_fr-7.html   	html/gtk_tut_fr-8.html   	html/gtk_tut_fr-9.html   	html/gtk_tut_fr-10.html  	html/gtk_tut_fr-11.html  	html/gtk_tut_fr-12.html  	html/gtk_tut_fr-13.html  	html/gtk_tut_fr-14.html  	html/gtk_tut_fr-15.html  	html/gtk_tut_fr-16.html  	html/gtk_tut_fr-17.html  	html/gtk_tut_fr-18.html  	html/gtk_tut_fr-19.html  	html/gtk_tut_fr-20.html  	html/gtk_tut_fr-21.html  	html/gtk_tut_fr-22.html  	html/gtk_tut_fr-23.html  	html/gtk_tut_fr-24.html  	html/gtk_tut_fr.html text/gtk_tut_fr.txt
+ 
+@@ -139,7 +139,7 @@
+ FAQ_FILES = html/gtkfaq.html			html/gtkfaq-1.html       		html/gtkfaq-2.html       		html/gtkfaq-3.html       		html/gtkfaq-4.html       		html/gtkfaq-5.html       		html/gtkfaq-6.html       		html/gtkfaq-7.html			text/gtkfaq.txt
+ 
+ 
+-EXTRA_DIST =  	gtk-config.1			texinfo.tex 			macros.texi			gtkdocs_fix			gtkfaq.sgml		        gtk-config.txt          	gtk_tut.sgml			gtk_tut_it.sgml			gtk_tut_fr.sgml			debugging.txt			developers.txt			refcounting.txt			styles.txt			text_widget.txt 		widget_system.txt 		gtk_tut_packbox1.gif 		gtk_tut_packbox2.gif 		html/gtk_tut_table.gif		html/gtk_tut_packbox1.gif 		html/gtk_tut_packbox2.gif 		gtk_tut_table.gif		html/gdk.html            		html/gdk_toc.html        		html/gtk.html            		html/gtk_toc.html        		$(TUTORIAL_FILES)			$(TUTORIAL_FR_FILES)			$(TUTORIAL_IT_FILES)			$(FAQ_FILES)
++EXTRA_DIST =  	gtk12-config.1			texinfo.tex 			macros.texi			gtkdocs_fix			gtkfaq.sgml		        gtk-config.txt          	gtk_tut.sgml			gtk_tut_it.sgml			gtk_tut_fr.sgml			debugging.txt			developers.txt			refcounting.txt			styles.txt			text_widget.txt 		widget_system.txt 		gtk_tut_packbox1.gif 		gtk_tut_packbox2.gif 		html/gtk_tut_table.gif		html/gtk_tut_packbox1.gif 		html/gtk_tut_packbox2.gif 		gtk_tut_table.gif		html/gdk.html            		html/gdk_toc.html        		html/gtk.html            		html/gtk_toc.html        		$(TUTORIAL_FILES)			$(TUTORIAL_FR_FILES)			$(TUTORIAL_IT_FILES)			$(FAQ_FILES)
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+@@ -177,6 +177,8 @@
+ gtk.info: gtk.texi
+ gtk.dvi: gtk.texi
+ 
++gtk12-config.1: gtk-config.1
++	cp gtk-config.1 gtk12-config.1
+ 
+ DVIPS = dvips
+ 
diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-ab
index 8bcd09e856f3..5daa432dc5b9 100644
--- a/x11-toolkits/gtk12/files/patch-ab
+++ b/x11-toolkits/gtk12/files/patch-ab
@@ -1,10 +1,19 @@
 --- gtk-config.in.orig	Thu Feb  4 17:06:44 1999
 +++ gtk-config.in	Wed Feb 17 21:22:48 1999
+@@ -12,7 +12,7 @@
+ usage()
+ {
+ 	cat <<EOF
+-Usage: gtk-config [OPTIONS] [LIBRARIES]
++Usage: gtk12-config [OPTIONS] [LIBRARIES]
+ Options:
+ 	[--prefix[=DIR]]
+ 	[--exec-prefix[=DIR]]
 @@ -115,6 +115,6 @@
          fi
        done
  
 -      echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
-+      echo $libdirs @x_ldflags@ -lgtk11d -lgdk11d $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
++      echo $libdirs @x_ldflags@ -lgtk12 -lgdk12 $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
  fi      
  
diff --git a/x11-toolkits/gtk12/files/patch-ad b/x11-toolkits/gtk12/files/patch-ad
index e0851a1a730f..43832268e1e3 100644
--- a/x11-toolkits/gtk12/files/patch-ad
+++ b/x11-toolkits/gtk12/files/patch-ad
@@ -1,6 +1,6 @@
 --- gtk/gtkrc.c.orig	Mon Jan  4 17:33:28 1999
 +++ gtk/gtkrc.c	Tue Jan  5 07:41:04 1999
-@@ -223,9 +223,9 @@
+@@ -231,9 +231,9 @@
  
    var = getenv("GTK_EXE_PREFIX");
    if (var)
@@ -12,7 +12,7 @@
  
    return path;
  }
-@@ -238,9 +238,9 @@
+@@ -246,9 +246,9 @@
  
    var = getenv("GTK_DATA_PREFIX");
    if (var)
@@ -24,7 +24,7 @@
    
    for (n = 0; pixmap_path[n]; n++) ;
    if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1)
-@@ -274,15 +274,15 @@
+@@ -282,15 +282,15 @@
    
    var = getenv("GTK_EXE_PREFIX");
    if (var)
@@ -43,3 +43,12 @@
    module_path[n++] = g_strdup(path);
    module_path[n] = NULL;
    g_free(path);
+@@ -324,7 +324,7 @@
+     }
+   else
+     {
+-      str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtk/gtkrc");
++      str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtkrc");
+       gtk_rc_add_default_file (str);
+       g_free (str);
+ 
diff --git a/x11-toolkits/gtk12/files/patch-ae b/x11-toolkits/gtk12/files/patch-ae
index 20f506155853..854b0d4e5cc3 100644
--- a/x11-toolkits/gtk12/files/patch-ae
+++ b/x11-toolkits/gtk12/files/patch-ae
@@ -1,11 +1,11 @@
---- configure.orig	Thu Feb 18 01:35:07 1999
-+++ configure	Thu Feb 18 01:35:27 1999
-@@ -4444,7 +4444,7 @@
- 
- # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME
- # this is the directory where the *.{mo,gmo} files are installed
--gtklocaledir='${prefix}/${DATADIRNAME}/locale'
-+gtklocaledir='${prefix}/share/locale'
- 
- 
- echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6
+--- configure.orig	Thu Feb 25 13:02:28 1999
++++ configure	Tue Mar  2 11:11:14 1999
+@@ -3977,7 +3977,7 @@
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CATOBJEXT=.mo
+-		   DATADIRNAME=lib
++		   DATADIRNAME=share
+ fi
+ rm -f conftest*
+ 		INSTOBJEXT=.mo
diff --git a/x11-toolkits/gtk12/pkg-descr b/x11-toolkits/gtk12/pkg-descr
index 15cddd29f66d..75f50206dbe7 100644
--- a/x11-toolkits/gtk12/pkg-descr
+++ b/x11-toolkits/gtk12/pkg-descr
@@ -2,10 +2,9 @@
 the Motif "look and feel". It is designed to be small and efficient, but
 still flexible enough to allow the programmer freedom in the interfaces
 created. GTK allows the programmer to use a variety of standard user
-interface widgets (*note Widgets::.) such as push, radio and check
-buttons, menus, lists and frames. It also provides several "container"
-widgets which can be used to control the layout of the user interface
-elements.
+interface widgets such as push, radio and check buttons, menus, lists
+and frames. It also provides several "container" widgets which can be
+used to control the layout of the user interface elements.
 
    GTK provides some unique features. (At least, I know of no other
 widget library which provides them). For example, a button does not
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index 33398999e7a4..eaa533417e51 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -1,124 +1,124 @@
-bin/gtk11d-config
-include/gtk11d/gdk/gdk.h
-include/gtk11d/gdk/gdkcursors.h
-include/gtk11d/gdk/gdki18n.h
-include/gtk11d/gdk/gdkkeysyms.h
-include/gtk11d/gdk/gdkprivate.h
-include/gtk11d/gdk/gdkrgb.h
-include/gtk11d/gdk/gdktypes.h
-include/gtk11d/gdk/gdkx.h
-include/gtk11d/gtk/gtk.h
-include/gtk11d/gtk/gtkaccelgroup.h
-include/gtk11d/gtk/gtkaccellabel.h
-include/gtk11d/gtk/gtkadjustment.h
-include/gtk11d/gtk/gtkalignment.h
-include/gtk11d/gtk/gtkarg.h
-include/gtk11d/gtk/gtkarrow.h
-include/gtk11d/gtk/gtkaspectframe.h
-include/gtk11d/gtk/gtkbbox.h
-include/gtk11d/gtk/gtkbin.h
-include/gtk11d/gtk/gtkbindings.h
-include/gtk11d/gtk/gtkbox.h
-include/gtk11d/gtk/gtkbutton.h
-include/gtk11d/gtk/gtkcalendar.h
-include/gtk11d/gtk/gtkcheckbutton.h
-include/gtk11d/gtk/gtkcheckmenuitem.h
-include/gtk11d/gtk/gtkclist.h
-include/gtk11d/gtk/gtkcolorsel.h
-include/gtk11d/gtk/gtkcombo.h
-include/gtk11d/gtk/gtkcompat.h
-include/gtk11d/gtk/gtkcontainer.h
-include/gtk11d/gtk/gtkctree.h
-include/gtk11d/gtk/gtkcurve.h
-include/gtk11d/gtk/gtkdata.h
-include/gtk11d/gtk/gtkdebug.h
-include/gtk11d/gtk/gtkdialog.h
-include/gtk11d/gtk/gtkdnd.h
-include/gtk11d/gtk/gtkdrawingarea.h
-include/gtk11d/gtk/gtkeditable.h
-include/gtk11d/gtk/gtkentry.h
-include/gtk11d/gtk/gtkenums.h
-include/gtk11d/gtk/gtkeventbox.h
-include/gtk11d/gtk/gtkfeatures.h
-include/gtk11d/gtk/gtkfilesel.h
-include/gtk11d/gtk/gtkfixed.h
-include/gtk11d/gtk/gtkfontsel.h
-include/gtk11d/gtk/gtkframe.h
-include/gtk11d/gtk/gtkgamma.h
-include/gtk11d/gtk/gtkgc.h
-include/gtk11d/gtk/gtkhandlebox.h
-include/gtk11d/gtk/gtkhbbox.h
-include/gtk11d/gtk/gtkhbox.h
-include/gtk11d/gtk/gtkhpaned.h
-include/gtk11d/gtk/gtkhruler.h
-include/gtk11d/gtk/gtkhscale.h
-include/gtk11d/gtk/gtkhscrollbar.h
-include/gtk11d/gtk/gtkhseparator.h
-include/gtk11d/gtk/gtkimage.h
-include/gtk11d/gtk/gtkinputdialog.h
-include/gtk11d/gtk/gtkinvisible.h
-include/gtk11d/gtk/gtkitem.h
-include/gtk11d/gtk/gtkitemfactory.h
-include/gtk11d/gtk/gtklabel.h
-include/gtk11d/gtk/gtklayout.h
-include/gtk11d/gtk/gtklist.h
-include/gtk11d/gtk/gtklistitem.h
-include/gtk11d/gtk/gtkmain.h
-include/gtk11d/gtk/gtkmarshal.h
-include/gtk11d/gtk/gtkmenu.h
-include/gtk11d/gtk/gtkmenubar.h
-include/gtk11d/gtk/gtkmenufactory.h
-include/gtk11d/gtk/gtkmenuitem.h
-include/gtk11d/gtk/gtkmenushell.h
-include/gtk11d/gtk/gtkmisc.h
-include/gtk11d/gtk/gtknotebook.h
-include/gtk11d/gtk/gtkobject.h
-include/gtk11d/gtk/gtkoptionmenu.h
-include/gtk11d/gtk/gtkpacker.h
-include/gtk11d/gtk/gtkpaned.h
-include/gtk11d/gtk/gtkpixmap.h
-include/gtk11d/gtk/gtkplug.h
-include/gtk11d/gtk/gtkpreview.h
-include/gtk11d/gtk/gtkprivate.h
-include/gtk11d/gtk/gtkprogress.h
-include/gtk11d/gtk/gtkprogressbar.h
-include/gtk11d/gtk/gtkradiobutton.h
-include/gtk11d/gtk/gtkradiomenuitem.h
-include/gtk11d/gtk/gtkrange.h
-include/gtk11d/gtk/gtkrc.h
-include/gtk11d/gtk/gtkruler.h
-include/gtk11d/gtk/gtkscale.h
-include/gtk11d/gtk/gtkscrollbar.h
-include/gtk11d/gtk/gtkscrolledwindow.h
-include/gtk11d/gtk/gtkselection.h
-include/gtk11d/gtk/gtkseparator.h
-include/gtk11d/gtk/gtksignal.h
-include/gtk11d/gtk/gtksocket.h
-include/gtk11d/gtk/gtkspinbutton.h
-include/gtk11d/gtk/gtkstatusbar.h
-include/gtk11d/gtk/gtkstyle.h
-include/gtk11d/gtk/gtktable.h
-include/gtk11d/gtk/gtktearoffmenuitem.h
-include/gtk11d/gtk/gtktext.h
-include/gtk11d/gtk/gtkthemes.h
-include/gtk11d/gtk/gtktipsquery.h
-include/gtk11d/gtk/gtktogglebutton.h
-include/gtk11d/gtk/gtktoolbar.h
-include/gtk11d/gtk/gtktooltips.h
-include/gtk11d/gtk/gtktree.h
-include/gtk11d/gtk/gtktreeitem.h
-include/gtk11d/gtk/gtktypebuiltins.h
-include/gtk11d/gtk/gtktypeutils.h
-include/gtk11d/gtk/gtkvbbox.h
-include/gtk11d/gtk/gtkvbox.h
-include/gtk11d/gtk/gtkviewport.h
-include/gtk11d/gtk/gtkvpaned.h
-include/gtk11d/gtk/gtkvruler.h
-include/gtk11d/gtk/gtkvscale.h
-include/gtk11d/gtk/gtkvscrollbar.h
-include/gtk11d/gtk/gtkvseparator.h
-include/gtk11d/gtk/gtkwidget.h
-include/gtk11d/gtk/gtkwindow.h
+bin/gtk12-config
+include/gtk12/gdk/gdk.h
+include/gtk12/gdk/gdkcursors.h
+include/gtk12/gdk/gdki18n.h
+include/gtk12/gdk/gdkkeysyms.h
+include/gtk12/gdk/gdkprivate.h
+include/gtk12/gdk/gdkrgb.h
+include/gtk12/gdk/gdktypes.h
+include/gtk12/gdk/gdkx.h
+include/gtk12/gtk/gtk.h
+include/gtk12/gtk/gtkaccelgroup.h
+include/gtk12/gtk/gtkaccellabel.h
+include/gtk12/gtk/gtkadjustment.h
+include/gtk12/gtk/gtkalignment.h
+include/gtk12/gtk/gtkarg.h
+include/gtk12/gtk/gtkarrow.h
+include/gtk12/gtk/gtkaspectframe.h
+include/gtk12/gtk/gtkbbox.h
+include/gtk12/gtk/gtkbin.h
+include/gtk12/gtk/gtkbindings.h
+include/gtk12/gtk/gtkbox.h
+include/gtk12/gtk/gtkbutton.h
+include/gtk12/gtk/gtkcalendar.h
+include/gtk12/gtk/gtkcheckbutton.h
+include/gtk12/gtk/gtkcheckmenuitem.h
+include/gtk12/gtk/gtkclist.h
+include/gtk12/gtk/gtkcolorsel.h
+include/gtk12/gtk/gtkcombo.h
+include/gtk12/gtk/gtkcompat.h
+include/gtk12/gtk/gtkcontainer.h
+include/gtk12/gtk/gtkctree.h
+include/gtk12/gtk/gtkcurve.h
+include/gtk12/gtk/gtkdata.h
+include/gtk12/gtk/gtkdebug.h
+include/gtk12/gtk/gtkdialog.h
+include/gtk12/gtk/gtkdnd.h
+include/gtk12/gtk/gtkdrawingarea.h
+include/gtk12/gtk/gtkeditable.h
+include/gtk12/gtk/gtkentry.h
+include/gtk12/gtk/gtkenums.h
+include/gtk12/gtk/gtkeventbox.h
+include/gtk12/gtk/gtkfeatures.h
+include/gtk12/gtk/gtkfilesel.h
+include/gtk12/gtk/gtkfixed.h
+include/gtk12/gtk/gtkfontsel.h
+include/gtk12/gtk/gtkframe.h
+include/gtk12/gtk/gtkgamma.h
+include/gtk12/gtk/gtkgc.h
+include/gtk12/gtk/gtkhandlebox.h
+include/gtk12/gtk/gtkhbbox.h
+include/gtk12/gtk/gtkhbox.h
+include/gtk12/gtk/gtkhpaned.h
+include/gtk12/gtk/gtkhruler.h
+include/gtk12/gtk/gtkhscale.h
+include/gtk12/gtk/gtkhscrollbar.h
+include/gtk12/gtk/gtkhseparator.h
+include/gtk12/gtk/gtkimage.h
+include/gtk12/gtk/gtkinputdialog.h
+include/gtk12/gtk/gtkinvisible.h
+include/gtk12/gtk/gtkitem.h
+include/gtk12/gtk/gtkitemfactory.h
+include/gtk12/gtk/gtklabel.h
+include/gtk12/gtk/gtklayout.h
+include/gtk12/gtk/gtklist.h
+include/gtk12/gtk/gtklistitem.h
+include/gtk12/gtk/gtkmain.h
+include/gtk12/gtk/gtkmarshal.h
+include/gtk12/gtk/gtkmenu.h
+include/gtk12/gtk/gtkmenubar.h
+include/gtk12/gtk/gtkmenufactory.h
+include/gtk12/gtk/gtkmenuitem.h
+include/gtk12/gtk/gtkmenushell.h
+include/gtk12/gtk/gtkmisc.h
+include/gtk12/gtk/gtknotebook.h
+include/gtk12/gtk/gtkobject.h
+include/gtk12/gtk/gtkoptionmenu.h
+include/gtk12/gtk/gtkpacker.h
+include/gtk12/gtk/gtkpaned.h
+include/gtk12/gtk/gtkpixmap.h
+include/gtk12/gtk/gtkplug.h
+include/gtk12/gtk/gtkpreview.h
+include/gtk12/gtk/gtkprivate.h
+include/gtk12/gtk/gtkprogress.h
+include/gtk12/gtk/gtkprogressbar.h
+include/gtk12/gtk/gtkradiobutton.h
+include/gtk12/gtk/gtkradiomenuitem.h
+include/gtk12/gtk/gtkrange.h
+include/gtk12/gtk/gtkrc.h
+include/gtk12/gtk/gtkruler.h
+include/gtk12/gtk/gtkscale.h
+include/gtk12/gtk/gtkscrollbar.h
+include/gtk12/gtk/gtkscrolledwindow.h
+include/gtk12/gtk/gtkselection.h
+include/gtk12/gtk/gtkseparator.h
+include/gtk12/gtk/gtksignal.h
+include/gtk12/gtk/gtksocket.h
+include/gtk12/gtk/gtkspinbutton.h
+include/gtk12/gtk/gtkstatusbar.h
+include/gtk12/gtk/gtkstyle.h
+include/gtk12/gtk/gtktable.h
+include/gtk12/gtk/gtktearoffmenuitem.h
+include/gtk12/gtk/gtktext.h
+include/gtk12/gtk/gtkthemes.h
+include/gtk12/gtk/gtktipsquery.h
+include/gtk12/gtk/gtktogglebutton.h
+include/gtk12/gtk/gtktoolbar.h
+include/gtk12/gtk/gtktooltips.h
+include/gtk12/gtk/gtktree.h
+include/gtk12/gtk/gtktreeitem.h
+include/gtk12/gtk/gtktypebuiltins.h
+include/gtk12/gtk/gtktypeutils.h
+include/gtk12/gtk/gtkvbbox.h
+include/gtk12/gtk/gtkvbox.h
+include/gtk12/gtk/gtkviewport.h
+include/gtk12/gtk/gtkvpaned.h
+include/gtk12/gtk/gtkvruler.h
+include/gtk12/gtk/gtkvscale.h
+include/gtk12/gtk/gtkvscrollbar.h
+include/gtk12/gtk/gtkvseparator.h
+include/gtk12/gtk/gtkwidget.h
+include/gtk12/gtk/gtkwindow.h
 @unexec install-info --delete %D/info/gdk.info %D/info/dir
 @unexec install-info --delete %D/info/gtk.info %D/info/dir
 info/gdk.info
@@ -126,20 +126,21 @@ info/gtk.info
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/gdk.info %D/info/dir
 @exec install-info %D/info/gtk.info %D/info/dir
-lib/libgdk11d.a
-lib/libgdk11d.la
-lib/libgdk11d.so
-lib/libgdk11d.so.1.3
-lib/libgtk11d.a
-lib/libgtk11d.la
-lib/libgtk11d.so
-lib/libgtk11d.so.1.3
+lib/libgdk12.a
+lib/libgdk12.la
+lib/libgdk12.so
+lib/libgdk12.so.1
+lib/libgtk12.a
+lib/libgtk12.la
+lib/libgtk12.so
+lib/libgtk12.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/locale/cs/LC_MESSAGES/gtk+.mo
 share/locale/de/LC_MESSAGES/gtk+.mo
 share/locale/es/LC_MESSAGES/gtk+.mo
 share/locale/fr/LC_MESSAGES/gtk+.mo
+share/locale/hu/LC_MESSAGES/gtk+.mo
 share/locale/it/LC_MESSAGES/gtk+.mo
 share/locale/ja/LC_MESSAGES/gtk+.mo
 share/locale/ko/LC_MESSAGES/gtk+.mo
@@ -150,10 +151,14 @@ share/locale/pt/LC_MESSAGES/gtk+.mo
 share/locale/ru/LC_MESSAGES/gtk+.mo
 share/locale/sv/LC_MESSAGES/gtk+.mo
 share/themes/Default/gtk/gtkrc
+share/themes/Default/gtk/gtkrc.ja
+share/themes/Default/gtk/gtkrc.ko
+share/themes/Default/gtk/gtkrc.ru
+@exec mkdir -p %D/share/themes/engines
 @dirrm share/themes/Default/gtk
 @dirrm share/themes/Default
 @dirrm share/themes/engines
 @dirrm share/themes
-@dirrm include/gtk11d/gdk
-@dirrm include/gtk11d/gtk
-@dirrm include/gtk11d
+@dirrm include/gtk12/gdk
+@dirrm include/gtk12/gtk
+@dirrm include/gtk12