7 files changed, 77 insertions, 26 deletions

diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index f555b424f798..167d1959b745 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	1.2.8
-PORTREVISION=	1
+PORTVERSION=	1.2.9
+#PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
diff --git a/x11-toolkits/gtk12/distinfo b/x11-toolkits/gtk12/distinfo
index 1da36a299c34..f5bb1cc31650 100644
--- a/x11-toolkits/gtk12/distinfo
+++ b/x11-toolkits/gtk12/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.2.8.tar.gz) = d947ecc5780b4367d4c50fbb019d0216
+MD5 (gtk+-1.2.9.tar.gz) = 6246b4defcdeb85cf6ce32d644c29b95
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index e26e9de59f45..2903edd7511e 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Fri Sep 24 09:12:11 1999
-+++ Makefile.in	Sat Oct  9 22:05:42 1999
-@@ -129,7 +129,7 @@
+--- Makefile.in.orig	Fri Mar  2 19:49:21 2001
++++ Makefile.in	Tue Mar  6 10:46:49 2001
+@@ -128,7 +128,7 @@
  SRC_SUBDIRS = gdk gtk
  SUBDIRS = po $(SRC_SUBDIRS) docs
  
@@ -9,28 +9,27 @@
  
  # require automake 1.4
  AUTOMAKE_OPTIONS = 1.4
-@@ -142,7 +142,7 @@
+@@ -144,7 +144,7 @@
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES =  gtk+.spec gtk-config
-+CONFIG_CLEAN_FILES =  gtk+.spec gtk@LT_RELEASE@-config
+-CONFIG_CLEAN_FILES =  gtk+.spec gtk-config gdk.pc gtk+.pc
++CONFIG_CLEAN_FILES =  gtk+.spec gtk@LT_RELEASE@-config gdk.pc gtk+.pc
  SCRIPTS =  $(bin_SCRIPTS)
  
- DATA =  $(m4data_DATA)
-@@ -204,7 +204,10 @@
+ DATA =  $(m4data_DATA) $(pkgconfig_DATA)
+@@ -206,7 +206,9 @@
  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
 +gtk@LT_RELEASE@-config.in: gtk-config.in
 +	cp gtk-config.in gtk@LT_RELEASE@-config.in
-+
 +gtk@LT_RELEASE@-config: $(top_builddir)/config.status gtk@LT_RELEASE@-config.in
  	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
- install-binSCRIPTS: $(bin_SCRIPTS)
-@@ -413,7 +416,6 @@
+ gdk.pc: $(top_builddir)/config.status gdk.pc.in
+ 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+@@ -438,7 +440,6 @@
  	      || exit 1; \
  	  fi; \
  	done
@@ -38,3 +37,12 @@
  info-am:
  info: info-recursive
  dvi-am:
+@@ -453,7 +454,7 @@
+ install-exec-am: install-binSCRIPTS
+ install-exec: install-exec-recursive
+ 
+-install-data-am: install-m4dataDATA install-pkgconfigDATA
++install-data-am: install-m4dataDATA
+ install-data: install-data-recursive
+ 
+ install-am: all-am
diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-ab
index 89070faaa84b..ffdba095a18b 100644
--- a/x11-toolkits/gtk12/files/patch-ab
+++ b/x11-toolkits/gtk12/files/patch-ab
@@ -1,5 +1,5 @@
---- gtk-config.in.orig	Thu Feb  4 17:06:44 1999
-+++ gtk-config.in	Wed Feb 17 21:22:48 1999
+--- gtk-config.in.orig	Sat Oct 21 18:20:40 2000
++++ gtk-config.in	Tue Mar  6 10:11:59 2001
 @@ -12,7 +12,7 @@
  usage()
  {
@@ -9,10 +9,20 @@
  Options:
  	[--prefix[=DIR]]
  	[--exec-prefix[=DIR]]
-@@ -115,6 +115,6 @@
+@@ -91,7 +91,7 @@
+ fi
+ 
+ if test "$echo_cflags" = "yes"; then
+-      echo -I@includedir@/gtk-1.2 $glib_cflags @x_cflags@ 
++      echo -I@includedir@ $glib_cflags @x_cflags@ 
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+@@ -107,6 +107,6 @@
          fi
        done
  
 -      echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
 +      echo $libdirs @x_ldflags@ -lgtk@LT_RELEASE@ -lgdk@LT_RELEASE@ $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
  fi      
+ 
diff --git a/x11-toolkits/gtk12/files/patch-ag b/x11-toolkits/gtk12/files/patch-ag
index d7f31e549e84..ad39358c9e18 100644
--- a/x11-toolkits/gtk12/files/patch-ag
+++ b/x11-toolkits/gtk12/files/patch-ag
@@ -1,24 +1,43 @@
---- gtk/Makefile.in.orig	Thu May 25 04:11:04 2000
-+++ gtk/Makefile.in	Thu May 25 13:49:05 2000
+--- gtk/Makefile.in.orig	Fri Mar  2 19:49:26 2001
++++ gtk/Makefile.in	Tue Mar  6 11:04:35 2001
 @@ -125,7 +125,7 @@
  x_libs = @x_libs@
  xinput_progs = @xinput_progs@
  
--INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_DISABLE_COMPAT_H					-DGTK_EXE_PREFIX=\"$(exec_prefix)\"			-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(sysconfdir)\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-I$(top_srcdir)						@GTK_DEBUG_FLAGS@					@GTK_XIM_FLAGS@						@GTK_LOCALE_FLAGS@					@GLIB_CFLAGS@						@x_cflags@					@STRIP_END@
-+INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_DISABLE_COMPAT_H					-DGTK_EXE_PREFIX=\"$(exec_prefix)\"			-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(gtkconfdir)\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-I$(top_srcdir)						@GTK_DEBUG_FLAGS@					@GTK_XIM_FLAGS@						@GTK_LOCALE_FLAGS@					@GLIB_CFLAGS@						@x_cflags@					@STRIP_END@
+-INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_DISABLE_COMPAT_H					-DGTK_LIBDIR=\"$(libdir)\"	     	        	-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(sysconfdir)\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-I$(top_srcdir)						@GTK_DEBUG_FLAGS@					@GTK_XIM_FLAGS@						@GTK_LOCALE_FLAGS@					@GLIB_CFLAGS@						@x_cflags@					@STRIP_END@
++INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_DISABLE_COMPAT_H					-DGTK_LIBDIR=\"$(libdir)\"	     	        	-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@					@STRIP_END@
  
  
  #
-@@ -190,7 +190,7 @@
+@@ -134,7 +134,7 @@
+ lib_LTLIBRARIES = libgtk.la
+ 
+ # libtool stuff: set version and export symbols for resolving
+-libgtkincludedir = $(includedir)/gtk-1.2/gtk
++libgtkincludedir = $(includedir)/gtk
+ libgtk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)		-release $(LT_RELEASE) 						-export-dynamic							@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm							@STRIP_END@
+ 
+ #	$(top_builddir)/gdk/libgdk.la
+@@ -190,8 +190,8 @@
  gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
  CLEANFILES =  $(gen_sources)
  
 -gtkconfdir = $(sysconfdir)/gtk
+-gtkconf_DATA = gtkrc.az gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja 	gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 	gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 	gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 	gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps 	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
 +gtkconfdir = $(datadir)/themes/Default/gtk
- gtkconf_DATA = gtkrc.bg gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja 	gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 	gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 	gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.Big5 	gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps 	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1255
++gtkconf_DATA = gtkrc.az gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja 	gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 	gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 	gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps 	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
  
  
-@@ -503,7 +503,7 @@
+ #
+@@ -415,6 +415,7 @@
+ 	    $(INSTALL_DATA) $$p $(DESTDIR)$(gtkconfdir)/$$p; \
+ 	  fi; fi; \
+ 	done
++	$(INSTALL_DATA) gtkrc.zh_TW.big5 $(DESTDIR)$(gtkconfdir)/gtkrc.zh_TW.Big5
+ 
+ uninstall-gtkconfDATA:
+ 	@$(NORMAL_UNINSTALL)
+@@ -1362,7 +1363,7 @@
  uninstall-am: uninstall-libLTLIBRARIES uninstall-gtkconfDATA \
  		uninstall-libgtkincludeHEADERS uninstall-local
  uninstall: uninstall-am
diff --git a/x11-toolkits/gtk12/files/patch-gdk::Makefile.in b/x11-toolkits/gtk12/files/patch-gdk::Makefile.in
new file mode 100644
index 000000000000..c9887ad4ae65
--- /dev/null
+++ b/x11-toolkits/gtk12/files/patch-gdk::Makefile.in
@@ -0,0 +1,11 @@
+--- gdk/Makefile.in.orig	Tue Mar  6 10:45:09 2001
++++ gdk/Makefile.in	Tue Mar  6 10:45:21 2001
+@@ -134,7 +134,7 @@
+ lib_LTLIBRARIES = libgdk.la
+ 
+ # libtool stuff: set version and export symbols for resolving
+-libgdkincludedir = $(includedir)/gtk-1.2/gdk
++libgdkincludedir = $(includedir)/gdk
+ libgdk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	-export-dynamic 	@GLIB_DEPLIBS@		@x_ldflags@		@x_libs@		-lm		@STRIP_END@
+ 
+ 
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index 11e40abe0173..12801d0eaf95 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -165,8 +165,11 @@ share/locale/uk/LC_MESSAGES/gtk+.mo
 share/locale/wa/LC_MESSAGES/gtk+.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
 share/themes/Default/gtk/gtkrc
+share/themes/Default/gtk/gtkrc.az
+share/themes/Default/gtk/gtkrc.be
 share/themes/Default/gtk/gtkrc.bg
 share/themes/Default/gtk/gtkrc.bg_BG.iso88595
+share/themes/Default/gtk/gtkrc.cp1251
 share/themes/Default/gtk/gtkrc.cp1255
 share/themes/Default/gtk/gtkrc.cs
 share/themes/Default/gtk/gtkrc.cy
@@ -192,6 +195,7 @@ share/themes/Default/gtk/gtkrc.ka_GE.georgianps
 share/themes/Default/gtk/gtkrc.ko
 share/themes/Default/gtk/gtkrc.lt
 share/themes/Default/gtk/gtkrc.lv
+share/themes/Default/gtk/gtkrc.mi
 share/themes/Default/gtk/gtkrc.mk
 share/themes/Default/gtk/gtkrc.pl
 share/themes/Default/gtk/gtkrc.ro
@@ -207,7 +211,6 @@ share/themes/Default/gtk/gtkrc.tr
 share/themes/Default/gtk/gtkrc.uk
 share/themes/Default/gtk/gtkrc.vi
 share/themes/Default/gtk/gtkrc.vi_VN.tcvn
-share/themes/Default/gtk/gtkrc.vi_VN.tcvn5712
 share/themes/Default/gtk/gtkrc.vi_VN.viscii
 share/themes/Default/gtk/gtkrc.vi_VN.viscii111
 share/themes/Default/gtk/gtkrc.yi