diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile index 10897389c896..d4af0dae476b 100644 --- a/devel/libtool/Makefile +++ b/devel/libtool/Makefile @@ -1,40 +1,39 @@ # New ports collection makefile for: libtool # Date created: 6 May 1998 # Whom: Motoyuki Kasahara # # $FreeBSD$ # PORTNAME?= libtool -PORTVERSION= 2.4 -PORTREVISION?= 1 +PORTVERSION= 2.4.2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libtool DISTNAME= libtool-${PORTVERSION} MAINTAINER= autotools@FreeBSD.org COMMENT?= Generic shared library support script LICENSE?= GPLv2 LICENSE_FILE?= ${WRKSRC}/COPYING CONFLICTS= libtool-fixed-[0-9]* GNU_CONFIGURE= yes CONFIGURE_ARGS?= --disable-ltdl-install CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" INFO?= libtool .if ${PORTNAME} != "libltdl" MAN1= libtool.1 libtoolize.1 .endif post-patch: @${REINPLACE_CMD} -e 's|sed gsed|sed|g' \ -e 's|CC=cc|CC=${CC}|g' \ ${WRKSRC}/configure ${WRKSRC}/libltdl/configure post-configure: @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f .include diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index 187e5840b97a..c79c9c5d05da 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,2 +1,2 @@ -SHA256 (libtool-2.4.tar.gz) = 13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e -SIZE (libtool-2.4.tar.gz) = 2580417 +SHA256 (libtool-2.4.2.tar.gz) = b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918 +SIZE (libtool-2.4.2.tar.gz) = 2632347 diff --git a/devel/libtool/files/patch-10-a b/devel/libtool/files/patch-10-a deleted file mode 100644 index b817c6134eb4..000000000000 --- a/devel/libtool/files/patch-10-a +++ /dev/null @@ -1,40 +0,0 @@ -From e94c6d6e0359d92f08f491f57e0ef3371e978952 Mon Sep 17 00:00:00 2001 -From: Gerald Pfeifer -Date: Thu, 20 Jan 2011 18:35:14 +0000 -Subject: Remove support for FreeBSD 1.x. - -* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS) -(_LT_SYS_DYNAMIC_LINKER): Remove handling of freebsd1* which -soon would incorrectly match FreeBSD 10.0. -* NEWS, THANKS: Update. - -Signed-off-by: Ralf Wildenhues ---- -diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 -index ba2d5e4..033c9a0 100644 ---- libltdl/m4/libtool.m4 -+++ libltdl/m4/libtool.m4 -@@ -2455,10 +2455,6 @@ dgux*) - shlibpath_var=LD_LIBRARY_PATH - ;; - --freebsd1*) -- dynamic_linker=no -- ;; -- - freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. -@@ -5178,10 +5174,6 @@ _LT_EOF - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - -- freebsd1*) -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; -- - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little --- -cgit v0.8.3.4 diff --git a/devel/libtool/files/patch-10-b b/devel/libtool/files/patch-10-b deleted file mode 100644 index 32f9bb61d272..000000000000 --- a/devel/libtool/files/patch-10-b +++ /dev/null @@ -1,64 +0,0 @@ -From 49ae2888b43cad358e2ff60a69722341116e7b40 Mon Sep 17 00:00:00 2001 -From: Xin LI -Date: Sun, 02 Oct 2011 15:02:18 +0000 -Subject: Avoid problems when FreeBSD goes to version 10. - - * libltdl/m4/libtool.m4: Remove mentions of freebsd1. Use dots - for FreeBSD 2 and 3 detection to avoid future problems - * libltdl/m4/ltmain.m4sh: ditto. ---- -diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh -index 511480f..be37978 100644 ---- libltdl/config/ltmain.m4sh -+++ libltdl/config/ltmain.m4sh -@@ -2686,7 +2686,7 @@ static const void *lt_preloaded_setup() { - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. -- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) -+ *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; - *-*-hpux*) - pic_flag_for_symtable=" $pic_flag" ;; -diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 -index 350fbe1..0de7f3c 100644 ---- libltdl/m4/libtool.m4 -+++ libltdl/m4/libtool.m4 -@@ -2475,7 +2475,7 @@ freebsd* | dragonfly*) - objformat=`/usr/bin/objformat` - else - case $host_os in -- freebsd[[123]]*) objformat=aout ;; -+ freebsd[[23]].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi -@@ -2493,7 +2493,7 @@ freebsd* | dragonfly*) - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in -- freebsd2*) -+ freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) -@@ -5200,7 +5200,7 @@ _LT_EOF - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. -- freebsd2*) -+ freebsd2.*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes -@@ -6206,7 +6206,7 @@ if test "$_lt_caught_CXX_error" != yes; then - esac - ;; - -- freebsd[[12]]*) -+ freebsd2.*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - _LT_TAGVAR(ld_shlibs, $1)=no --- -cgit v0.8.3.4