1 files changed, 44 insertions, 52 deletions
diff --git a/devel/libtool15/files/patch-ltmain.sh b/devel/libtool15/files/patch-ltmain.sh
index c3730b423d3a..dbfac1c8e3a7 100644
--- a/devel/libtool15/files/patch-ltmain.sh
+++ b/devel/libtool15/files/patch-ltmain.sh
@@ -1,27 +1,47 @@
---- ltmain.sh.orig	Sun Dec 18 17:14:54 2005
-+++ ltmain.sh	Sat Dec 24 12:22:07 2005
-@@ -1604,11 +1604,18 @@
- 	compiler_flags="$compiler_flags $arg"
- 	compile_command="$compile_command $arg"
+--- ltmain.sh.orig	Sun Dec 18 14:14:54 2005
++++ ltmain.sh	Mon Feb 20 17:37:04 2006
+@@ -228,2 +228,16 @@
+ {
++    # FreeBSD-specific: where we install compilers with non-standard names
++    tag_compilers_CC="*cc cc* *gcc gcc*"
++    tag_compilers_CXX="*c++ c++* *g++ g++*"
++    base_compiler=`set -- "$@"; echo $1`
++
++    # If $tagname isn't set, then try to infer if the default "CC" tag applies
++    if test -z "$tagname"; then
++      for zp in $tag_compilers_CC; do
++        case $base_compiler in
++	 $zp) tagname="CC"; break;;
++	esac
++      done
++    fi
++
+     if test -n "$available_tags" && test -z "$tagname"; then
+@@ -268,3 +282,18 @@
+ 	    esac
+-	  fi
++
++	    # FreeBSD-specific: try compilers based on inferred tag
++	    if test -z "$tagname"; then
++	      eval "tag_compilers=\$tag_compilers_${z}"
++	      if test -n "$tag_compilers"; then
++		for zp in $tag_compilers; do
++		  case $base_compiler in   
++		    $zp) tagname=$z; break;;
++		  esac
++		done
++		if test -n "$tagname"; then
++		  break
++		fi
++	      fi
++            fi
++          fi
+ 	done
+@@ -1606,2 +1635,3 @@
  	finalize_command="$finalize_command $arg"
 +	deplibs="$deplibs $arg"
  	continue
- 	;;
- 
-       -module)
- 	module=yes
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not build the useless static library
-+	  build_old_libs=no
-+	  ;;
-+	esac
- 	continue
- 	;;
- 
-@@ -2101,6 +2108,29 @@
- 	  else
- 	    compiler_flags="$compiler_flags $deplib"
+@@ -2103,2 +2133,25 @@
  	  fi
 +
 +	  case $linkmode in
@@ -47,37 +67,9 @@
 +	  esac # linkmode
 +
  	  continue
- 	  ;;
- 	-l*)
-@@ -4705,6 +4735,9 @@
-             ;;
+@@ -4706,2 +4759,5 @@
            esac
- 	  ;;
-+	*-*-freebsd*)
-+	  # FreeBSD doesn't need this...
 +	  ;;
- 	*)
- 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
- 	  exit $EXIT_FAILURE
-@@ -5995,10 +6028,17 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
--	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
--	instname="$dir/$name"i
--	$show "$install_prog $instname $destdir/$name"
--	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	case $host in
 +	*-*-freebsd*)
-+	  # Do not install the useless pseudo-library
-+	  ;;
-+	*)
-+	  name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	  instname="$dir/$name"i
-+	  $show "$install_prog $instname $destdir/$name"
-+	  $run eval "$install_prog $instname $destdir/$name" || exit $?
-+	  ;;
-+	esac
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
++	  # FreeBSD doesn't need this...
+ 	  ;;