[pkgsrc/trunk]: pkgsrc/devel Add support for g95 on NetBSD to libtool.

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9438b0c58011
branches:  trunk
changeset: 395569:9438b0c58011
user:      markd <markd%pkgsrc.org@localhost>
date:      Wed Jul 08 21:01:43 2009 +0000

description:
Add support for g95 on NetBSD to libtool.
Bump PKGREVISION of libtool-base.

OKed by jeorg.

diffstat:

 devel/libtool-base/Makefile             |   4 ++--
 devel/libtool/distinfo                  |   4 ++--
 devel/libtool/patches/manual-libtool.m4 |  12 ++++++++----
 devel/libtool/patches/patch-ab          |  25 +++++++++++++++++--------
 4 files changed, 29 insertions(+), 16 deletions(-)

diffs (153 lines):

diff -r 74f3211f6a02 -r 9438b0c58011 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile       Wed Jul 08 21:00:37 2009 +0000
+++ b/devel/libtool-base/Makefile       Wed Jul 08 21:01:43 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2009/03/23 23:03:59 joerg Exp $
+# $NetBSD: Makefile,v 1.87 2009/07/08 21:01:44 markd Exp $
 
 ###########################################################################
 ###########################################################################
@@ -26,7 +26,7 @@
 .include "../../devel/libtool/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-base-/}
-PKGREVISION=   1
+PKGREVISION=   2
 SVR4_PKGNAME=  ltoob
 
 COMMENT=       Generic shared library support script (the script itself)
diff -r 74f3211f6a02 -r 9438b0c58011 devel/libtool/distinfo
--- a/devel/libtool/distinfo    Wed Jul 08 21:00:37 2009 +0000
+++ b/devel/libtool/distinfo    Wed Jul 08 21:01:43 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.73 2009/03/23 23:03:59 joerg Exp $
+$NetBSD: distinfo,v 1.74 2009/07/08 21:01:43 markd Exp $
 
 SHA1 (libtool-1.5.26.tar.gz) = 4c1738351736562a951a345e24f233d00953ec0a
 RMD160 (libtool-1.5.26.tar.gz) = 4d1d7dd0308b98e8f590723ae5daddb8da49ac11
 Size (libtool-1.5.26.tar.gz) = 2961939 bytes
 SHA1 (patch-aa) = 4c979de3439dfffa48295e094c1aee40c7e79fa6
-SHA1 (patch-ab) = 9902ccf15b031d04fdca95acbf718a849c6d0a4f
+SHA1 (patch-ab) = 271e58419f0581f02b69094e865c16126b554f7b
 SHA1 (patch-ac) = 52f22f3f7a58e22d2240d0c6bb77455783ee5d70
 SHA1 (patch-ad) = e3e3164b1e9598deab233450a1f7a8262dd09d66
diff -r 74f3211f6a02 -r 9438b0c58011 devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4   Wed Jul 08 21:00:37 2009 +0000
+++ b/devel/libtool/patches/manual-libtool.m4   Wed Jul 08 21:01:43 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: manual-libtool.m4,v 1.25 2009/03/23 23:03:59 joerg Exp $
+$NetBSD: manual-libtool.m4,v 1.26 2009/07/08 21:01:43 markd Exp $
 
 Local pkgsrc changes:
 - override the basename to point to the actual backend compiler,
@@ -9,8 +9,9 @@
 - Interix3 support
 - disable static linkage on OS X by default
 - DragonFly support decoupled from FreeBSD
+- support g95 on NetBSD
 
---- libtool.m4.orig    2008-02-01 17:26:47.000000000 +0100
+--- libtool.m4.orig    2008-02-02 05:26:47.000000000 +1300
 +++ libtool.m4
 @@ -249,7 +249,10 @@ AC_DEFUN([_LT_CC_BASENAME],
      *) break;;
@@ -436,7 +437,7 @@
    *djgpp*)
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
      ;;
-@@ -5791,6 +5893,17 @@ EOF
+@@ -5791,8 +5893,19 @@ EOF
        fi
        ;;
  
@@ -452,8 +453,11 @@
 +      ;;
 +
      netbsd*)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+       wlarc=
+       else
 @@ -5856,6 +5969,11 @@ _LT_EOF
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        ;;
diff -r 74f3211f6a02 -r 9438b0c58011 devel/libtool/patches/patch-ab
--- a/devel/libtool/patches/patch-ab    Wed Jul 08 21:00:37 2009 +0000
+++ b/devel/libtool/patches/patch-ab    Wed Jul 08 21:01:43 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.62 2009/03/23 23:03:59 joerg Exp $
+$NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $
 
---- configure.orig     2008-02-01 17:38:42.000000000 +0100
+--- configure.orig     2008-02-02 05:38:42.000000000 +1300
 +++ configure
 @@ -630,11 +630,11 @@ else
  
@@ -119,7 +119,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -8678,6 +8692,17 @@ EOF
+@@ -8678,8 +8692,19 @@ EOF
        fi
        ;;
  
@@ -135,8 +135,11 @@
 +      ;;
 +
      netbsd*)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
        archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+       wlarc=
+       else
 @@ -8743,6 +8768,11 @@ _LT_EOF
        hardcode_shlibpath_var=no
        ;;
@@ -637,7 +640,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -15338,6 +15499,17 @@ EOF
+@@ -15338,8 +15499,19 @@ EOF
        fi
        ;;
  
@@ -653,8 +656,11 @@
 +      ;;
 +
      netbsd*)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
        archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+       wlarc=
+       else
 @@ -15403,6 +15575,11 @@ _LT_EOF
        hardcode_shlibpath_var_F77=no
        ;;
@@ -885,7 +891,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -17943,6 +18177,17 @@ EOF
+@@ -17943,8 +18177,19 @@ EOF
        fi
        ;;
  
@@ -901,8 +907,11 @@
 +      ;;
 +
      netbsd*)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
        archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+       wlarc=
+       else
 @@ -18008,6 +18253,11 @@ _LT_EOF
        hardcode_shlibpath_var_GCJ=no
        ;;