[Midnightbsd-cvs] mports [17743] trunk/devel/libtool: update libtool to 2.4.2.418
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Oct 14 20:32:42 EDT 2014
Revision: 17743
http://svnweb.midnightbsd.org/mports/?rev=17743
Author: laffer1
Date: 2014-10-14 20:32:41 -0400 (Tue, 14 Oct 2014)
Log Message:
-----------
update libtool to 2.4.2.418
Modified Paths:
--------------
trunk/devel/libtool/Makefile
trunk/devel/libtool/distinfo
trunk/devel/libtool/pkg-plist
Added Paths:
-----------
trunk/devel/libtool/files/patch-build-aux_ltmain.sh
trunk/devel/libtool/files/patch-configure
trunk/devel/libtool/files/patch-libtoolize.in
trunk/devel/libtool/files/patch-m4_libtool.m4
Removed Paths:
-------------
trunk/devel/libtool/files/patch-libltdl-Makefile.in
trunk/devel/libtool/files/patch-libltdl_config_ltmain.sh
Modified: trunk/devel/libtool/Makefile
===================================================================
--- trunk/devel/libtool/Makefile 2014-10-15 00:21:47 UTC (rev 17742)
+++ trunk/devel/libtool/Makefile 2014-10-15 00:32:41 UTC (rev 17743)
@@ -1,32 +1,31 @@
+# Created by: Motoyuki Kasahara <m-kasahr at sra.co.jp>
+# $FreeBSD: head/devel/libtool/Makefile 370099 2014-10-05 18:01:19Z tijl $
# $MidnightBSD$
-PORTNAME?= libtool
-PORTVERSION= 2.4.2
-PORTREVISION= 1
-CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= libtool
-DISTNAME= libtool-${PORTVERSION}
+PORTNAME= libtool
+PORTREVISION= 0
-MAINTAINER= ports at MidnightBSD.org
COMMENT= Generic shared library support script
+.include "${.CURDIR}/../libtool/Makefile.common"
+
LICENSE= gpl2
+LICENSE_FILE= ${WRKSRC}/COPYING
+BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
+RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
+
GNU_CONFIGURE= yes
-CONFIGURE_ARGS?= --disable-ltdl-install
-CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
-INFO?= libtool
+CONFIGURE_ARGS= --disable-ltdl-install
+MAKE_ARGS= MAKEINFOFLAGS=--no-split
+USES+= makeinfo
-post-extract:
- @${RM} -f ${WRKSRC}/doc/*.info*
+INFO= libtool
post-patch:
- @${REINPLACE_CMD} -e 's|sed gsed|sed|g' \
- -e 's|CC=cc|CC=${CC}|g' \
- ${WRKSRC}/configure ${WRKSRC}/libltdl/configure
+ @${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
-post-configure:
- @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
-
.include <bsd.port.mk>
Modified: trunk/devel/libtool/distinfo
===================================================================
--- trunk/devel/libtool/distinfo 2014-10-15 00:21:47 UTC (rev 17742)
+++ trunk/devel/libtool/distinfo 2014-10-15 00:32:41 UTC (rev 17743)
@@ -1,2 +1,2 @@
-SHA256 (libtool-2.4.2.tar.gz) = b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918
-SIZE (libtool-2.4.2.tar.gz) = 2632347
+SHA256 (libtool-2.4.2.418.tar.xz) = 6465c7e6ebb7c9083aa610d510498aadf7be0c6dc5f2f4e57008686879d27d8c
+SIZE (libtool-2.4.2.418.tar.xz) = 941808
Added: trunk/devel/libtool/files/patch-build-aux_ltmain.sh
===================================================================
--- trunk/devel/libtool/files/patch-build-aux_ltmain.sh (rev 0)
+++ trunk/devel/libtool/files/patch-build-aux_ltmain.sh 2014-10-15 00:32:41 UTC (rev 17743)
@@ -0,0 +1,30 @@
+--- 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|midnightbsd|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)
Property changes on: trunk/devel/libtool/files/patch-build-aux_ltmain.sh
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/devel/libtool/files/patch-configure
===================================================================
--- trunk/devel/libtool/files/patch-configure (rev 0)
+++ trunk/devel/libtool/files/patch-configure 2014-10-15 00:32:41 UTC (rev 17743)
@@ -0,0 +1,42 @@
+--- 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
+ ;;
Property changes on: trunk/devel/libtool/files/patch-configure
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/devel/libtool/files/patch-libltdl-Makefile.in
===================================================================
--- trunk/devel/libtool/files/patch-libltdl-Makefile.in 2014-10-15 00:21:47 UTC (rev 17742)
+++ trunk/devel/libtool/files/patch-libltdl-Makefile.in 2014-10-15 00:32:41 UTC (rev 17743)
@@ -1,23 +0,0 @@
---- libltdl/Makefile.in.orig 2009-11-19 14:55:46.000000000 +0100
-+++ libltdl/Makefile.in 2009-11-19 14:56:35.000000000 +0100
-@@ -402,12 +402,6 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
--$(top_srcdir)/configure: $(am__configure_deps)
-- $(am__cd) $(srcdir) && $(AUTOCONF)
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-- $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
--$(am__aclocal_m4_deps):
--
- config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
-@@ -418,7 +412,6 @@
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
- $(srcdir)/config-h.in: $(am__configure_deps)
-- ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
- rm -f stamp-h1
- touch $@
-
Deleted: trunk/devel/libtool/files/patch-libltdl_config_ltmain.sh
===================================================================
--- trunk/devel/libtool/files/patch-libltdl_config_ltmain.sh 2014-10-15 00:21:47 UTC (rev 17742)
+++ trunk/devel/libtool/files/patch-libltdl_config_ltmain.sh 2014-10-15 00:32:41 UTC (rev 17743)
@@ -1,83 +0,0 @@
---- libltdl/config/ltmain.sh.orig 2010-09-22 09:45:43.000000000 -0500
-+++ libltdl/config/ltmain.sh 2011-01-18 12:59:46.000000000 -0600
-@@ -1376,2 +1376,17 @@
- $opt_debug
-+
-+ # FreeBSD-specific: where we install compilers with non-standard names
-+ tag_compilers_CC="*cc cc* *gcc gcc* clang"
-+ tag_compilers_CXX="*c++ c++* *g++ g++* clang++"
-+ base_compiler=`set -- "$@"; echo $1`
-+
-+ # If $tagname isn't set, then try to infer if the default "CC" tag applies
-+ if test -z "$tagname"; then
-+ for zp in $tag_compilers_CC; do
-+ case $base_compiler in
-+ $zp) tagname="CC"; break;;
-+ esac
-+ done
-+ fi
-+
- if test -n "$available_tags" && test -z "$tagname"; then
-@@ -1412,3 +1427,18 @@
- esac
-- fi
-+
-+ # FreeBSD-specific: try compilers based on inferred tag
-+ if test -z "$tagname"; then
-+ eval "tag_compilers=\$tag_compilers_${z}"
-+ if test -n "$tag_compilers"; then
-+ for zp in $tag_compilers; do
-+ case $base_compiler in
-+ $zp) tagname=$z; break;;
-+ esac
-+ done
-+ if test -n "$tagname"; then
-+ break
-+ fi
-+ fi
-+ fi
-+ fi
- done
-@@ -3516,2 +3546,5 @@
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
-@@ -5585,2 +5618,3 @@
- esac
-+ deplibs="$deplibs $arg"
- continue
-@@ -6155,9 +6189,26 @@
- func_append compiler_flags " $deplib"
-- if test "$linkmode" = lib ; then
-- case "$new_inherited_linker_flags " in
-- *" $deplib "*) ;;
-- * ) func_append new_inherited_linker_flags " $deplib" ;;
-- esac
-- fi
- fi
-+
-+ case $linkmode in
-+ lib)
-+ deplibs="$deplib $deplibs"
-+ test "$pass" = conv && continue
-+ newdependency_libs="$deplib $newdependency_libs"
-+ ;;
-+ prog)
-+ if test "$pass" = conv; then
-+ deplibs="$deplib $deplibs"
-+ continue
-+ fi
-+ if test "$pass" = scan; then
-+ deplibs="$deplib $deplibs"
-+ else
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ fi
-+ ;;
-+ *)
-+ ;;
-+ esac # linkmode
-+
- continue
Added: trunk/devel/libtool/files/patch-libtoolize.in
===================================================================
--- trunk/devel/libtool/files/patch-libtoolize.in (rev 0)
+++ trunk/devel/libtool/files/patch-libtoolize.in 2014-10-15 00:32:41 UTC (rev 17743)
@@ -0,0 +1,34 @@
+--- 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"
+
Property changes on: trunk/devel/libtool/files/patch-libtoolize.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/devel/libtool/files/patch-m4_libtool.m4
===================================================================
--- trunk/devel/libtool/files/patch-m4_libtool.m4 (rev 0)
+++ trunk/devel/libtool/files/patch-m4_libtool.m4 2014-10-15 00:32:41 UTC (rev 17743)
@@ -0,0 +1,12 @@
+--- 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
+ ;;
Property changes on: trunk/devel/libtool/files/patch-m4_libtool.m4
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/devel/libtool/pkg-plist
===================================================================
--- trunk/devel/libtool/pkg-plist 2014-10-15 00:21:47 UTC (rev 17742)
+++ trunk/devel/libtool/pkg-plist 2014-10-15 00:32:41 UTC (rev 17743)
@@ -9,50 +9,45 @@
share/aclocal/ltsugar.m4
share/aclocal/ltversion.m4
share/aclocal/lt~obsolete.m4
-share/libtool/config/compile
-share/libtool/config/config.guess
-share/libtool/config/config.sub
-share/libtool/config/depcomp
-share/libtool/config/install-sh
-share/libtool/config/ltmain.sh
-share/libtool/config/missing
-share/libtool/libltdl/COPYING.LIB
-share/libtool/libltdl/Makefile.am
-share/libtool/libltdl/Makefile.in
-share/libtool/libltdl/Makefile.inc
-share/libtool/libltdl/README
-share/libtool/libltdl/aclocal.m4
-share/libtool/libltdl/argz.c
-share/libtool/libltdl/argz_.h
-share/libtool/libltdl/config-h.in
-share/libtool/libltdl/configure
-share/libtool/libltdl/configure.ac
-share/libtool/libltdl/libltdl/lt__alloc.h
-share/libtool/libltdl/libltdl/lt__dirent.h
-share/libtool/libltdl/libltdl/lt__glibc.h
-share/libtool/libltdl/libltdl/lt__private.h
-share/libtool/libltdl/libltdl/lt__strl.h
-share/libtool/libltdl/libltdl/lt_dlloader.h
-share/libtool/libltdl/libltdl/lt_error.h
-share/libtool/libltdl/libltdl/lt_system.h
-share/libtool/libltdl/libltdl/slist.h
-share/libtool/libltdl/loaders/dld_link.c
-share/libtool/libltdl/loaders/dlopen.c
-share/libtool/libltdl/loaders/dyld.c
-share/libtool/libltdl/loaders/load_add_on.c
-share/libtool/libltdl/loaders/loadlibrary.c
-share/libtool/libltdl/loaders/preopen.c
-share/libtool/libltdl/loaders/shl_load.c
-share/libtool/libltdl/lt__alloc.c
-share/libtool/libltdl/lt__dirent.c
-share/libtool/libltdl/lt__strl.c
-share/libtool/libltdl/lt_dlloader.c
-share/libtool/libltdl/lt_error.c
-share/libtool/libltdl/ltdl.c
-share/libtool/libltdl/ltdl.h
-share/libtool/libltdl/slist.c
- at dirrm share/libtool/libltdl/loaders
- at dirrm share/libtool/libltdl/libltdl
- at dirrm share/libtool/libltdl
- at dirrm share/libtool/config
- at dirrm share/libtool
+%%DATADIR%%/COPYING.LIB
+%%DATADIR%%/Makefile.am
+%%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
+%%DATADIR%%/build-aux/depcomp
+%%DATADIR%%/build-aux/install-sh
+%%DATADIR%%/build-aux/ltmain.sh
+%%DATADIR%%/build-aux/missing
+%%DATADIR%%/config-h.in
+%%DATADIR%%/configure
+%%DATADIR%%/configure.ac
+%%DATADIR%%/libltdl/lt__alloc.h
+%%DATADIR%%/libltdl/lt__dirent.h
+%%DATADIR%%/libltdl/lt__glibc.h
+%%DATADIR%%/libltdl/lt__private.h
+%%DATADIR%%/libltdl/lt__strl.h
+%%DATADIR%%/libltdl/lt_dlloader.h
+%%DATADIR%%/libltdl/lt_error.h
+%%DATADIR%%/libltdl/lt_system.h
+%%DATADIR%%/libltdl/slist.h
+%%DATADIR%%/loaders/dld_link.c
+%%DATADIR%%/loaders/dlopen.c
+%%DATADIR%%/loaders/dyld.c
+%%DATADIR%%/loaders/load_add_on.c
+%%DATADIR%%/loaders/loadlibrary.c
+%%DATADIR%%/loaders/preopen.c
+%%DATADIR%%/loaders/shl_load.c
+%%DATADIR%%/lt__alloc.c
+%%DATADIR%%/lt__dirent.c
+%%DATADIR%%/lt__strl.c
+%%DATADIR%%/lt_dlloader.c
+%%DATADIR%%/lt_error.c
+%%DATADIR%%/ltdl.c
+%%DATADIR%%/ltdl.h
+%%DATADIR%%/ltdl.mk
+%%DATADIR%%/slist.c
More information about the Midnightbsd-cvs
mailing list