Fix a macro name so that the correct C++ linkage on NetBSD and QNX is

used. Bump revision of libtool-base.

4 files changed, 22 insertions, 22 deletions

diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index c9e4a0d6cdd..ffb509a07fd 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.76 2009/12/15 17:35:36 joerg Exp $
+$NetBSD: distinfo,v 1.77 2009/12/16 15:27:33 joerg Exp $
 
 SHA1 (libtool-2.2.6b.tar.gz) = 5afa73c8ef9ebe64bbb438a0f8779c9036e43c55
 RMD160 (libtool-2.2.6b.tar.gz) = 02d8c1460946a1a0054b3ccb6b54d2404b53c2ef
 Size (libtool-2.2.6b.tar.gz) = 2347317 bytes
 SHA1 (patch-aa) = 84e916bf868ada2ebeffe940f03537fadd751751
-SHA1 (patch-ab) = e7664e0d958f9504381d281293afb2628bb26678
+SHA1 (patch-ab) = f100b4dcf68b1d9d462b9dd1b5b45784345ac737
 SHA1 (patch-ac) = 8187bfc8436d2d7477a6a33c925c6d141804ad65
-SHA1 (patch-ad) = e79850d8aa270b1679b873255944d0967c6d7f34
+SHA1 (patch-ad) = 259689f50098bf878328274f6bbbbbc1298fe324
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index c29f596e0ee..e8eb0919474 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,4 +1,4 @@
-$NetBSD: manual-libtool.m4,v 1.27 2009/12/15 17:35:37 joerg Exp $
+$NetBSD: manual-libtool.m4,v 1.28 2009/12/16 15:27:33 joerg Exp $
 
 --- libltdl/m4/libtool.m4.orig	2008-09-05 13:54:41.000000000 +0200
 +++ libltdl/m4/libtool.m4
@@ -259,19 +259,19 @@ $NetBSD: manual-libtool.m4,v 1.27 2009/12/15 17:35:37 joerg Exp $
 +          output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
 +        else
 +          # Modern ELF works sanely as-is
-+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +          output_verbose_link_cmd='echo'
 +        fi
  	;;
  
        *nto* | *qnx*)
 -        _LT_TAGVAR(ld_shlibs, $1)=yes
-+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++        _LT_TAGVAR(hardcode_direct, $1)=yes
++        _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +        output_verbose_link_cmd='echo'
  	;;
  
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 12c6e831962..c665bf27804 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.64 2009/12/15 17:35:37 joerg Exp $
+$NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
 
---- configure.orig	2009-12-15 16:46:54.000000000 +0100
+--- configure.orig	2009-12-16 15:15:21.000000000 +0000
 +++ configure
 @@ -5293,6 +5293,13 @@ else
      lt_cv_sys_max_cmd_len=8192;
@@ -244,19 +244,19 @@ $NetBSD: patch-ab,v 1.64 2009/12/15 17:35:37 joerg Exp $
 +          output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
 +        else
 +          # Modern ELF works sanely as-is
-+          ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+          ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++          archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++          archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +          output_verbose_link_cmd='echo'
 +        fi
  	;;
  
        *nto* | *qnx*)
 -        ld_shlibs_CXX=yes
-+        ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+        ='-R$libdir'
-+        =yes
-+        =no
++        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++        hardcode_libdir_flag_spec_CXX='-R$libdir'
++        hardcode_direct_CXX=yes
++        hardcode_shlibpath_var_CXX=no
 +        output_verbose_link_cmd='echo'
  	;;
  
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index d8c4dc455d9..d112b1f1bf2 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.35 2009/12/15 17:35:37 joerg Exp $
+$NetBSD: patch-ad,v 1.36 2009/12/16 15:27:33 joerg Exp $
 
---- libltdl/configure.orig	2009-12-15 16:46:54.000000000 +0100
+--- libltdl/configure.orig	2009-12-16 15:15:21.000000000 +0000
 +++ libltdl/configure
 @@ -4542,6 +4542,13 @@ else
      lt_cv_sys_max_cmd_len=8192;