Index: Mk/Uses/autoreconf.mk =================================================================== --- Mk/Uses/autoreconf.mk (revision 377498) +++ Mk/Uses/autoreconf.mk (working copy) @@ -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 Index: Mk/Uses/libtool.mk =================================================================== --- Mk/Uses/libtool.mk (revision 377498) +++ Mk/Uses/libtool.mk (working copy) @@ -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} Index: Mk/bsd.autotools.mk =================================================================== --- Mk/bsd.autotools.mk (revision 377498) +++ Mk/bsd.autotools.mk (working copy) @@ -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" Index: devel/automake/Makefile =================================================================== --- devel/automake/Makefile (revision 377498) +++ devel/automake/Makefile (working copy) @@ -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 Index: devel/automake/distinfo =================================================================== --- devel/automake/distinfo (revision 377498) +++ devel/automake/distinfo (working copy) @@ -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 Index: devel/automake/pkg-descr =================================================================== --- devel/automake/pkg-descr (revision 377498) +++ devel/automake/pkg-descr (working copy) @@ -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/ Index: devel/automake/pkg-plist =================================================================== --- devel/automake/pkg-plist (revision 377498) +++ devel/automake/pkg-plist (working copy) @@ -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 Index: devel/gettext/Makefile.common =================================================================== --- devel/gettext/Makefile.common (revision 377498) +++ devel/gettext/Makefile.common (working copy) @@ -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 Index: devel/gettext/distinfo =================================================================== --- devel/gettext/distinfo (revision 377498) +++ devel/gettext/distinfo (working copy) @@ -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 Index: devel/gettext-runtime/pkg-plist =================================================================== --- devel/gettext-runtime/pkg-plist (revision 377498) +++ devel/gettext-runtime/pkg-plist (working copy) @@ -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 Index: devel/gettext-tools/pkg-plist =================================================================== --- devel/gettext-tools/pkg-plist (revision 377498) +++ devel/gettext-tools/pkg-plist (working copy) @@ -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 Index: devel/libtool/Makefile =================================================================== --- devel/libtool/Makefile (revision 377498) +++ devel/libtool/Makefile (working copy) @@ -23,8 +23,5 @@ 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 .include Index: devel/libtool/Makefile.common =================================================================== --- devel/libtool/Makefile.common (revision 377498) +++ devel/libtool/Makefile.common (working copy) @@ -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 Index: devel/libtool/distinfo =================================================================== --- devel/libtool/distinfo (revision 377498) +++ devel/libtool/distinfo (working copy) @@ -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 Index: devel/libtool/files/patch-build-aux_ltmain.sh =================================================================== --- devel/libtool/files/patch-build-aux_ltmain.sh (revision 377498) +++ devel/libtool/files/patch-build-aux_ltmain.sh (working copy) @@ -1,30 +0,0 @@ ---- 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) Index: devel/libtool/files/patch-configure =================================================================== --- devel/libtool/files/patch-configure (revision 377498) +++ devel/libtool/files/patch-configure (working copy) @@ -1,42 +0,0 @@ ---- 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 - ;; Index: devel/libtool/files/patch-libtoolize.in =================================================================== --- devel/libtool/files/patch-libtoolize.in (revision 377498) +++ devel/libtool/files/patch-libtoolize.in (working copy) @@ -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" - Index: devel/libtool/files/patch-m4_libtool.m4 =================================================================== --- devel/libtool/files/patch-m4_libtool.m4 (revision 377498) +++ devel/libtool/files/patch-m4_libtool.m4 (working copy) @@ -1,12 +0,0 @@ ---- 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 - ;; Index: devel/libtool/pkg-descr =================================================================== --- devel/libtool/pkg-descr (revision 377498) +++ devel/libtool/pkg-descr (working copy) @@ -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/ Index: devel/libtool/pkg-plist =================================================================== --- devel/libtool/pkg-plist (revision 377498) +++ devel/libtool/pkg-plist (working copy) @@ -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 Index: devel/libltdl/pkg-descr =================================================================== --- devel/libltdl/pkg-descr (revision 377498) +++ devel/libltdl/pkg-descr (working copy) @@ -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/ Index: devel/autotools/Makefile =================================================================== --- devel/autotools/Makefile (revision 377498) +++ devel/autotools/Makefile (working copy) @@ -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 Index: devel/git-merge-changelog/Makefile =================================================================== --- devel/git-merge-changelog/Makefile (revision 377498) +++ devel/git-merge-changelog/Makefile (working copy) @@ -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 Index: devel/xfce4-dev-tools/Makefile =================================================================== --- devel/xfce4-dev-tools/Makefile (revision 377498) +++ devel/xfce4-dev-tools/Makefile (working copy) @@ -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