9 files changed, 9 insertions, 129 deletions

diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index a6d2eb23cb8b..2be46e804953 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -23,8 +23,6 @@ INFO=		libtool
 
 post-patch:
 	@${RM} -f ${WRKSRC}/doc/*.info*
-.for f in build-aux/ltmain.sh configure libtoolize.in m4/libtool.m4
-	@${TOUCH} -mr ${WRKSRC}/${f}.orig ${WRKSRC}/${f}
-.endfor
+	@${TOUCH} ${WRKSRC}/doc/libtool.1
 
 .include <bsd.port.mk>
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 9a4e07e19bbc..bf4095650c22 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PORTVERSION=	2.4.2.418
+PORTVERSION=	2.4.5
 PORTREVISION?=	0 # Leave this zero. Set in Makefile instead.
 CATEGORIES=	devel
-MASTER_SITES=	GNU_ALPHA/libtool
+MASTER_SITES=	GNU/libtool
 DISTNAME=	libtool-${PORTVERSION}
 
 MAINTAINER=	autotools@FreeBSD.org
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 04a7797b6d94..a743169c2ce0 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libtool-2.4.2.418.tar.xz) = 6465c7e6ebb7c9083aa610d510498aadf7be0c6dc5f2f4e57008686879d27d8c
-SIZE (libtool-2.4.2.418.tar.xz) = 941808
+SHA256 (libtool-2.4.5.tar.xz) = 84aac136513b009278896ffa255e4d685bcdb0cb0e5363be36adad64c986177e
+SIZE (libtool-2.4.5.tar.xz) = 971620
diff --git a/devel/libtool/files/patch-build-aux_ltmain.sh b/devel/libtool/files/patch-build-aux_ltmain.sh
deleted file mode 100644
index 8b617eb99390..000000000000
--- a/devel/libtool/files/patch-build-aux_ltmain.sh
+++ /dev/null
@@ -1,30 +0,0 @@
---- build-aux/ltmain.sh.orig	2013-10-26 22:53:58 UTC
-+++ build-aux/ltmain.sh
-@@ -8598,13 +8598,13 @@ func_mode_link ()
- 	  #
- 	  case $version_type in
- 	  # correct linux to gnu/linux during the next big refactor
--	  darwin|linux|osf|windows|none)
-+	  darwin|freebsd-elf|linux|osf|windows|none)
- 	    func_arith $number_major + $number_minor
- 	    current=$func_arith_result
- 	    age=$number_minor
- 	    revision=$number_revision
- 	    ;;
--	  freebsd-aout|freebsd-elf|qnx|sunos)
-+	  freebsd-aout|qnx|sunos)
- 	    current=$number_major
- 	    revision=$number_minor
- 	    age=0
-@@ -8690,8 +8690,9 @@ func_mode_link ()
- 	  ;;
- 
- 	freebsd-elf)
--	  major=.$current
--	  versuffix=.$current
-+	  func_arith $current - $age
-+	  major=.$func_arith_result
-+	  versuffix=$major.$age.$revision
- 	  ;;
- 
- 	irix | nonstopux)
diff --git a/devel/libtool/files/patch-configure b/devel/libtool/files/patch-configure
deleted file mode 100644
index f388f32064ea..000000000000
--- a/devel/libtool/files/patch-configure
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.orig	2013-10-26 22:53:35 UTC
-+++ configure
-@@ -11582,7 +11582,8 @@ freebsd* | dragonfly*)
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
--      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
-+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-+      soname_spec='$libname$release$shared_ext$major'
-       need_version=no
-       need_lib_prefix=no
-       ;;
-@@ -16739,7 +16740,8 @@ freebsd* | dragonfly*)
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
--      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
-+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-+      soname_spec='$libname$release$shared_ext$major'
-       need_version=no
-       need_lib_prefix=no
-       ;;
-@@ -19695,7 +19697,8 @@ freebsd* | dragonfly*)
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
--      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
-+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-+      soname_spec='$libname$release$shared_ext$major'
-       need_version=no
-       need_lib_prefix=no
-       ;;
-@@ -22786,7 +22789,8 @@ freebsd* | dragonfly*)
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
--      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
-+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-+      soname_spec='$libname$release$shared_ext$major'
-       need_version=no
-       need_lib_prefix=no
-       ;;
diff --git a/devel/libtool/files/patch-libtoolize.in b/devel/libtool/files/patch-libtoolize.in
deleted file mode 100644
index 9200d99bb561..000000000000
--- a/devel/libtool/files/patch-libtoolize.in
+++ /dev/null
@@ -1,34 +0,0 @@
---- libtoolize.in.orig	2013-08-23 05:06:01 UTC
-+++ libtoolize.in
-@@ -393,7 +393,7 @@ func_copy ()
-     # Filters always take priority.
-     if test -n "$my_filter"; then
-       if $opt_dry_run || {
--          ( umask 0
-+          (
-             $SED -e "$my_filter" "$my_srcfile" > "$my_destfile"
-           ) >/dev/null 2>&1
-         }
-@@ -423,7 +423,7 @@ func_copy ()
-     $opt_verbose && my_copy_msg="$my_copycmd $my_srcfile $my_destdir"
- 
-     if $opt_dry_run || {
--        ( umask 0
-+        (
-           $my_copycmd "$my_srcfile" "$my_destfile"
-         ) >/dev/null 2>&1
-       }
-@@ -1894,9 +1894,10 @@ func_require_seen_libtool ()
-   # Lists of all files libtoolize has ever installed.  These are removed
-   # before installing the latest files when --force was passed to help
-   # ensure a clean upgrade.
--  # Do not remove config.guess nor config.sub, we don't install them
--  # without --install, and the project may not be using Automake.
--  all_pkgaux_files="compile install-sh depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h"
-+  # Do not remove config.guess, config.sub or install-sh, we don't
-+  # install them without --install, and the project may not be using
-+  # Automake.
-+  all_pkgaux_files="compile depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h"
-   all_pkgmacro_files="argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 ltversion.in ltversion.m4 lt~obsolete.m4"
-   all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h ltdl.mk slist.c"
- 
diff --git a/devel/libtool/files/patch-m4_libtool.m4 b/devel/libtool/files/patch-m4_libtool.m4
deleted file mode 100644
index 166403936d9d..000000000000
--- a/devel/libtool/files/patch-m4_libtool.m4
+++ /dev/null
@@ -1,12 +0,0 @@
---- m4/libtool.m4.orig	2013-10-25 23:37:46 UTC
-+++ m4/libtool.m4
-@@ -2547,7 +2547,8 @@ freebsd* | dragonfly*)
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
--      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
-+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-+      soname_spec='$libname$release$shared_ext$major'
-       need_version=no
-       need_lib_prefix=no
-       ;;
diff --git a/devel/libtool/pkg-descr b/devel/libtool/pkg-descr
index 1dea88bf6d51..4d1a31a0b60b 100644
--- a/devel/libtool/pkg-descr
+++ b/devel/libtool/pkg-descr
@@ -5,4 +5,4 @@ interface.
 To use libtool, add the new generic library building commands to your
 Makefile, Makefile.in, or Makefile.am.
 
-WWW: http://www.gnu.org/software/libtool/
+WWW: https://www.gnu.org/software/libtool/
diff --git a/devel/libtool/pkg-plist b/devel/libtool/pkg-plist
index 1c0683fb8c1d..e3ab7e6742af 100644
--- a/devel/libtool/pkg-plist
+++ b/devel/libtool/pkg-plist
@@ -2,8 +2,8 @@ bin/libtool
 bin/libtoolize
 man/man1/libtool.1.gz
 man/man1/libtoolize.1.gz
-share/aclocal/argz.m4
 share/aclocal/libtool.m4
+share/aclocal/ltargz.m4
 share/aclocal/ltdl.m4
 share/aclocal/ltoptions.m4
 share/aclocal/ltsugar.m4
@@ -14,8 +14,6 @@ share/aclocal/lt~obsolete.m4
 %%DATADIR%%/Makefile.in
 %%DATADIR%%/README
 %%DATADIR%%/aclocal.m4
-%%DATADIR%%/argz.c
-%%DATADIR%%/argz_.h
 %%DATADIR%%/build-aux/compile
 %%DATADIR%%/build-aux/config.guess
 %%DATADIR%%/build-aux/config.sub
@@ -27,6 +25,7 @@ share/aclocal/lt~obsolete.m4
 %%DATADIR%%/configure
 %%DATADIR%%/configure.ac
 %%DATADIR%%/libltdl/lt__alloc.h
+%%DATADIR%%/libltdl/lt__argz_.h
 %%DATADIR%%/libltdl/lt__dirent.h
 %%DATADIR%%/libltdl/lt__glibc.h
 %%DATADIR%%/libltdl/lt__private.h
@@ -43,6 +42,7 @@ share/aclocal/lt~obsolete.m4
 %%DATADIR%%/loaders/preopen.c
 %%DATADIR%%/loaders/shl_load.c
 %%DATADIR%%/lt__alloc.c
+%%DATADIR%%/lt__argz.c
 %%DATADIR%%/lt__dirent.c
 %%DATADIR%%/lt__strl.c
 %%DATADIR%%/lt_dlloader.c