Don't use strange library naming scheme ("libgtk-12.so.0.0") because it

will cause all programs to be linked with the static library. The shared
library is now called "libgtk.so.12.0".

4 files changed, 18 insertions, 9 deletions

diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa
index 25c09fa842b..b11161155b5 100644
--- a/x11/gtk/patches/patch-aa
+++ b/x11/gtk/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.7 1999/03/04 08:54:37 tron Exp $
+$NetBSD: patch-aa,v 1.8 1999/03/05 11:32:22 tron Exp $
 
 --- configure.orig	Thu Feb 25 12:02:28 1999
-+++ configure	Thu Mar  4 00:01:06 1999
++++ configure	Fri Mar  5 12:13:21 1999
+@@ -22,7 +22,7 @@
+ #
+ GTK_MAJOR_VERSION=1
+ GTK_MINOR_VERSION=2
+-GTK_MICRO_VERSION=0
++GTK_MICRO_VERSION=12
+ GTK_INTERFACE_AGE=0
+ GTK_BINARY_AGE=0
+ GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
 @@ -1600,6 +1600,7 @@
    ac_tool_prefix=
  fi
diff --git a/x11/gtk/patches/patch-ab b/x11/gtk/patches/patch-ab
index 41749257304..7e1134e572c 100644
--- a/x11/gtk/patches/patch-ab
+++ b/x11/gtk/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.9 1999/03/04 08:54:37 tron Exp $
+$NetBSD: patch-ab,v 1.10 1999/03/05 11:32:22 tron Exp $
 
 --- gdk/Makefile.in.orig	Thu Feb 25 21:15:33 1999
 +++ gdk/Makefile.in	Wed Mar  3 23:33:09 1999
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.9 1999/03/04 08:54:37 tron Exp $
  
  
 -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
++libgdk_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)          @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 1044ef4c3a9..1aa96eea47e 100644
--- a/x11/gtk/patches/patch-ac
+++ b/x11/gtk/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.8 1999/03/04 08:54:37 tron Exp $
+$NetBSD: patch-ac,v 1.9 1999/03/05 11:32:22 tron Exp $
 
 --- gtk/Makefile.in.orig	Thu Feb 25 21:15:36 1999
 +++ gtk/Makefile.in	Wed Mar  3 23:37:29 1999
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.8 1999/03/04 08:54:37 tron Exp $
  
  
 -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
++libgtk_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 						@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm
  
  #	$(top_builddir)/gdk/libgdk.la
  
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index e312432695b..f7044b6a7c2 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 1999/03/04 08:54:38 tron Exp $
+@comment $NetBSD: PLIST,v 1.18 1999/03/05 11:32:23 tron Exp $
 bin/gtk-config
 etc/gtk/gtkrc.ja
 etc/gtk/gtkrc.ko
@@ -123,9 +123,9 @@ include/gtk/gtklayout.h
 include/gtk/gtkplug.h
 include/gtk/gtksocket.h
 include/gtk/gtkthemes.h
-lib/libgdk-1.2.so.0.0
+lib/libgdk.so.12.0
 lib/libgdk.a
-lib/libgtk-1.2.so.0.0
+lib/libgtk.so.12.0
 lib/libgtk.a
 man/man1/gtk-config.1
 @unexec install-info --delete %D/info/gdk.info %D/info/dir