fix shared library names on OpenBSD after upgrade to libtool 1.5.x.

fixes PR pkg/25527 from Adrian Portelli.

3 files changed, 79 insertions, 7 deletions

diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 720ecf70aab..dd159063200 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.43 2004/04/23 01:17:25 danw Exp $
+$NetBSD: distinfo,v 1.44 2004/05/25 15:17:07 grant Exp $
 
 SHA1 (libtool-1.5.6.tar.gz) = 6018b2661725e9689d7f782c5a2a489e928698ba
 Size (libtool-1.5.6.tar.gz) = 2665434 bytes
 SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e
-SHA1 (patch-ab) = 34ff3f7969300437483c059d1aba590b762df0e1
+SHA1 (patch-ab) = fae19da5c435255d9ae262930ed70bc43516a631
 SHA1 (patch-ac) = 998846b81d9e69d4ff469d644377a57f83a1adc1
-SHA1 (patch-ad) = 83172e62964fd3e666b4e47101970ec27769dc5c
+SHA1 (patch-ad) = b784b1d67f6e48da6d225d3c7054e5371eab3f56
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index cc327fcae4f..3f92c20f725 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.38 2004/04/23 01:17:25 danw Exp $
+$NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
 
---- configure.orig	Sun Apr 11 01:35:42 2004
+--- configure.orig	2004-04-11 15:35:42.000000000 +1000
 +++ configure
 @@ -4440,10 +4440,13 @@ beos*)
    lt_cv_deplibs_check_method=pass_all
@@ -166,6 +166,15 @@ $NetBSD: patch-ab,v 1.38 2004/04/23 01:17:25 danw Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -8482,7 +8529,7 @@ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=yes
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 @@ -8527,7 +8574,7 @@ sco3.2v5*)
    ;;
  
@@ -317,6 +326,15 @@ $NetBSD: patch-ab,v 1.38 2004/04/23 01:17:25 danw Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -12184,7 +12264,7 @@ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=yes
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 @@ -12229,7 +12309,7 @@ sco3.2v5*)
    ;;
  
@@ -461,6 +479,15 @@ $NetBSD: patch-ab,v 1.38 2004/04/23 01:17:25 danw Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -15333,7 +15453,7 @@ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=yes
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 @@ -15378,7 +15498,7 @@ sco3.2v5*)
    ;;
  
@@ -605,6 +632,15 @@ $NetBSD: patch-ab,v 1.38 2004/04/23 01:17:25 danw Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17684,7 +17844,7 @@ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=yes
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 @@ -17729,7 +17889,7 @@ sco3.2v5*)
    ;;
  
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index 4f0de38732a..0cae03c5f8e 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.11 2004/04/22 14:40:29 tv Exp $
+$NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
 
---- libltdl/configure.orig	Thu Apr 22 10:23:13 2004
+--- libltdl/configure.orig	2004-04-11 15:36:50.000000000 +1000
 +++ libltdl/configure
 @@ -3652,10 +3652,13 @@ beos*)
    lt_cv_deplibs_check_method=pass_all
@@ -153,6 +153,15 @@ $NetBSD: patch-ad,v 1.11 2004/04/22 14:40:29 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -8389,7 +8434,7 @@ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=yes
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 @@ -8434,7 +8479,7 @@ sco3.2v5*)
    ;;
  
@@ -304,6 +313,15 @@ $NetBSD: patch-ad,v 1.11 2004/04/22 14:40:29 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -12091,7 +12169,7 @@ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=yes
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 @@ -12136,7 +12214,7 @@ sco3.2v5*)
    ;;
  
@@ -435,6 +453,15 @@ $NetBSD: patch-ad,v 1.11 2004/04/22 14:40:29 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -15240,7 +15356,7 @@ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=yes
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 @@ -15285,7 +15401,7 @@ sco3.2v5*)
    ;;
  
@@ -566,6 +593,15 @@ $NetBSD: patch-ad,v 1.11 2004/04/22 14:40:29 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17591,7 +17745,7 @@ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=yes
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 @@ -17636,7 +17790,7 @@ sco3.2v5*)
    ;;