When relinking with DESTDIR, also look into DESTDIR for the desired

object. Bump revision.

4 files changed, 42 insertions, 13 deletions

diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index 3a159956754..7f200353667 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2014/10/09 13:44:37 wiz Exp $
+# $NetBSD: Makefile,v 1.112 2014/12/02 10:56:24 joerg Exp $
 
 ###########################################################################
 ###########################################################################
@@ -26,7 +26,7 @@
 .include "../../devel/libtool/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-base-/}
-PKGREVISION=	8
+PKGREVISION=	9
 
 COMMENT=	Generic shared library support script (the script itself)
 
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index b655dc6346e..3bcdb1d213d 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.97 2014/09/10 10:44:58 richard Exp $
+$NetBSD: distinfo,v 1.98 2014/12/02 10:56:24 joerg Exp $
 
 SHA1 (libtool-2.4.2.tar.gz) = 22b71a8b5ce3ad86e1094e7285981cae10e6ff88
 RMD160 (libtool-2.4.2.tar.gz) = b7153f3f1e1c50d8c04787cafccd4e19af62ec7d
 Size (libtool-2.4.2.tar.gz) = 2632347 bytes
 SHA1 (patch-aa) = 8fa167bebf27b7bc3008edd61408a0aede6bdf69
 SHA1 (patch-ab) = 3ab767d3c0413bf30b6e9cce62e9686cd3d53fda
-SHA1 (patch-ac) = 108989e3f1ee199fa8e8a9dc7331d360c586a800
+SHA1 (patch-ac) = e29517d339483ee39eff7e6bac3013ad32ef2b00
 SHA1 (patch-ad) = 48c3832e9205777832ef2a6334033ff6099be8a4
diff --git a/devel/libtool/patches/manual-ltmain.m4sh b/devel/libtool/patches/manual-ltmain.m4sh
new file mode 100644
index 00000000000..63881d4308f
--- /dev/null
+++ b/devel/libtool/patches/manual-ltmain.m4sh
@@ -0,0 +1,17 @@
+$NetBSD: manual-ltmain.m4sh,v 1.1 2014/12/02 10:56:24 joerg Exp $
+
+--- libltdl/config/ltmain.m4sh.orig	2014-11-27 21:09:59.000000000 +0000
++++ libltdl/config/ltmain.m4sh
+@@ -6112,7 +6112,11 @@ func_mode_link ()
+ 	    # Finalize command for both is simple: just hardcode it.
+ 	    if test "$hardcode_direct" = yes &&
+ 	       test "$hardcode_direct_absolute" = no; then
+-	      add="$libdir/$linklib"
++	      if test -f "$inst_prefix_dir$libdir/$linklib"; then
++	        add="$inst_prefix_dir$libdir/$linklib"
++	      else
++	        add="$libdir/$linklib"
++	      fi
+ 	    elif test "$hardcode_minus_L" = yes; then
+ 	      add_dir="-L$libdir"
+ 	      add="-l$name"
diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac
index a5dbf3bec41..0e6ac81e060 100644
--- a/devel/libtool/patches/patch-ac
+++ b/devel/libtool/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.33 2014/09/10 10:44:58 richard Exp $
+$NetBSD: patch-ac,v 1.34 2014/12/02 10:56:24 joerg Exp $
 
 --- libltdl/config/ltmain.sh.orig	Mon Oct 17 10:19:11 2011
 +++ libltdl/config/ltmain.sh
@@ -14,7 +14,20 @@ $NetBSD: patch-ac,v 1.33 2014/09/10 10:44:58 richard Exp $
  : ${CP="cp -f"}
  test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
  : ${MAKE="make"}
-@@ -7391,6 +7392,7 @@ func_mode_link ()
+@@ -6899,7 +6900,11 @@ func_mode_link ()
+ 	    # Finalize command for both is simple: just hardcode it.
+ 	    if test "$hardcode_direct" = yes &&
+ 	       test "$hardcode_direct_absolute" = no; then
+-	      add="$libdir/$linklib"
++	      if test -f "$inst_prefix_dir$libdir/$linklib"; then
++	        add="$inst_prefix_dir$libdir/$linklib"
++	      else
++	        add="$libdir/$linklib"
++	      fi
+ 	    elif test "$hardcode_minus_L" = yes; then
+ 	      add_dir="-L$libdir"
+ 	      add="-l$name"
+@@ -7391,6 +7396,7 @@ func_mode_link ()
  	# Calculate the version variables.
  	major=
  	versuffix=
@@ -22,7 +35,7 @@ $NetBSD: patch-ac,v 1.33 2014/09/10 10:44:58 richard Exp $
  	verstring=
  	case $version_type in
  	none) ;;
-@@ -7451,6 +7453,7 @@ func_mode_link ()
+@@ -7451,6 +7457,7 @@ func_mode_link ()
  	  func_arith $current - $age
  	  major=.$func_arith_result
  	  versuffix="$major.$age.$revision"
@@ -30,7 +43,7 @@ $NetBSD: patch-ac,v 1.33 2014/09/10 10:44:58 richard Exp $
  	  ;;
  
  	osf)
-@@ -7511,8 +7514,10 @@ func_mode_link ()
+@@ -7511,8 +7518,10 @@ func_mode_link ()
  	  esac
  	  if test "$need_version" = no; then
  	    versuffix=
@@ -41,7 +54,7 @@ $NetBSD: patch-ac,v 1.33 2014/09/10 10:44:58 richard Exp $
  	  fi
  	fi
  
-@@ -7520,6 +7525,7 @@ func_mode_link ()
+@@ -7520,6 +7529,7 @@ func_mode_link ()
  	if test "$avoid_version" = yes && test "$need_version" = no; then
  	  major=
  	  versuffix=
@@ -49,7 +62,7 @@ $NetBSD: patch-ac,v 1.33 2014/09/10 10:44:58 richard Exp $
  	  verstring=""
  	fi
  
-@@ -7630,7 +7636,7 @@ func_mode_link ()
+@@ -7630,7 +7640,7 @@ func_mode_link ()
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -58,7 +71,7 @@ $NetBSD: patch-ac,v 1.33 2014/09/10 10:44:58 richard Exp $
  	    # Do not include libc due to us having libc/libc_r.
  	    ;;
  	  *-*-sco3.2v5* | *-*-sco5v6*)
-@@ -7653,6 +7659,7 @@ func_mode_link ()
+@@ -7653,12 +7663,14 @@ func_mode_link ()
  	libname_save=$libname
  	release_save=$release
  	versuffix_save=$versuffix
@@ -66,7 +79,6 @@ $NetBSD: patch-ac,v 1.33 2014/09/10 10:44:58 richard Exp $
  	major_save=$major
  	# I'm not sure if I'm treating the release correctly.  I think
  	# release should show up in the -l (ie -lgmp5) so we don't want to
-@@ -7659,6 +7666,7 @@ func_mode_link ()
  	# add it in twice.  Is that correct?
  	release=""
  	versuffix=""
@@ -74,7 +86,7 @@ $NetBSD: patch-ac,v 1.33 2014/09/10 10:44:58 richard Exp $
  	major=""
  	newdeplibs=
  	droppeddeps=no
-@@ -7935,6 +7943,7 @@ EOF
+@@ -7935,6 +7947,7 @@ EOF
  	  ;;
  	esac
  	versuffix=$versuffix_save