Fix another set of broken macro names. Regen patches.

4 files changed, 43 insertions, 43 deletions

diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index ffb509a07fd..209495cdfd6 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.77 2009/12/16 15:27:33 joerg Exp $
+$NetBSD: distinfo,v 1.78 2009/12/17 00:53:52 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) = f100b4dcf68b1d9d462b9dd1b5b45784345ac737
+SHA1 (patch-ab) = 9253f12bc5e0c0576885a374c76b821c28ae2ede
 SHA1 (patch-ac) = 8187bfc8436d2d7477a6a33c925c6d141804ad65
-SHA1 (patch-ad) = 259689f50098bf878328274f6bbbbbc1298fe324
+SHA1 (patch-ad) = 51ede8bef293d566cd359efa52e6cd04f4a380ec
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index e8eb0919474..3de1666e9b0 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.28 2009/12/16 15:27:33 joerg Exp $
+$NetBSD: manual-libtool.m4,v 1.29 2009/12/17 00:53:52 joerg Exp $
 
 --- libltdl/m4/libtool.m4.orig	2008-09-05 13:54:41.000000000 +0200
 +++ libltdl/m4/libtool.m4
@@ -150,11 +150,11 @@ $NetBSD: manual-libtool.m4,v 1.28 2009/12/16 15:27:33 joerg Exp $
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)=''
++      _LT_TAGVAR(lt_prog_compiler_static, $1)=''
 +      ;;
 +    *mint*)
 +      # FreeMiNT does not support shared libraries at all
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
@@ -177,7 +177,7 @@ $NetBSD: manual-libtool.m4,v 1.28 2009/12/16 15:27:33 joerg Exp $
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)=''
++      _LT_TAGVAR(lt_prog_compiler_static, $1)=''
        ;;
  
      hpux*)
@@ -188,7 +188,7 @@ $NetBSD: manual-libtool.m4,v 1.28 2009/12/16 15:27:33 joerg Exp $
 +    mint*)
 +      # Just because we use GCC doesn't mean we suddenly get shared libraries
 +      # on systems that don't support them.
-+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 +      enable_shared=no
 +      ;;
 +
@@ -200,7 +200,7 @@ $NetBSD: manual-libtool.m4,v 1.28 2009/12/16 15:27:33 joerg Exp $
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
 +  mint*)
-+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 +    ;;
    *djgpp*)
      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
@@ -218,8 +218,8 @@ $NetBSD: manual-libtool.m4,v 1.28 2009/12/16 15:27:33 joerg Exp $
        ;;
  
      *nto* | *qnx*)
-+      _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'
        ;;
  
      openbsd*)
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index c665bf27804..9b02fe7ef41 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
+$NetBSD: patch-ab,v 1.66 2009/12/17 00:53:52 joerg Exp $
 
---- configure.orig	2009-12-16 15:15:21.000000000 +0000
+--- configure.orig	2009-12-17 01:29:54.000000000 +0100
 +++ configure
 @@ -5293,6 +5293,13 @@ else
      lt_cv_sys_max_cmd_len=8192;
@@ -46,7 +46,7 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic='-fno-common'
-+      =''
++      lt_prog_compiler_static=''
        ;;
  
      hpux*)
@@ -57,7 +57,7 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
 +    mint*)
 +      # Just because we use GCC doesn't mean we suddenly get shared libraries
 +      # on systems that don't support them.
-+      =no
++      lt_prog_compiler_can_build_shared=no
 +      enable_shared=no
 +      ;;
 +
@@ -69,7 +69,7 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
 +  mint*)
-+    =
++    lt_prog_compiler_pic=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic=
@@ -87,8 +87,8 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
        ;;
  
      *nto* | *qnx*)
-+      ='$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='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
        ;;
  
      openbsd*)
@@ -282,11 +282,11 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_CXX='-fno-common'
-+      =''
++      lt_prog_compiler_static_CXX=''
 +      ;;
 +    *mint*)
 +      # FreeMiNT does not support shared libraries at all
-+      =
++      lt_prog_compiler_pic_CXX=
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
@@ -305,7 +305,7 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
 +  mint*)
-+    =
++    lt_prog_compiler_pic_CXX=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic_CXX=
@@ -435,7 +435,7 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_F77='-fno-common'
-+      =''
++      lt_prog_compiler_static_F77=''
        ;;
  
      hpux*)
@@ -446,7 +446,7 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
 +    mint*)
 +      # Just because we use GCC doesn't mean we suddenly get shared libraries
 +      # on systems that don't support them.
-+      =no
++      lt_prog_compiler_can_build_shared_F77=no
 +      enable_shared=no
 +      ;;
 +
@@ -458,7 +458,7 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
 +  mint*)
-+    =
++    lt_prog_compiler_pic_F77=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic_F77=
@@ -476,8 +476,8 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
        ;;
  
      *nto* | *qnx*)
-+      ='$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_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
        ;;
  
      openbsd*)
@@ -606,7 +606,7 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_FC='-fno-common'
-+      =''
++      lt_prog_compiler_static_FC=''
        ;;
  
      hpux*)
@@ -617,7 +617,7 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
 +    mint*)
 +      # Just because we use GCC doesn't mean we suddenly get shared libraries
 +      # on systems that don't support them.
-+      =no
++      lt_prog_compiler_can_build_shared_FC=no
 +      enable_shared=no
 +      ;;
 +
@@ -629,7 +629,7 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
 +  mint*)
-+    =
++    lt_prog_compiler_pic_FC=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic_FC=
@@ -647,8 +647,8 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
        ;;
  
      *nto* | *qnx*)
-+      ='$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_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
        ;;
  
      openbsd*)
@@ -777,7 +777,7 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_GCJ='-fno-common'
-+      =''
++      lt_prog_compiler_static_GCJ=''
        ;;
  
      hpux*)
@@ -788,7 +788,7 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
 +    mint*)
 +      # Just because we use GCC doesn't mean we suddenly get shared libraries
 +      # on systems that don't support them.
-+      =no
++      lt_prog_compiler_can_build_shared_GCJ=no
 +      enable_shared=no
 +      ;;
 +
@@ -800,7 +800,7 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
 +  mint*)
-+    =
++    lt_prog_compiler_pic_GCJ=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
@@ -818,8 +818,8 @@ $NetBSD: patch-ab,v 1.65 2009/12/16 15:27:33 joerg Exp $
        ;;
  
      *nto* | *qnx*)
-+      ='$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_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
        ;;
  
      openbsd*)
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index d112b1f1bf2..a266002595c 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.36 2009/12/16 15:27:33 joerg Exp $
+$NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 joerg Exp $
 
---- libltdl/configure.orig	2009-12-16 15:15:21.000000000 +0000
+--- libltdl/configure.orig	2009-12-17 01:29:59.000000000 +0100
 +++ libltdl/configure
 @@ -4542,6 +4542,13 @@ else
      lt_cv_sys_max_cmd_len=8192;
@@ -46,7 +46,7 @@ $NetBSD: patch-ad,v 1.36 2009/12/16 15:27:33 joerg Exp $
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic='-fno-common'
-+      =''
++      lt_prog_compiler_static=''
        ;;
  
      hpux*)
@@ -57,7 +57,7 @@ $NetBSD: patch-ad,v 1.36 2009/12/16 15:27:33 joerg Exp $
 +    mint*)
 +      # Just because we use GCC doesn't mean we suddenly get shared libraries
 +      # on systems that don't support them.
-+      =no
++      lt_prog_compiler_can_build_shared=no
 +      enable_shared=no
 +      ;;
 +
@@ -69,7 +69,7 @@ $NetBSD: patch-ad,v 1.36 2009/12/16 15:27:33 joerg Exp $
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
 +  mint*)
-+    =
++    lt_prog_compiler_pic=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic=
@@ -87,8 +87,8 @@ $NetBSD: patch-ad,v 1.36 2009/12/16 15:27:33 joerg Exp $
        ;;
  
      *nto* | *qnx*)
-+      ='$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='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
        ;;
  
      openbsd*)