Date: Fri, 23 Jan 2015 18:54:02 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377757 - in head: Mk Mk/Uses databases/libmemcached databases/libmemcached/files devel/automake devel/autotools devel/gettext devel/gettext-runtime devel/gettext-tools devel/git-merge-... Message-ID: <201501231854.t0NIs2kq035827@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Fri Jan 23 18:54:01 2015 New Revision: 377757 URL: https://svnweb.freebsd.org/changeset/ports/377757 QAT: https://qat.redports.org/buildarchive/r377757/ Log: - Update devel/automake to 1.15 - Update devel/gettext to 0.19.4 - Update devel/libtool and devel/libltdl to 2.4.5 - This version of libtool has been fixed to pass -fstack-protector to the compiler during linking. Add the same fix to USES=libtool. This should improve SSP support on FreeBSD/i386 8 and 9. - databases/libmemcached, security/sssd: patch configure.ac so AC_CONFIG_AUX_DIR appears earlier. For databases/libmemcached changing configure.ac causes manpages to be regenerated which requires extra dependencies so patch a makefile to prevent that. - devel/xfce4-dev-tools: only depend on recent versions of autoconf and automake PR: 196938 Exp-run by: antoine Approved by: portmgr (antoine) Added: head/databases/libmemcached/files/patch-configure.ac (contents, props changed) head/security/sssd/files/patch-configure.ac (contents, props changed) Deleted: head/devel/libtool/files/ Modified: head/Mk/Uses/autoreconf.mk head/Mk/Uses/libtool.mk head/Mk/bsd.autotools.mk head/databases/libmemcached/Makefile head/devel/automake/Makefile head/devel/automake/distinfo head/devel/automake/pkg-descr head/devel/automake/pkg-plist head/devel/autotools/Makefile head/devel/gettext-runtime/pkg-plist head/devel/gettext-tools/pkg-plist head/devel/gettext/Makefile.common head/devel/gettext/distinfo head/devel/git-merge-changelog/Makefile head/devel/libltdl/pkg-descr head/devel/libtool/Makefile head/devel/libtool/Makefile.common head/devel/libtool/distinfo head/devel/libtool/pkg-descr head/devel/libtool/pkg-plist head/devel/xfce4-dev-tools/Makefile Modified: head/Mk/Uses/autoreconf.mk ============================================================================== --- head/Mk/Uses/autoreconf.mk Fri Jan 23 18:51:11 2015 (r377756) +++ head/Mk/Uses/autoreconf.mk Fri Jan 23 18:54:01 2015 (r377757) @@ -57,8 +57,8 @@ _USES_POST+= autoreconf BUILD_DEPENDS+= autoconf-2.69:${PORTSDIR}/devel/autoconf \ autoheader-2.69:${PORTSDIR}/devel/autoconf \ autoreconf-2.69:${PORTSDIR}/devel/autoconf \ - aclocal-1.14:${PORTSDIR}/devel/automake \ - automake-1.14:${PORTSDIR}/devel/automake + aclocal-1.15:${PORTSDIR}/devel/automake \ + automake-1.15:${PORTSDIR}/devel/automake .if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild) BUILD_DEPENDS+= libtoolize:${PORTSDIR}/devel/libtool Modified: head/Mk/Uses/libtool.mk ============================================================================== --- head/Mk/Uses/libtool.mk Fri Jan 23 18:51:11 2015 (r377756) +++ head/Mk/Uses/libtool.mk Fri Jan 23 18:54:01 2015 (r377757) @@ -57,7 +57,7 @@ patch-libtool: -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|/' + -e 's/|-p|-pg|/|-B*|-fstack-protector*|-p|-pg|/' patch-lafiles: .if ${libtool_ARGS:Mkeepla} Modified: head/Mk/bsd.autotools.mk ============================================================================== --- head/Mk/bsd.autotools.mk Fri Jan 23 18:51:11 2015 (r377756) +++ head/Mk/bsd.autotools.mk Fri Jan 23 18:54:01 2015 (r377757) @@ -104,8 +104,8 @@ GNU_CONFIGURE= yes .endif .if defined(_AUTOTOOL_automake) -AUTOMAKE_VERSION= 1.14 -AUTOMAKE_APIVER= 1.14 +AUTOMAKE_VERSION= 1.15 +AUTOMAKE_APIVER= 1.15 AUTOMAKE_PORT= devel/automake . if ${_AUTOTOOL_automake} == "yes" Modified: head/databases/libmemcached/Makefile ============================================================================== --- head/databases/libmemcached/Makefile Fri Jan 23 18:51:11 2015 (r377756) +++ head/databases/libmemcached/Makefile Fri Jan 23 18:54:01 2015 (r377757) @@ -19,9 +19,10 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-memcached \ + --without-sphinx-build \ --enable-libmemcachedprotocol -LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo +LIBS+= -L${LOCALBASE}/lib -lexecinfo CXXFLAGS+= -D__STDC_CONSTANT_MACROS OPTIONS_DEFINE= DEBUG DTRACE MEMASLAP SASL @@ -50,6 +51,7 @@ PATHFIX_MAKEFILEIN= include.am post-patch: @${REINPLACE_CMD} -e '/^LDFLAGS *=/ s/$$/ $${LTLIBSASL2}/' \ ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} '/MAKE.*man/d' ${WRKSRC}/man/include.am post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.* Added: head/databases/libmemcached/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/libmemcached/files/patch-configure.ac Fri Jan 23 18:54:01 2015 (r377757) @@ -0,0 +1,19 @@ +--- configure.ac.orig 2014-02-09 11:52:42 UTC ++++ configure.ac +@@ -13,13 +13,13 @@ m4_include([version.m4]) + AC_PREREQ([2.61]) + AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/]) + ++AC_CONFIG_AUX_DIR([build-aux]) ++AC_CONFIG_MACRO_DIR([m4]) ++ + # Setup the compilers early on + AC_PROG_CC([cc gcc clang]) + AC_PROG_CXX([c++ g++ clang++]) + +-AC_CONFIG_AUX_DIR([build-aux]) +-AC_CONFIG_MACRO_DIR([m4]) +- + AC_CANONICAL_HOST + AC_ARG_PROGRAM + AC_USE_SYSTEM_EXTENSIONS Modified: head/devel/automake/Makefile ============================================================================== --- head/devel/automake/Makefile Fri Jan 23 18:51:11 2015 (r377756) +++ head/devel/automake/Makefile Fri Jan 23 18:54:01 2015 (r377757) @@ -2,26 +2,23 @@ # $FreeBSD$ PORTNAME= automake -PORTVERSION= 1.14 -PORTREVISION= 1 +PORTVERSION= 1.15 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= automake -DISTNAME= automake-${PORTVERSION} +MASTER_SITES= GNU MAINTAINER= autotools@FreeBSD.org COMMENT= GNU Standards-compliant Makefile generator -RUN_DEPENDS= ${AUTOCONF_DEPENDS} \ +BUILD_DEPENDS= autoconf-2.69:${PORTSDIR}/devel/autoconf +RUN_DEPENDS= autoconf-2.69:${PORTSDIR}/devel/autoconf \ automake-wrapper:${PORTSDIR}/devel/automake-wrapper -USE_AUTOTOOLS= autoconf:env -BUILD_VERSION= 1.14 +BUILD_VERSION= 1.15 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} USES= makeinfo perl5 tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION} -CONFIGURE_ENV+= MAKEINFO="makeinfo --no-split" +MAKE_ENV+= MAKEINFOFLAGS=--no-split INFO= automake .include <bsd.port.mk> Modified: head/devel/automake/distinfo ============================================================================== --- head/devel/automake/distinfo Fri Jan 23 18:51:11 2015 (r377756) +++ head/devel/automake/distinfo Fri Jan 23 18:54:01 2015 (r377757) @@ -1,2 +1,2 @@ -SHA256 (automake-1.14.tar.xz) = e1188f5d074374cf06946cabb2b9e70bee141637a8fd1fab9a660c8930fe8059 -SIZE (automake-1.14.tar.xz) = 1485516 +SHA256 (automake-1.15.tar.xz) = 9908c75aabd49d13661d6dcb1bc382252d22cc77bf733a2d55e87f2aa2db8636 +SIZE (automake-1.15.tar.xz) = 1496708 Modified: head/devel/automake/pkg-descr ============================================================================== --- head/devel/automake/pkg-descr Fri Jan 23 18:51:11 2015 (r377756) +++ head/devel/automake/pkg-descr Fri Jan 23 18:54:01 2015 (r377757) @@ -9,4 +9,4 @@ program. aclocal is a program to generat contents of 'configure.in'. It is useful as an extensible, maintainable mechanism for augmenting autoconf. -WWW: http://www.gnu.org/software/automake/ +WWW: https://www.gnu.org/software/automake/ Modified: head/devel/automake/pkg-plist ============================================================================== --- head/devel/automake/pkg-plist Fri Jan 23 18:51:11 2015 (r377756) +++ head/devel/automake/pkg-plist Fri Jan 23 18:54:01 2015 (r377757) @@ -1,9 +1,9 @@ bin/aclocal-%%BUILD_VERSION%% bin/automake-%%BUILD_VERSION%% -man/man1/aclocal-1.14-1.14.1.gz -man/man1/aclocal-1.14.1.gz -man/man1/automake-1.14-1.14.1.gz -man/man1/automake-1.14.1.gz +man/man1/aclocal-%%BUILD_VERSION%%-%%BUILD_VERSION%%.1.gz +man/man1/aclocal-%%BUILD_VERSION%%.1.gz +man/man1/automake-%%BUILD_VERSION%%-%%BUILD_VERSION%%.1.gz +man/man1/automake-%%BUILD_VERSION%%.1.gz share/aclocal-%%BUILD_VERSION%%/amversion.m4 share/aclocal-%%BUILD_VERSION%%/ar-lib.m4 share/aclocal-%%BUILD_VERSION%%/as.m4 @@ -109,7 +109,6 @@ share/automake-%%BUILD_VERSION%%/mdate-s share/automake-%%BUILD_VERSION%%/missing share/automake-%%BUILD_VERSION%%/mkinstalldirs share/automake-%%BUILD_VERSION%%/py-compile -share/automake-%%BUILD_VERSION%%/tap-driver.pl share/automake-%%BUILD_VERSION%%/tap-driver.sh share/automake-%%BUILD_VERSION%%/test-driver share/automake-%%BUILD_VERSION%%/texinfo.tex Modified: head/devel/autotools/Makefile ============================================================================== --- head/devel/autotools/Makefile Fri Jan 23 18:51:11 2015 (r377756) +++ head/devel/autotools/Makefile Fri Jan 23 18:54:01 2015 (r377757) @@ -17,7 +17,7 @@ RUN_DEPENDS= libtoolize:${PORTSDIR}/deve autoconf-2.13:${PORTSDIR}/devel/autoconf213 \ autoconf-2.69:${PORTSDIR}/devel/autoconf \ automake-1.4:${PORTSDIR}/devel/automake14 \ - automake-1.14:${PORTSDIR}/devel/automake + automake-1.15:${PORTSDIR}/devel/automake PLIST_FILES= share/${PORTNAME} NO_BUILD= yes Modified: head/devel/gettext-runtime/pkg-plist ============================================================================== --- head/devel/gettext-runtime/pkg-plist Fri Jan 23 18:51:11 2015 (r377756) +++ head/devel/gettext-runtime/pkg-plist Fri Jan 23 18:54:01 2015 (r377757) @@ -11,7 +11,7 @@ lib/libasprintf.so.0.0.0 lib/libintl.a lib/libintl.so lib/libintl.so.8 -lib/libintl.so.8.1.2 +lib/libintl.so.8.1.3 lib/libintl.so.9 man/man1/envsubst.1.gz man/man1/gettext.1.gz Modified: head/devel/gettext-tools/pkg-plist ============================================================================== --- head/devel/gettext-tools/pkg-plist Fri Jan 23 18:51:11 2015 (r377756) +++ head/devel/gettext-tools/pkg-plist Fri Jan 23 18:54:01 2015 (r377757) @@ -17,13 +17,13 @@ bin/msguniq bin/recode-sr-latin bin/xgettext include/gettext-po.h -lib/libgettextlib-0.19.3.so +lib/libgettextlib-0.19.4.so lib/libgettextlib.so lib/libgettextpo.a lib/libgettextpo.so lib/libgettextpo.so.0 -lib/libgettextpo.so.0.5.2 -lib/libgettextsrc-0.19.3.so +lib/libgettextpo.so.0.5.3 +lib/libgettextsrc-0.19.4.so lib/libgettextsrc.so lib/gettext/hostname lib/gettext/project-id Modified: head/devel/gettext/Makefile.common ============================================================================== --- head/devel/gettext/Makefile.common Fri Jan 23 18:51:11 2015 (r377756) +++ head/devel/gettext/Makefile.common Fri Jan 23 18:54:01 2015 (r377757) @@ -4,7 +4,7 @@ # experimental ports run. Untested commits may be backed out at portmgr's # discretion. -PORTVERSION= 0.19.3 +PORTVERSION= 0.19.4 PORTREVISION?= 0 # Leave this zero. Set in Makefile instead. CATEGORIES= devel MASTER_SITES= GNU/gettext Modified: head/devel/gettext/distinfo ============================================================================== --- head/devel/gettext/distinfo Fri Jan 23 18:51:11 2015 (r377756) +++ head/devel/gettext/distinfo Fri Jan 23 18:54:01 2015 (r377757) @@ -1,2 +1,2 @@ -SHA256 (gettext-0.19.3.tar.xz) = f6fdb29c9ee8ce85c7e574f60ff64fa91cf0f4f018437dfe800227d15595db46 -SIZE (gettext-0.19.3.tar.xz) = 6628460 +SHA256 (gettext-0.19.4.tar.xz) = 719adadb8bf3e36bac52c243a01c0add18d23506a3a40437e6f5899ceab18d20 +SIZE (gettext-0.19.4.tar.xz) = 6656168 Modified: head/devel/git-merge-changelog/Makefile ============================================================================== --- head/devel/git-merge-changelog/Makefile Fri Jan 23 18:51:11 2015 (r377756) +++ head/devel/git-merge-changelog/Makefile Fri Jan 23 18:54:01 2015 (r377757) @@ -13,7 +13,7 @@ MAINTAINER= knu@FreeBSD.org COMMENT= Git "merge" driver for GNU style ChangeLog files EXTRACT_DEPENDS= ${GNULIB_DIR}/lib/${PORTNAME}.c:${GNULIB_PORTDIR} \ - automake-1.14:${PORTSDIR}/devel/automake \ + automake-1.15:${PORTSDIR}/devel/automake \ autoconf-2.69:${PORTSDIR}/devel/autoconf GNU_CONFIGURE= yes Modified: head/devel/libltdl/pkg-descr ============================================================================== --- head/devel/libltdl/pkg-descr Fri Jan 23 18:51:11 2015 (r377756) +++ head/devel/libltdl/pkg-descr Fri Jan 23 18:54:01 2015 (r377757) @@ -7,3 +7,5 @@ It supports the following dlopen interfa * load_add_on (BeOS) * GNU DLD (emulates dynamic linking for static libraries) * libtool's dlpreopen + +WWW: https://www.gnu.org/software/libtool/ Modified: head/devel/libtool/Makefile ============================================================================== --- head/devel/libtool/Makefile Fri Jan 23 18:51:11 2015 (r377756) +++ head/devel/libtool/Makefile Fri Jan 23 18:54:01 2015 (r377757) @@ -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> Modified: head/devel/libtool/Makefile.common ============================================================================== --- head/devel/libtool/Makefile.common Fri Jan 23 18:51:11 2015 (r377756) +++ head/devel/libtool/Makefile.common Fri Jan 23 18:54:01 2015 (r377757) @@ -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 Modified: head/devel/libtool/distinfo ============================================================================== --- head/devel/libtool/distinfo Fri Jan 23 18:51:11 2015 (r377756) +++ head/devel/libtool/distinfo Fri Jan 23 18:54:01 2015 (r377757) @@ -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 Modified: head/devel/libtool/pkg-descr ============================================================================== --- head/devel/libtool/pkg-descr Fri Jan 23 18:51:11 2015 (r377756) +++ head/devel/libtool/pkg-descr Fri Jan 23 18:54:01 2015 (r377757) @@ -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/ Modified: head/devel/libtool/pkg-plist ============================================================================== --- head/devel/libtool/pkg-plist Fri Jan 23 18:51:11 2015 (r377756) +++ head/devel/libtool/pkg-plist Fri Jan 23 18:54:01 2015 (r377757) @@ -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 Modified: head/devel/xfce4-dev-tools/Makefile ============================================================================== --- head/devel/xfce4-dev-tools/Makefile Fri Jan 23 18:51:11 2015 (r377756) +++ head/devel/xfce4-dev-tools/Makefile Fri Jan 23 18:54:01 2015 (r377757) @@ -3,6 +3,7 @@ PORTNAME= xfce4-dev-tools PORTVERSION= 4.10.0 +PORTREVISION= 1 CATEGORIES= devel xfce MASTER_SITES= ${MASTER_SITE_XFCE} DIST_SUBDIR= xfce4 @@ -10,7 +11,9 @@ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Xfce 4 development tools -RUN_DEPENDS= ${LOCALBASE}/share/autotools:${PORTSDIR}/devel/autotools +RUN_DEPENDS= autoconf-2.69:${PORTSDIR}/devel/autoconf \ + automake-1.15:${PORTSDIR}/devel/automake \ + libtoolize:${PORTSDIR}/devel/libtool GNU_CONFIGURE= yes USE_XFCE= configenv # to get MASTER_SITE_SUBDIR something has to be defined Added: head/security/sssd/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/sssd/files/patch-configure.ac Fri Jan 23 18:54:01 2015 (r377757) @@ -0,0 +1,21 @@ +--- configure.ac.orig 2013-11-06 18:35:03 UTC ++++ configure.ac +@@ -5,15 +5,15 @@ AC_INIT([sssd], + VERSION_NUMBER, + [sssd-devel@lists.fedorahosted.org]) + ++AC_CONFIG_SRCDIR([BUILD.txt]) ++AC_CONFIG_AUX_DIR([build]) ++ + m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], + [AC_USE_SYSTEM_EXTENSIONS], + [AC_GNU_SOURCE]) + + CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" + +-AC_CONFIG_SRCDIR([BUILD.txt]) +-AC_CONFIG_AUX_DIR([build]) +- + AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax]) + AM_PROG_CC_C_O + m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501231854.t0NIs2kq035827>