 @@ -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

 @@ -1,14 +1,14 @@
-# $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 $
 ###########################################################################
 ###########################################################################
+#
 # HEADS UP!  DO NOT CHANGE THE VERSION OR PKGREVISION WITHOUT READING THIS:
+#
 ###########################################################################
 ###########################################################################
+#
 # This package is maintained specially in order to preserve pkgsrc
 # specific OS changes that diverge from the "out of the box" libtool.
 # In order to keep this package in a maintainable condition, the .m4 files
 # must be manipulated in order to generate the patch-* files.
 @@ -16,27 +16,27 @@
 # See devel/libtool/patches/manual.README for instructions on how to make
 # these patch files properly; otherwise your changes WILL be lost on the
 # next libtool update.
+#
 # DO NOT MAKE CHANGES TO patch-ab OR patch-ad WITHOUT FOLLOWING THESE
 # INSTRUCTIONS.  There are no exceptions to this rule.
+#
 ###########################################################################
 ###########################################################################
 .include "../../devel/libtool/Makefile.common"
 PKGNAME=	${DISTNAME:S/-/-base-/}
-PKGREVISION=	8
+PKGREVISION=	9
 COMMENT=	Generic shared library support script (the script itself)
 CONFLICTS+=	libtool<=1.3.5nb11
 TEST_TARGET=	check
 OVERRIDE_DIRDEPTH.install-sh=	1
 .if ${OPSYS} == "AIX"
 # always build libraries and executables that use the runtime linker.
 # in addition, disable libtool locking, as the test is broken on AIX,

 @@ -1,84 +1,96 @@
-$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
 @@ -133,8 +133,9 @@ $lt_unset CDPATH
  # function.
  progpath="$0"
+-
+-
 +unset CP
 +unset MV
 +unset RM
  : ${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=
 +	versuffix2=
  	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"
 +	  versuffix2="$major.$age"
  	  ;;
  	osf)
-@@ -7511,8 +7514,10 @@ func_mode_link ()
+@@ -7511,8 +7518,10 @@ func_mode_link ()
  	  esac
  	  if test "$need_version" = no; then
  	    versuffix=
 +	    versuffix2=
  	  else
  	    versuffix=".0.0"
 +	    versuffix2=".0.0"
  	  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=
 +	  versuffix2=
  	  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.
  	    ;;
 -	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 +	  *-*-openbsd* | *-*-mirbsd* | *-*-freebsd* | *-*-dragonfly*)
  	    # 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
 +	versuffix2_save=$versuffix2
  	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=""
 +	versuffix2=""
  	major=""
  	newdeplibs=
  	droppeddeps=no
-@@ -7935,6 +7943,7 @@ EOF
+@@ -7935,6 +7947,7 @@ EOF
  	  ;;
  	esac
  	versuffix=$versuffix_save
 +	versuffix2=$versuffix2_save
  	major=$major_save
  	release=$release_save
  	libname=$libname_save