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

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

5 files changed, 29 insertions, 22 deletions

diff --git a/devel/glib/patches/patch-ab b/devel/glib/patches/patch-ab
index bf7fa3b6d27..3a8e2df61f9 100644
--- a/devel/glib/patches/patch-ab
+++ b/devel/glib/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 1999/03/04 08:50:44 tron Exp $
+$NetBSD: patch-ab,v 1.6 1999/03/05 09:44:20 tron Exp $
 
 --- Makefile.in.orig	Wed Feb 24 23:09:14 1999
 +++ Makefile.in	Tue Mar  2 23:50:46 1999
@@ -32,7 +32,7 @@ $NetBSD: patch-ab,v 1.5 1999/03/04 08:50:44 tron Exp $
  
  
 -libglib_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+libglib_la_LDFLAGS =  	-release $(LT_RELEASE)
++libglib_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
  
  noinst_PROGRAMS = testglib testgdate testgdateparser
diff --git a/devel/glib/patches/patch-ac b/devel/glib/patches/patch-ac
index 0cbddcffc30..9558caa1660 100644
--- a/devel/glib/patches/patch-ac
+++ b/devel/glib/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 1999/03/04 08:50:44 tron Exp $
+$NetBSD: patch-ac,v 1.4 1999/03/05 09:44:20 tron Exp $
 
 --- gmodule/Makefile.in.orig	Wed Feb 24 23:09:16 1999
-+++ gmodule/Makefile.in	Tue Mar  2 23:52:09 1999
++++ gmodule/Makefile.in	Fri Mar  5 10:07:32 1999
 @@ -103,7 +103,7 @@
  lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la
  
  libgmodule_la_SOURCES = gmodule.c
 -libgmodule_la_LDFLAGS =  	@G_MODULE_LDFLAGS@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+libgmodule_la_LDFLAGS =  	@G_MODULE_LDFLAGS@ 	-release $(LT_RELEASE)
++libgmodule_la_LDFLAGS =  	@G_MODULE_LDFLAGS@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
  
  libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
diff --git a/devel/glib/patches/patch-ad b/devel/glib/patches/patch-ad
index 361c3ce122b..42fbee6c999 100644
--- a/devel/glib/patches/patch-ad
+++ b/devel/glib/patches/patch-ad
@@ -1,23 +1,30 @@
-$NetBSD: patch-ad,v 1.1.1.1 1998/08/19 09:29:26 agc Exp $
+$NetBSD: patch-ad,v 1.2 1999/03/05 09:44:20 tron Exp $
 
-Use NetBSD's libtool pkg
-
---- configure	1998/08/19 09:46:33	1.1
-+++ configure	1998/08/19 09:47:07
-@@ -1258,6 +1258,7 @@
-   echo "$ac_t""no" 1>&6
+--- configure.orig	Wed Feb 24 07:44:18 1999
++++ configure	Fri Mar  5 09:45:43 1999
+@@ -26,7 +26,7 @@
+ #
+ GLIB_MAJOR_VERSION=1
+ GLIB_MINOR_VERSION=2
+-GLIB_MICRO_VERSION=0
++GLIB_MICRO_VERSION=13
+ GLIB_INTERFACE_AGE=0
+ GLIB_BINARY_AGE=0
+ GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
+@@ -1593,6 +1593,7 @@
+   ac_tool_prefix=
  fi
  
 +if false; then
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
-@@ -1303,6 +1304,8 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+@@ -1825,6 +1826,8 @@
+ ${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
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
diff --git a/devel/glib/patches/patch-ae b/devel/glib/patches/patch-ae
index 71d2e90a881..97dd6e0e645 100644
--- a/devel/glib/patches/patch-ae
+++ b/devel/glib/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 1999/03/04 08:50:44 tron Exp $
+$NetBSD: patch-ae,v 1.3 1999/03/05 09:44:20 tron Exp $
 
 --- gthread/Makefile.in.orig	Wed Feb 24 23:09:17 1999
 +++ gthread/Makefile.in	Tue Mar  2 23:53:32 1999
@@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.2 1999/03/04 08:50:44 tron Exp $
  
  libgthread_la_SOURCES = gthread.c
 -libgthread_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+libgthread_la_LDFLAGS =  	-release $(LT_RELEASE)
++libgthread_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
  
  libgthread_la_LIBADD = @G_THREAD_LIBS@
diff --git a/devel/glib/pkg/PLIST b/devel/glib/pkg/PLIST
index 44156d896c9..21748c0e394 100644
--- a/devel/glib/pkg/PLIST
+++ b/devel/glib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 1999/03/04 08:50:45 tron Exp $
+@comment $NetBSD: PLIST,v 1.9 1999/03/05 09:44:20 tron Exp $
 bin/glib-config
 include/glib/glib.h
 include/glib/glibconfig.h
@@ -8,13 +8,13 @@ info/glib.info
 @exec install-info %D/info/glib.info %D/info/dir
 lib/libglib.a
 lib/libglib.la
-lib/libglib-1.2.so.0.0
+lib/libglib.so.13.0
 lib/libgmodule.a
 lib/libgmodule.la
-lib/libgmodule-1.2.so.0.0
+lib/libgmodule.so.13.0
 lib/libgthread.a
 lib/libgthread.la
-lib/libgthread-1.2.so.0.0
+lib/libgthread.so.13.0
 man/man1/glib-config.1
 share/aclocal/glib.m4
 @dirrm include/glib