Update "gtk+" package to release version 1.2.0.

4 files changed, 55 insertions, 33 deletions

diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa
index 0640b61cd1e..25c09fa842b 100644
--- a/x11/gtk/patches/patch-aa
+++ b/x11/gtk/patches/patch-aa
@@ -1,21 +1,29 @@
-$NetBSD: patch-aa,v 1.6 1998/08/07 11:18:05 agc Exp $
+$NetBSD: patch-aa,v 1.7 1999/03/04 08:54:37 tron Exp $
 
---- configure.orig	Tue Jun  2 01:31:51 1998
-+++ configure	Sat Jul 18 10:44:53 1998
-@@ -1231,6 +1231,7 @@
-   echo "$ac_t""no" 1>&6
+--- configure.orig	Thu Feb 25 12:02:28 1999
++++ configure	Thu Mar  4 00:01:06 1999
+@@ -1600,6 +1600,7 @@
+   ac_tool_prefix=
  fi
  
 +if false; then
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
-@@ -1276,7 +1277,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+@@ -1832,6 +1833,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
  $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
--
 +fi
  
- echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
- echo "configure:1283: checking whether to enable maintainer-specific portions of Makefiles" >&5
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+@@ -4444,7 +4446,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
diff --git a/x11/gtk/patches/patch-ab b/x11/gtk/patches/patch-ab
index 8c23830dc56..41749257304 100644
--- a/x11/gtk/patches/patch-ab
+++ b/x11/gtk/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.8 1998/12/18 23:53:16 tron Exp $
+$NetBSD: patch-ab,v 1.9 1999/03/04 08:54:37 tron Exp $
 
---- gdk/Makefile.in.orig	Thu Dec 17 07:33:51 1998
-+++ gdk/Makefile.in	Fri Dec 18 23:50:07 1998
-@@ -180,7 +180,7 @@
- 	-lm
- 
- libgdk_la_LDFLAGS = \
--	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
-+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-          @GLIB_LIBS@	\
-          @x_ldflags@	\
-          @x_libs@	\
+--- gdk/Makefile.in.orig	Thu Feb 25 21:15:33 1999
++++ gdk/Makefile.in	Wed Mar  3 23:33:09 1999
+@@ -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
++libgdk_la_LDFLAGS =  	-release $(LT_RELEASE)          @GLIB_DEPLIBS@	         @x_ldflags@	         @x_libs@	         -lm
+ 
+ 
+ EXTRA_PROGRAMS = gxid
diff --git a/x11/gtk/patches/patch-ac b/x11/gtk/patches/patch-ac
index 4045034b571..1044ef4c3a9 100644
--- a/x11/gtk/patches/patch-ac
+++ b/x11/gtk/patches/patch-ac
@@ -1,12 +1,13 @@
-$NetBSD: patch-ac,v 1.7 1999/01/16 01:43:30 tron Exp $
+$NetBSD: patch-ac,v 1.8 1999/03/04 08:54:37 tron Exp $
 
---- gtk/Makefile.in.orig	Mon Jan  4 10:55:25 1999
-+++ gtk/Makefile.in	Sat Jan 16 01:37:56 1999
-@@ -371,7 +371,6 @@
- 
- libgtk_la_LDFLAGS = \
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
--	-release $(LT_RELEASE) 					\
- 	@GLIB_LIBS@ 						\
- 	@x_ldflags@						\
- 	@x_libs@ 						\
+--- gtk/Makefile.in.orig	Thu Feb 25 21:15:36 1999
++++ gtk/Makefile.in	Wed Mar  3 23:37:29 1999
+@@ -152,7 +152,7 @@
+ gdk_headers =  	../gdk/gdktypes.h 	../gdk/gdkrgb.h
+ 
+ 
+-libgtk_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)		-release $(LT_RELEASE) 						@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm
++libgtk_la_LDFLAGS =  	-release $(LT_RELEASE) 						@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm
+ 
+ #	$(top_builddir)/gdk/libgdk.la
+ 
diff --git a/x11/gtk/patches/patch-ad b/x11/gtk/patches/patch-ad
new file mode 100644
index 00000000000..d5040b1dd2c
--- /dev/null
+++ b/x11/gtk/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.5 1999/03/04 08:55:35 tron Exp $
+
+--- po/Makefile.in.in.orig	Thu Feb 25 12:02:20 1999
++++ po/Makefile.in.in	Thu Mar  4 00:14:56 1999
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po