[Midnightbsd-cvs] mports [23079] trunk/devel/libtool: update libtool
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Mar 7 23:41:54 EST 2018
Revision: 23079
http://svnweb.midnightbsd.org/mports/?rev=23079
Author: laffer1
Date: 2018-03-07 23:41:53 -0500 (Wed, 07 Mar 2018)
Log Message:
-----------
update libtool
Modified Paths:
--------------
trunk/devel/libtool/Makefile
trunk/devel/libtool/Makefile.common
trunk/devel/libtool/distinfo
trunk/devel/libtool/files/patch-build-aux_ltmain.sh
trunk/devel/libtool/files/patch-configure
trunk/devel/libtool/files/patch-m4_libtool.m4
trunk/devel/libtool/pkg-plist
Removed Paths:
-------------
trunk/devel/libtool/files/patch-libtoolize.in
Modified: trunk/devel/libtool/Makefile
===================================================================
--- trunk/devel/libtool/Makefile 2018-03-07 23:58:48 UTC (rev 23078)
+++ trunk/devel/libtool/Makefile 2018-03-08 04:41:53 UTC (rev 23079)
@@ -3,7 +3,7 @@
# $MidnightBSD$
PORTNAME= libtool
-PORTREVISION= 2
+PORTREVISION= 0
COMMENT= Generic shared library support script
@@ -27,7 +27,7 @@
post-patch:
@${RM} -f ${WRKSRC}/doc/*.info*
-.for f in build-aux/ltmain.sh configure libtoolize.in m4/libtool.m4
+.for f in build-aux/ltmain.sh configure m4/libtool.m4
@${TOUCH} -mr ${WRKSRC}/${f}.orig ${WRKSRC}/${f}
.endfor
Modified: trunk/devel/libtool/Makefile.common
===================================================================
--- trunk/devel/libtool/Makefile.common 2018-03-07 23:58:48 UTC (rev 23078)
+++ trunk/devel/libtool/Makefile.common 2018-03-08 04:41:53 UTC (rev 23079)
@@ -1,13 +1,16 @@
# $MidnightBSD$
# $FreeBSD: head/devel/libtool/Makefile.common 370099 2014-10-05 18:01:19Z tijl $
-PORTVERSION= 2.4.2.418
+PORTVERSION= 2.4.6
PORTREVISION?= 0 # Leave this zero. Set in Makefile instead.
CATEGORIES= devel
-MASTER_SITES= GNU_ALPHA/libtool
+MASTER_SITES= GNU/libtool
DISTNAME= libtool-${PORTVERSION}
MAINTAINER= ports at MidnightBSD.org
DISTINFO_FILE= ${.CURDIR}/../libtool/distinfo
-USES= tar:xz
+USES= cpe gmake tar:xz
+
+CPE_VENDOR= gnu
+CPE_PRODUCT= libtool
Modified: trunk/devel/libtool/distinfo
===================================================================
--- trunk/devel/libtool/distinfo 2018-03-07 23:58:48 UTC (rev 23078)
+++ trunk/devel/libtool/distinfo 2018-03-08 04:41:53 UTC (rev 23079)
@@ -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.6.tar.xz) = 7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f
+SIZE (libtool-2.4.6.tar.xz) = 973080
Modified: trunk/devel/libtool/files/patch-build-aux_ltmain.sh
===================================================================
--- trunk/devel/libtool/files/patch-build-aux_ltmain.sh 2018-03-07 23:58:48 UTC (rev 23078)
+++ trunk/devel/libtool/files/patch-build-aux_ltmain.sh 2018-03-08 04:41:53 UTC (rev 23079)
@@ -1,6 +1,6 @@
---- build-aux/ltmain.sh.orig 2013-10-26 18:53:58.000000000 -0400
-+++ build-aux/ltmain.sh 2015-01-03 15:30:17.521382190 -0500
-@@ -6871,7 +6871,7 @@
+--- build-aux/ltmain.sh.orig 2015-02-15 11:15:12.000000000 -0500
++++ build-aux/ltmain.sh 2018-03-07 23:37:11.000000000 -0500
+@@ -7019,7 +7019,7 @@
# These systems don't actually have a C library (as such)
test X-lc = "X$arg" && continue
;;
@@ -9,7 +9,7 @@
# Do not include libc due to us having libc/libc_r.
test X-lc = "X$arg" && continue
;;
-@@ -6891,7 +6891,7 @@
+@@ -7039,7 +7039,7 @@
esac
elif test X-lc_r = "X$arg"; then
case $host in
@@ -18,37 +18,38 @@
# Do not include libc_r directly, use -pthread flag.
continue
;;
-@@ -8598,13 +8598,13 @@
+@@ -8805,13 +8805,13 @@
#
case $version_type in
# correct linux to gnu/linux during the next big refactor
-- darwin|linux|osf|windows|none)
-+ darwin|freebsd-elf|midnightbsd-elf|midnightbsd|linux|osf|windows|none)
+- darwin|freebsd-elf|linux|osf|windows|none)
++ darwin|freebsd-elf|midnightbsd-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)
+- freebsd-aout|qnx|sunos)
++ freebsd-aout|midnightbsd-aout|qnx|sunos)
current=$number_major
revision=$number_minor
age=0
-@@ -8689,9 +8689,10 @@
+@@ -8891,12 +8891,12 @@
+ esac
+ ;;
+
+- freebsd-aout)
++ freebsd-aout | midnightbsd-aout)
+ major=.$current
versuffix=.$current.$revision
;;
- freebsd-elf)
-- major=.$current
-- versuffix=.$current
-+ freebsd-elf|midnightbsd|midnightbsd-elf)
-+ func_arith $current - $age
-+ major=.$func_arith_result
-+ versuffix=$major.$age.$revision
- ;;
-
- irix | nonstopux)
-@@ -8909,7 +8910,7 @@
++ freebsd-elf | midnightbsd-elf | midnightbsd)
+ func_arith $current - $age
+ major=.$func_arith_result
+ versuffix=$major.$age.$revision
+@@ -9122,7 +9122,7 @@
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
Modified: trunk/devel/libtool/files/patch-configure
===================================================================
--- trunk/devel/libtool/files/patch-configure 2018-03-07 23:58:48 UTC (rev 23078)
+++ trunk/devel/libtool/files/patch-configure 2018-03-08 04:41:53 UTC (rev 23079)
@@ -1,6 +1,6 @@
---- configure.orig 2013-10-26 18:53:35.000000000 -0400
-+++ configure 2014-12-17 22:58:50.619010180 -0500
-@@ -5781,7 +5781,7 @@
+--- configure.orig 2015-02-15 11:14:34.000000000 -0500
++++ configure 2018-03-07 23:37:48.000000000 -0500
+@@ -5903,7 +5903,7 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -9,7 +9,7 @@
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-@@ -6189,7 +6189,7 @@
+@@ -6311,7 +6311,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -18,7 +18,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -10605,7 +10605,7 @@
+@@ -10981,7 +10981,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -27,7 +27,7 @@
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -11568,7 +11568,7 @@
+@@ -12026,7 +12026,7 @@
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -36,17 +36,7 @@
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
-@@ -11582,7 +11582,8 @@
- 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
- ;;
-@@ -13370,7 +13371,7 @@
+@@ -13877,7 +13877,7 @@
# If you are looking for one http://www.opendarwin.org/projects/dlcompat
lt_cv_sys_dlopen_deplibs=yes
;;
@@ -55,7 +45,7 @@
lt_cv_sys_dlopen_deplibs=yes
;;
gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu)
-@@ -14877,7 +14878,7 @@
+@@ -15451,7 +15451,7 @@
archive_cmds_need_lc_CXX=no
;;
@@ -64,7 +54,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -15857,7 +15858,7 @@
+@@ -16391,7 +16391,7 @@
;;
esac
;;
@@ -73,7 +63,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -16725,7 +16726,7 @@
+@@ -17315,7 +17315,7 @@
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -82,18 +72,8 @@
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
-@@ -16739,7 +16740,8 @@
- 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
+@@ -19646,7 +19646,7 @@
;;
-@@ -18928,7 +18930,7 @@
- ;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
@@ -101,7 +81,7 @@
archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -19681,7 +19683,7 @@
+@@ -20481,7 +20481,7 @@
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -110,23 +90,8 @@
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
-@@ -19695,11 +19697,12 @@
- 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
+@@ -22947,7 +22947,7 @@
;;
-- freebsd-*)
-+ freebsd-* | midnightbsd-*)
- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
- need_version=yes
- ;;
-@@ -22019,7 +22022,7 @@
- ;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
@@ -134,7 +99,7 @@
archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_FC='-R$libdir'
hardcode_direct_FC=yes
-@@ -22772,7 +22775,7 @@
+@@ -23782,7 +23782,7 @@
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -143,18 +108,3 @@
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
-@@ -22786,11 +22789,12 @@
- 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
- ;;
-- freebsd-*)
-+ freebsd-* | midnightbsd-*)
- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
- need_version=yes
- ;;
Deleted: trunk/devel/libtool/files/patch-libtoolize.in
===================================================================
--- trunk/devel/libtool/files/patch-libtoolize.in 2018-03-07 23:58:48 UTC (rev 23078)
+++ trunk/devel/libtool/files/patch-libtoolize.in 2018-03-08 04:41:53 UTC (rev 23079)
@@ -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"
-
Modified: trunk/devel/libtool/files/patch-m4_libtool.m4
===================================================================
--- trunk/devel/libtool/files/patch-m4_libtool.m4 2018-03-07 23:58:48 UTC (rev 23078)
+++ trunk/devel/libtool/files/patch-m4_libtool.m4 2018-03-08 04:41:53 UTC (rev 23079)
@@ -1,6 +1,6 @@
---- m4/libtool.m4.orig 2013-10-25 19:37:46.000000000 -0400
-+++ m4/libtool.m4 2014-12-17 23:00:30.234010328 -0500
-@@ -1687,7 +1687,7 @@
+--- m4/libtool.m4.orig 2015-01-20 11:15:19.000000000 -0500
++++ m4/libtool.m4 2018-03-07 23:40:12.000000000 -0500
+@@ -1714,7 +1714,7 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -9,7 +9,7 @@
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-@@ -2533,7 +2533,7 @@
+@@ -2655,7 +2655,7 @@
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -18,17 +18,7 @@
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
-@@ -2547,7 +2547,8 @@
- 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
- ;;
-@@ -3289,7 +3290,7 @@
+@@ -3488,7 +3488,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -37,7 +27,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -4105,7 +4106,7 @@
+@@ -4317,7 +4317,7 @@
;;
esac
;;
@@ -46,7 +36,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -5343,7 +5344,7 @@
+@@ -5650,7 +5650,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -55,7 +45,7 @@
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_direct, $1)=yes
-@@ -6344,7 +6345,7 @@
+@@ -6760,7 +6760,7 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
;;
Modified: trunk/devel/libtool/pkg-plist
===================================================================
--- trunk/devel/libtool/pkg-plist 2018-03-07 23:58:48 UTC (rev 23078)
+++ trunk/devel/libtool/pkg-plist 2018-03-08 04:41:53 UTC (rev 23079)
@@ -2,8 +2,8 @@
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 @@
%%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 @@
%%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 @@
%%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
More information about the Midnightbsd-cvs
mailing list