- Update devel/libtool and devel/libltdl to version 2.4.2.418

- Patch libtool so it uses the same library version specification as on
  Darwin, Linux and other systems.  Given the version current:revision:age
  a library will be given the extension .so.major.age.revision with major
  equal to current-age.  Before libtool would use .so.current on FreeBSD.
- Patch libtoolize to remove two cases of umask 0 that caused libltdl
  files to be copied world writable (--ltdl option)
- Let USES=libtool patch this new version correctly
- Adjust all ports with USES=libtool:build and bump PORTREVISION on their
  dependent ports if a library version changed

PR:		194068
Exp-run by:	antoine
Approved by:	portmgr (antoine)
This commit is contained in:
tijl
2014-10-05 18:01:19 +00:00
parent b304305a19
commit 8808f90dc2
50 changed files with 280 additions and 241 deletions
+2
View File
@@ -40,7 +40,9 @@ patch-libtool:
@${FIND} ${WRKDIR} -type f -name ltmain.sh | \
${XARGS} ${REINPLACE_CMD} \
-e '/if.*linkmode.*prog.*mode.*!= relink/s/if.*;/if :;/'\
-e '/if.*prog.*linkmode.*relink !=.*mode/s/if.*;/if :;/'\
-e '/if.*linkmode.*prog.*mode.* = relink/s/||.*;/;/' \
-e '/if.*prog.*linkmode.*relink = .*mode/s/||.*;/;/' \
-e 's/|-p|-pg|/|-B*|-p|-pg|/'
.if ! ${libtool_ARGS:Moldver}
+1 -1
View File
@@ -4,7 +4,7 @@
PORTNAME= tardy
PORTVERSION= 1.28
DISTVERSIONSUFFIX= .D001.orig
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= archivers
MASTER_SITES= SF/tardy/${PORTVERSION}/
DISTNAME= ${PORTNAME}_${PORTVERSION}${DISTVERSIONSUFFIX}
+1 -1
View File
@@ -3,7 +3,7 @@
PORTNAME= libnoise
DISTVERSION= 1.0.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20sources/${PORTVERSION}
DISTNAME= ${PORTNAME}src-${DISTVERSION}
+1
View File
@@ -45,6 +45,7 @@ include/noise/vectortable.h
lib/libnoise.a
lib/libnoise.so
lib/libnoise.so.0
lib/libnoise.so.0.0.0
@dirrm include/noise/model
@dirrm include/noise/module
@dirrm include/noise
+1 -1
View File
@@ -3,7 +3,7 @@
PORTNAME= bglibs
PORTVERSION= 1.106
PORTREVISION= 5
PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= http://untroubled.org/${PORTNAME}/archive/ \
+4 -2
View File
@@ -100,11 +100,13 @@ lib/bglibs/libbg-path.a
lib/bglibs/libbg-str.a
lib/bglibs/libbg-sysdeps.a
lib/bglibs/libbg-sysdeps.so
lib/bglibs/libbg-sysdeps.so.2
lib/bglibs/libbg-sysdeps.so.1
lib/bglibs/libbg-sysdeps.so.1.1.1
lib/bglibs/libbg-unix.a
lib/bglibs/libbg.a
lib/bglibs/libbg.so
lib/bglibs/libbg.so.2
lib/bglibs/libbg.so.1
lib/bglibs/libbg.so.1.1.1
lib/bglibs/libinstaller.a
lib/bglibs/libinstcheck.a
lib/bglibs/libinstshow.a
+1
View File
@@ -2,6 +2,7 @@
PORTNAME= cdialog
PORTVERSION= 1.2.20140219
PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= devel
MASTER_SITES= ftp://invisible-island.net/${PORTNAME:S|^c||}/
+1
View File
@@ -7,6 +7,7 @@ include/cdialog/dlg_keys.h
lib/libcdialog.a
lib/libcdialog.so
lib/libcdialog.so.11
lib/libcdialog.so.11.1.0
man/man1/cdialog.1.gz
man/man3/cdialog.3.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+1 -1
View File
@@ -4,7 +4,7 @@
PORTNAME= fhist
PORTVERSION= 1.21
DISTVERSIONSUFFIX= .D001
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
+1 -1
View File
@@ -3,7 +3,7 @@
PORTNAME= libdsp
PORTVERSION= 5.0.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable-src/${PORTVERSION} \
http://mirror.mcx2.org/
+2 -1
View File
@@ -27,5 +27,6 @@ include/dsp/dspop.h
include/dsp/dsptypes.h
lib/libdsp.a
lib/libdsp.so
lib/libdsp.so.10
lib/libdsp.so.2
lib/libdsp.so.2.8.1
@dirrm include/dsp
+1 -1
View File
@@ -3,7 +3,7 @@
PORTNAME= libexplain
PORTVERSION= 1.3.${PATCHLEVEL}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION:R}
DISTNAME= ${PORTNAME}-${PORTVERSION:R}
+2 -1
View File
@@ -240,7 +240,8 @@ include/libexplain/write.h
include/libexplain/writev.h
lib/libexplain.a
lib/libexplain.so
lib/libexplain.so.55
lib/libexplain.so.51
lib/libexplain.so.51.4.0
libdata/pkgconfig/libexplain.pc
man/man1/explain.1.gz
man/man1/explain_lca2010.1.gz
+10 -11
View File
@@ -2,21 +2,20 @@
# $FreeBSD$
PORTNAME= libltdl
MASTERDIR= ${.CURDIR}/../../devel/libtool
PORTREVISION= 0
COMMENT= System independent dlopen wrapper
.include "${.CURDIR}/../libtool/Makefile.common"
LICENSE= LGPL21
USE_LDCONFIG= yes
USES= libtool:keepla
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-ltdl-install
CONFIGURE_WRKSRC=${WRKSRC}/libltdl
BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
INFO= # empty
INSTALL_TARGET= install-strip
USES+= libtool:keepla # .la file used in ltdl.m4
USE_LDCONFIG= yes
WRKSRC_SUBDIR= libltdl
.include "${MASTERDIR}/Makefile"
.include <bsd.port.mk>
+1 -2
View File
@@ -6,5 +6,4 @@ lib/libltdl.a
lib/libltdl.la
lib/libltdl.so
lib/libltdl.so.7
lib/libltdl.so.7.3.0
@dirrm include/libltdl
lib/libltdl.so.7.3.1
+3 -2
View File
@@ -3,7 +3,7 @@
PORTNAME= libmaa
PORTVERSION= 1.3.2
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= SF/dict/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -27,7 +27,8 @@ DOCS= README doc/libmaa.600dpi.ps
PLIST_FILES= include/maa.h \
lib/libmaa.a \
lib/libmaa.so \
lib/libmaa.so.3
lib/libmaa.so.3 \
lib/libmaa.so.3.0.0
PORTDOCS= ${DOCS:T}
post-install:
+17 -23
View File
@@ -1,36 +1,30 @@
# Created by: Motoyuki Kasahara <m-kasahr@sra.co.jp>
# $FreeBSD$
PORTNAME?= libtool
PORTVERSION= 2.4.2
PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool
DISTNAME= libtool-${PORTVERSION}
PORTNAME= libtool
PORTREVISION= 0
MAINTAINER= autotools@FreeBSD.org
COMMENT?= Generic shared library support script
COMMENT= Generic shared library support script
LICENSE?= GPLv2
.include "${.CURDIR}/../libtool/Makefile.common"
CONFLICTS= libtool-fixed-[0-9]*
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
USES+= makeinfo
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
post-configure:
@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
@${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
.include <bsd.port.mk>
+12
View File
@@ -0,0 +1,12 @@
# $FreeBSD$
PORTVERSION= 2.4.2.418
PORTREVISION?= 0 # Leave this zero. Set in Makefile instead.
CATEGORIES= devel
MASTER_SITES= GNU_ALPHA/libtool
DISTNAME= libtool-${PORTVERSION}
MAINTAINER= autotools@FreeBSD.org
DISTINFO_FILE= ${.CURDIR}/../libtool/distinfo
USES= tar:xz
+2 -2
View File
@@ -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
@@ -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|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)

Some files were not shown because too many files have changed in this diff Show More