libtool: override shlib naming on NetBSD, as done in pkgsrc.

While here there's no need to override ltmain.sh, remove this block
from the xbps.sh script.

--HG--
extra : convert_revision : 76951b6f01e95e717a6f2cd8b36c1e3cfc9882fc

templates/libtool-xbps-fixes.diff

@@ -1,48 +1,6 @@
---- libltdl/config/ltmain.m4sh.orig	2008-09-07 17:54:53.000000000 +0000
-+++ libltdl/config/ltmain.m4sh	2008-09-28 04:35:05.000000000 +0000
-@@ -1576,8 +1576,8 @@
- 	  # At present, this check doesn't affect windows .dll's that
- 	  # are installed into $libdir/../bin (currently, that works fine)
- 	  # but it's something to keep an eye on.
--	  test "$inst_prefix_dir" = "$destdir" && \
--	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-+	  #test "$inst_prefix_dir" = "$destdir" && \
-+	  #  func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
- 
- 	  if test -n "$inst_prefix_dir"; then
- 	    # Stick the inst_prefix_dir data into the link command.
-@@ -5275,7 +5275,7 @@
- 		if test -n "$inst_prefix_dir"; then
- 		  case $libdir in
- 		    [\\/]*)
--		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+		      add_dir="$add_dir -L$inst_prefix_dir"
- 		      ;;
- 		  esac
- 		fi
-@@ -5336,8 +5336,8 @@
- 	      add="-l$name"
- 	    elif test "$hardcode_automatic" = yes; then
- 	      if test -n "$inst_prefix_dir" &&
--		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
--		add="$inst_prefix_dir$libdir/$linklib"
-+		 test -f "$inst_prefix_dir" ; then
-+		add="$inst_prefix_dir"
- 	      else
- 		add="$libdir/$linklib"
- 	      fi
-@@ -5348,7 +5348,7 @@
- 	      if test -n "$inst_prefix_dir"; then
- 		case $libdir in
- 		  [\\/]*)
--		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+		    add_dir="$add_dir -L$inst_prefix_dir"
- 		    ;;
- 		esac
- 	      fi
 --- libltdl/config/ltmain.sh.orig	2008-09-07 19:56:33.000000000 +0200
-+++ libltdl/config/ltmain.sh	2008-10-06 04:21:18.000000000 +0200
++++ libltdl/config/ltmain.sh	2008-10-16 04:51:14.000000000 +0200
-@@ -2018,8 +2018,8 @@
+@@ -2018,8 +2018,8 @@ func_mode_install ()
  	  # At present, this check doesn't affect windows .dll's that
  	  # are installed into $libdir/../bin (currently, that works fine)
  	  # but it's something to keep an eye on.
@@ -53,7 +11,7 @@
  
  	  if test -n "$inst_prefix_dir"; then
  	    # Stick the inst_prefix_dir data into the link command.
-@@ -5115,7 +5115,7 @@
+@@ -5115,7 +5115,7 @@ func_mode_link ()
  	      finalize_deplibs="$deplib $finalize_deplibs"
  	    else
  	      deplibs="$deplib $deplibs"
@@ -62,7 +20,7 @@
  	    fi
  	    continue
  	  else # deplib is a libtool library
-@@ -5141,7 +5141,7 @@
+@@ -5141,7 +5141,7 @@ func_mode_link ()
  		      finalize_deplibs="$deplib $finalize_deplibs"
  		    else
  		      deplibs="$deplib $deplibs"
@@ -71,7 +29,7 @@
  		    fi
  		    continue
  		  fi
-@@ -5172,7 +5172,7 @@
+@@ -5172,7 +5172,7 @@ func_mode_link ()
  	  lib)
  	    deplibs="$deplib $deplibs"
  	    test "$pass" = conv && continue
@@ -80,7 +38,7 @@
  	    func_stripname '-L' '' "$deplib"
  	    newlib_search_path="$newlib_search_path $func_stripname_result"
  	    ;;
-@@ -5490,7 +5490,7 @@
+@@ -5490,7 +5490,7 @@ func_mode_link ()
  	    else
  	      # Need to hardcode shared library paths
  	      # or/and link against static libraries
@@ -89,7 +47,7 @@
  	    fi
  	    if $opt_duplicate_deps ; then
  	      case "$tmp_libs " in
-@@ -5717,7 +5717,7 @@
+@@ -5717,7 +5717,7 @@ func_mode_link ()
  		if test -n "$inst_prefix_dir"; then
  		  case $libdir in
  		    [\\/]*)
@@ -98,7 +56,7 @@
  		      ;;
  		  esac
  		fi
-@@ -5778,8 +5778,8 @@
+@@ -5778,8 +5778,8 @@ func_mode_link ()
  	      add="-l$name"
  	    elif test "$hardcode_automatic" = yes; then
  	      if test -n "$inst_prefix_dir" &&
@@ -109,7 +67,7 @@
  	      else
  		add="$libdir/$linklib"
  	      fi
-@@ -5790,7 +5790,7 @@
+@@ -5790,7 +5790,7 @@ func_mode_link ()
  	      if test -n "$inst_prefix_dir"; then
  		case $libdir in
  		  [\\/]*)
@@ -118,7 +76,7 @@
  		    ;;
  		esac
  	      fi
-@@ -5881,7 +5881,7 @@
+@@ -5881,7 +5881,7 @@ func_mode_link ()
  	  # ... and its dependency_libs
  	  tmp_libs=
  	  for deplib in $dependency_libs; do
@@ -127,7 +85,7 @@
  	    if $opt_duplicate_deps ; then
  	      case "$tmp_libs " in
  	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-@@ -6449,7 +6449,7 @@
+@@ -6449,7 +6449,7 @@ func_mode_link ()
  	  esac
  	done
  	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
@@ -136,3 +94,25 @@
  	fi
        fi
  
+--- libltdl/configure.orig	2008-10-16 04:52:43.000000000 +0200
++++ libltdl/configure	2008-10-16 04:52:52.000000000 +0200
+@@ -10133,7 +10133,7 @@ rm -f core conftest.err conftest.$ac_obj
+   ;;
+ 
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+--- configure.orig	2008-10-16 04:59:42.000000000 +0200
++++ configure	2008-10-16 04:59:48.000000000 +0200
+@@ -16906,7 +16906,7 @@ rm -f core conftest.err conftest.$ac_obj
+   ;;
+ 
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

templates/libtool.tmpl

@@ -2,9 +2,8 @@
 pkgname=libtool
 version=2.2.6a
 wrksrc="$pkgname-2.2.6"
-patch_files="libtool-fix-ltmain.sh.diff"
+patch_files="$pkgname-xbps-fixes.diff"
-distfiles="
+distfiles="http://ftp.gnu.org/pub/gnu/libtool/$pkgname-$version@.tar.gz"
-http://ftp.gnu.org/pub/gnu/libtool/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 short_desc="Generic library support"
 maintainer="Juan RP <xtraeme@gmail.com>"

xbps.sh

@@ -566,12 +566,6 @@ fixup_tmpl_libtool()
 			$ln_cmd -s $XBPS_MASTERDIR/bin/libtool $f
 		fi
 	done
-
-	if [ -f $wrksrc/ltmain.sh ]; then
-		$rm_cmd -f $wrksrc/ltmain.sh
-		$ln_cmd -s $XBPS_MASTERDIR/share/libtool/config/ltmain.sh \
-			$wrksrc/ltmain.sh
-	fi
 }
 
 set_build_vars()