diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk
index e7bcc7717f3f..57eb8df8882e 100644
--- a/Mk/Uses/autoreconf.mk
+++ b/Mk/Uses/autoreconf.mk
@@ -54,11 +54,8 @@
 _INCLUDE_USES_AUTORECONF_MK=	yes
 _USES_POST+=	autoreconf
 
-BUILD_DEPENDS+=	autoconf-2.69:devel/autoconf \
-		autoheader-2.69:devel/autoconf \
-		autoreconf-2.69:devel/autoconf \
-		aclocal-1.15:devel/automake \
-		automake-1.15:devel/automake
+BUILD_DEPENDS+=	autoconf>=2.69:devel/autoconf \
+		automake>=1.16.1:devel/automake
 
 .if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
 BUILD_DEPENDS+=	libtoolize:devel/libtool
diff --git a/accessibility/redshift/Makefile b/accessibility/redshift/Makefile
index 5a15cf84f86e..844e3b54afed 100644
--- a/accessibility/redshift/Makefile
+++ b/accessibility/redshift/Makefile
@@ -12,20 +12,17 @@ COMMENT=	Adjusts the color temperature of your screen
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gettext gmake libtool localbase pkgconfig shebangfix tar:bzip2
+USES=		autoreconf:build gettext gmake libtool localbase pkgconfig \
+		shebangfix tar:bzip2
 USE_GITHUB=	yes
 GH_ACCOUNT=	jonls
+USE_GNOME=	intltool
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 SHEBANG_FILES=	src/redshift-gtk/redshift-gtk.in
 
 CONFIGURE_ARGS+=	--disable-wingdi
 
-BUILD_DEPENDS=	autoconf-2.69:devel/autoconf \
-		automake-1.15:devel/automake \
-		libtoolize:devel/libtool \
-		intltool>=0:textproc/intltool
-
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libgeoclue-2.so:net/geoclue
 
diff --git a/audio/ifp-line/Makefile b/audio/ifp-line/Makefile
index 348a274915ae..234e1a931354 100644
--- a/audio/ifp-line/Makefile
+++ b/audio/ifp-line/Makefile
@@ -13,21 +13,16 @@ COMMENT=	Command line interface to iRiver music players
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf iconv
+USES=		iconv
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	LIBUSB_LIBS=-lusb
 MAKE_JOBS_UNSAFE=	yes
 
-LDFLAGS+=	-lusb
-
 PLIST_FILES=	bin/ifp man/man1/ifp.1.gz
 PORTDOCS=	NEWS README TIPS nonroot.sh
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		'/LIBUSB/s|ERROR|WARN|' ${WRKSRC}/configure.ac
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ifp ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/ifp.1 ${STAGEDIR}${MANPREFIX}/man/man1
diff --git a/audio/ifp-line/files/patch-Makefile.am b/audio/ifp-line/files/patch-Makefile.am
deleted file mode 100644
index 2d2df98fb63a..000000000000
--- a/audio/ifp-line/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig	2005-12-10 07:35:04 UTC
-+++ Makefile.am
-@@ -2,6 +2,8 @@
- 
- EXTRA_DIST = $(man1_MANS) $(pkgdata_DATA)
- 
-+ACLOCAL_AMFLAGS = -I m4 
-+
- bin_PROGRAMS = ifp
- ifp_SOURCES = ifp.c ifp_routines.c ifp_routines.h
- ifp_CFLAGS = @LIBUSB_CFLAGS@
diff --git a/audio/ifp-line/files/patch-configure b/audio/ifp-line/files/patch-configure
new file mode 100644
index 000000000000..ebf42c96bba4
--- /dev/null
+++ b/audio/ifp-line/files/patch-configure
@@ -0,0 +1,284 @@
+--- configure.orig	2005-12-10 07:27:54 UTC
++++ configure
+@@ -3860,281 +3860,6 @@ _ACEOF
+ 
+ 
+ 
+-# Check whether --with-libusb-prefix or --without-libusb-prefix was given.
+-if test "${with_libusb_prefix+set}" = set; then
+-  withval="$with_libusb_prefix"
+-  libusb_prefix="$withval"
+-else
+-  libusb_prefix=""
+-fi;
+-
+-# Check whether --with-libusb-exec-prefix or --without-libusb-exec-prefix was given.
+-if test "${with_libusb_exec_prefix+set}" = set; then
+-  withval="$with_libusb_exec_prefix"
+-  libusb_exec_prefix="$withval"
+-else
+-  libusb_exec_prefix=""
+-fi;
+-
+-    if test x$libusb_exec_prefix != x ; then
+-	libusb_config_args="$libusb_config_args --exec-prefix=$libusb_exec_prefix"
+-	if test x${LIBUSB_CONFIG+set} != xset ; then
+-	    LIBUSB_CONFIG=$libusb_exec_prefix/bin/libusb-config
+-	fi
+-    fi
+-    if test x$libusb_prefix != x ; then
+-	libusb_config_args="$libusb_config_args --prefix=$libusb_prefix"
+-	if test x${LIBUSB_CONFIG+set} != xset ; then
+-	    LIBUSB_CONFIG=$libusb_prefix/bin/libusb-config
+-	fi
+-    fi
+-
+-    # Extract the first word of "libusb-config", so it can be a program name with args.
+-set dummy libusb-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_LIBUSB_CONFIG+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  case $LIBUSB_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_LIBUSB_CONFIG="$LIBUSB_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_LIBUSB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-  test -z "$ac_cv_path_LIBUSB_CONFIG" && ac_cv_path_LIBUSB_CONFIG="no"
+-  ;;
+-esac
+-fi
+-LIBUSB_CONFIG=$ac_cv_path_LIBUSB_CONFIG
+-
+-if test -n "$LIBUSB_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $LIBUSB_CONFIG" >&5
+-echo "${ECHO_T}$LIBUSB_CONFIG" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-    min_libusb_version=0.1.7
+-    echo "$as_me:$LINENO: checking for libusb - version >= $min_libusb_version" >&5
+-echo $ECHO_N "checking for libusb - version >= $min_libusb_version... $ECHO_C" >&6
+-    no_libusb=""
+-    if test "$LIBUSB_CONFIG" = "no" ; then
+-	no_libusb="yes"
+-    else
+-	LIBUSB_CFLAGS=`$LIBUSB_CONFIG $libusb_config_args --cflags`
+-	LIBUSB_LIBS=`$LIBUSB_CONFIG $libusb_config_args --libs`
+-
+-	libusb_major_version=`$LIBUSB_CONFIG $libusb_args --version | \
+-		sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+-	libusb_minor_version=`$LIBUSB_CONFIG $libusb_args --version | \
+-		sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+-	libusb_micro_version=`$LIBUSB_CONFIG $libusb_args --version | \
+-		sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+-	if test "x$enable_libusbtext" = "xyes" ; then
+-	    ac_save_CFLAGS="$CFLAGS"
+-	    ac_save_LIBS="$LIBS"
+-	    CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
+-	    LIBS="$LIBS $LIBUSB_LIBS"
+-      rm -f conf.libusbtest
+-      if test "$cross_compiling" = yes; then
+-  echo $ac_n "cross compiling; assumed OK... $ac_c"
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <usb.h>
+-
+-char*
+-my_strdup (char *str)
+-{
+-  char *new_str;
+-
+-  if (str)
+-    {
+-      new_str = malloc ((strlen (str) + 1) * sizeof(char));
+-      strcpy (new_str, str);
+-    }
+-  else
+-    new_str = NULL;
+-
+-  return new_str;
+-}
+-
+-int main ()
+-{
+-  int major, minor, micro;
+-  char *tmp_version;
+-
+-  system ("touch conf.libusbtest");
+-
+-  /* HP/UX 9 (%@#!) writes to sscanf strings */
+-  tmp_version = my_strdup("$min_libusb_version");
+-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+-     printf("%s, bad version string\n", "$min_libusb_version");
+-     exit(1);
+-   }
+-
+-    if (($libusb_major_version > major) ||
+-        (($libusb_major_version == major) && ($libusb_minor_version > minor)) ||
+-	(($libusb_major_version == major) && ($libusb_minor_version == minor) &&
+-	($libusb_micro_version >= micro)))
+-    {
+-      return 0;
+-    }
+-  else
+-    {
+-      printf("\n*** 'libusb-config --version' returned %d.%d, but the minimum version\n", $libusb_major_version, $libusb_minor_version);
+-      printf("*** of libusb required is %d.%d. If libusb-config is correct, then it is\n", major, minor);
+-      printf("*** best to upgrade to the required version.\n");
+-      printf("*** If libusb-config was wrong, set the environment variable LIBUSB_CONFIG\n");
+-      printf("*** to point to the correct copy of libusb-config, and remove the file\n");
+-      printf("*** config.cache before re-running configure\n");
+-      return 1;
+-    }
+-}
+-
+-
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  :
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-no_libusb=yes
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-       CFLAGS="$ac_save_CFLAGS"
+-       LIBS="$ac_save_LIBS"
+-     fi
+-  fi
+-  if test "x$no_libusb" = x ; then
+-     echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-     :
+-  else
+-     echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-     if test "$LIBUSB_CONFIG" = "no" ; then
+-       echo "*** The libusb-config script installed by libusb could not be found"
+-       echo "*** If libusb was installed in PREFIX, make sure PREFIX/bin is in"
+-       echo "*** your path, or set the LIBUSB_CONFIG environment variable to the"
+-       echo "*** full path to libusb-config."
+-     else
+-       if test -f conf.libusbtest ; then
+-        :
+-       else
+-          echo "*** Could not run libusb test program, checking why..."
+-          CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
+-          LIBS="$LIBS $LIBUSB_LIBS"
+-          cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#include <stdio.h>
+-#include <usb.h>
+-
+-int
+-main ()
+-{
+- return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-   echo "*** The test program compiled, but did not run. This usually means"
+-          echo "*** that the run-time linker is not finding libusb or finding the wrong"
+-          echo "*** version of libusb. If it is not finding libusb, you'll need to set your"
+-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+-          echo "*** is required on your system"
+-	  echo "***"
+-          echo "*** If you have an old version installed, it is best to remove it, although"
+-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- echo "*** The test program failed to compile or link. See the file config.log for the"
+-          echo "*** exact error that occured. This usually means libusb was incorrectly installed"
+-          echo "*** or that you have moved libusb since it was installed. In the latter case, you"
+-          echo "*** may want to edit the libusb-config script: $LIBUSB_CONFIG"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-          CFLAGS="$ac_save_CFLAGS"
+-          LIBS="$ac_save_LIBS"
+-       fi
+-     fi
+-     LIBUSB_CFLAGS=""
+-     LIBUSB_LIBS=""
+-     { { echo "$as_me:$LINENO: error: libusb is required." >&5
+-echo "$as_me: error: libusb is required." >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
+-
+-
+-  rm -f conf.libusbtest
+ 
+ 
+ # Checks for header files.
diff --git a/cad/repsnapper/Makefile b/cad/repsnapper/Makefile
index bdd6bfd79604..ad2f30bfb670 100644
--- a/cad/repsnapper/Makefile
+++ b/cad/repsnapper/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	repsnapper
 DISTVERSION=	2.5a4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 
 MAINTAINER=	martin.dieringer@gmx.de
@@ -13,19 +13,19 @@ LICENSE=	GPLv2 BSD3CLAUSE MIT
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libgtkglextmm-x11-1.2.so:x11-toolkits/gtkglextmm \
+		libpolyclipping.so:graphics/polyclipping \
 		libzip.so:archivers/libzip
-BUILD_DEPENDS+=	clang40:devel/llvm40
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	timschmidt
 
-USES=		compiler:c++11-lib autoreconf gmake libtool perl5 pkgconfig gettext
+USES=		compiler:c++11-lib autoreconf gettext gmake libtool localbase \
+		perl5 pkgconfig
 USE_GNOME=	gtkmm24 intltool libxml++26
 USE_GL=		gl
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 INSTALL_TARGET=	install-strip
 
diff --git a/cad/repsnapper/files/patch-configure.ac b/cad/repsnapper/files/patch-configure.ac
new file mode 100644
index 000000000000..4c8f5f5b225e
--- /dev/null
+++ b/cad/repsnapper/files/patch-configure.ac
@@ -0,0 +1,25 @@
+--- configure.ac.orig	2017-06-02 13:20:16 UTC
++++ configure.ac
+@@ -30,9 +30,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE"
+ case "$host_os" in
+ freebsd*)
+ # Using clang:
+-  CC=clang40
+-  CPP=clang-cpp40
+-  CXX=clang++40
+ # or gcc5:
+ #  CC=gcc5
+ #  CPP=cpp5
+@@ -52,9 +49,12 @@ AC_TYPE_SSIZE_T
+ dnl check for installed clipperlib newer than 5.1.0 (has PolyNode)
+ AC_DEFINE([HAVE_CLIPPERLIB],[0],[Have external clipper])
+ CLIPPER_LIBS="libclipper.la"
++saved_LIBS=$LIBS
++LIBS="-lpolyclipping $LIBS"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <polyclipping/clipper.hpp>], [ClipperLib::PolyNode cnode])],
+     [AC_DEFINE([HAVE_CLIPPERLIB],[1]) CLIPPER_LIBS="-lpolyclipping"],
+     [AC_MSG_WARN([libclipper is not installed. Using internal copy.])])
++LIBS=$saved_LIBS
+ AC_SUBST(CLIPPER_LIBS)
+ 
+ 
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index fc90ef44f0b7..53741c0d3233 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -16,7 +16,6 @@ USE_GNOME=	gnomeprefix libgnomeui
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
-MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install-strip
 
 post-patch:
diff --git a/deskutils/multisync/files/patch-src-libversit-Makefile.am b/deskutils/multisync/files/patch-src-libversit-Makefile.am
new file mode 100644
index 000000000000..0fc39644df14
--- /dev/null
+++ b/deskutils/multisync/files/patch-src-libversit-Makefile.am
@@ -0,0 +1,11 @@
+--- src/libversit/Makefile.am.orig	2004-04-12 04:23:21 UTC
++++ src/libversit/Makefile.am
+@@ -20,7 +20,7 @@ libversit_la_SOURCES = $(VERSIT_SRC)
+ AM_CFLAGS = -D_VCTEST_CONSOLE
+ noinst_PROGRAMS = vctest
+ vctest_SOURCES = vctest.c
+-vctest_LDADD = -L. -lversit
++vctest_LDADD = libversit.la
+ 
+ EXTRA_DIST = README.TXT vcaltest.c vctest.c
+ 
diff --git a/deskutils/pinot/files/patch-Core_Makefile.am b/deskutils/pinot/files/patch-Core_Makefile.am
new file mode 100644
index 000000000000..889e3a2fe408
--- /dev/null
+++ b/deskutils/pinot/files/patch-Core_Makefile.am
@@ -0,0 +1,36 @@
+--- Core/Makefile.am.orig	2016-06-20 18:07:02 UTC
++++ Core/Makefile.am
+@@ -64,7 +64,7 @@ pinot_index_LDADD = \
+ 
+ pinot_index_SOURCES = pinot-index.cpp
+ 
+-pinot_index_DEPENDENCIES = libCore.la
++pinot_index_DEPENDENCIES = libCore.la libThread.la
+ 
+ pinot_search_LDFLAGS = \
+ 	-export-dynamic
+@@ -82,7 +82,7 @@ pinot_search_LDADD = \
+ pinot_search_SOURCES = \
+ 	pinot-search.cpp
+ 
+-pinot_search_DEPENDENCIES = libCore.la
++pinot_search_DEPENDENCIES = libCore.la libThread.la
+ 
+ pinot_dbus_daemon_LDFLAGS = \
+ 	-export-dynamic
+@@ -105,7 +105,7 @@ pinot_dbus_daemon_SOURCES = \
+ 	ServerThreads.cpp \
+ 	pinot-dbus-daemon.cpp
+ 
+-pinot_dbus_daemon_DEPENDENCIES = libCore.la
++pinot_dbus_daemon_DEPENDENCIES = libCore.la libThread.la
+ 
+ pinot_daemon_LDFLAGS = \
+ 	-export-dynamic
+@@ -128,5 +128,5 @@ pinot_daemon_SOURCES = \
+ 	ServerThreads.cpp \
+ 	pinot-dbus-daemon.cpp
+ 
+-pinot_daemon_DEPENDENCIES = libCore.la
++pinot_daemon_DEPENDENCIES = libCore.la libThread.la
+ 
diff --git a/devel/Makefile b/devel/Makefile
index 7fdc60cbf5a7..6da745331819 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -166,7 +166,6 @@
     SUBDIR += autodist
     SUBDIR += autogen
     SUBDIR += automake
-    SUBDIR += automake-wrapper
     SUBDIR += automoc4
     SUBDIR += autotools
     SUBDIR += avalon-framework
diff --git a/devel/automake-wrapper/Makefile b/devel/automake-wrapper/Makefile
deleted file mode 100644
index 24a075255b02..000000000000
--- a/devel/automake-wrapper/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	automake-wrapper
-
-COMMENT=	Wrapper script for GNU automake
-
-MASTERDIR=	${.CURDIR}/../../devel/autoconf-wrapper
-PKGDIR=		${.CURDIR}
-
-TOOL=		AUTOMAKE
-WRAPPED_TOOLS=	aclocal automake
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/automake-wrapper/pkg-descr b/devel/automake-wrapper/pkg-descr
deleted file mode 100644
index a624f236615f..000000000000
--- a/devel/automake-wrapper/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This port installs a wrapper script for automake, with symlinks to the
-unversioned name of each tool included with automake.  This allows the
-correct version to be selected depending on the user's requirements.
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index b587401bfcf9..a5c2ecd0abf2 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	automake
-PORTVERSION=	1.15.1
+PORTVERSION=	1.16.1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
@@ -14,17 +14,15 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 LICENSE_FILE_GFDL=	${WRKSRC}/doc/fdl.texi
 
-BUILD_DEPENDS=	autoconf-2.69:devel/autoconf
-RUN_DEPENDS=	autoconf-2.69:devel/autoconf \
-		automake-wrapper:devel/automake-wrapper
+BUILD_DEPENDS=	autoconf>=2.69:devel/autoconf
+RUN_DEPENDS=	autoconf>=2.69:devel/autoconf
 
-BUILD_VERSION=	1.15
+BUILD_VERSION=	1.16
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
 USES=		cpe makeinfo perl5 tar:xz
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-suffix=-${BUILD_VERSION}
 MAKE_ENV+=	MAKEINFOFLAGS=--no-split
-INFO=		automake
+INFO=		automake automake-history
 CPE_VENDOR=	gnu
 
 .include <bsd.port.mk>
diff --git a/devel/automake/distinfo b/devel/automake/distinfo
index 6c9f4ccc726b..221b767e2529 100644
--- a/devel/automake/distinfo
+++ b/devel/automake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497951299
-SHA256 (automake-1.15.1.tar.xz) = af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf
-SIZE (automake-1.15.1.tar.xz) = 1509496
+TIMESTAMP = 1528387628
+SHA256 (automake-1.16.1.tar.xz) = 5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921
+SIZE (automake-1.16.1.tar.xz) = 1534936
diff --git a/devel/automake/files/patch-Makefile.in b/devel/automake/files/patch-Makefile.in
deleted file mode 100644
index b2deec317f4a..000000000000
--- a/devel/automake/files/patch-Makefile.in
+++ /dev/null
@@ -1,47 +0,0 @@
---- Makefile.in.orig	2017-06-18 17:35:04 UTC
-+++ Makefile.in
-@@ -211,8 +211,7 @@ am__v_texidevnull_ = $(am__v_texidevnull
- am__v_texidevnull_0 = > /dev/null
- am__v_texidevnull_1 = 
- am__dirstamp = $(am__leading_dot)dirstamp
--INFO_DEPS = $(srcdir)/doc/automake.info \
--	$(srcdir)/doc/automake-history.info
-+INFO_DEPS = $(srcdir)/doc/automake.info
- TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/lib
- DVIS = doc/automake.dvi doc/automake-history.dvi
-@@ -697,7 +696,7 @@ aclocal_in = $(srcdir)/bin/aclocal.in
- automake_script = bin/automake
- aclocal_script = bin/aclocal
- AUTOMAKESOURCES = $(automake_in) $(aclocal_in)
--info_TEXINFOS = doc/automake.texi doc/automake-history.texi
-+info_TEXINFOS = doc/automake.texi
- doc_automake_TEXINFOS = doc/fdl.texi
- doc_automake_history_TEXINFOS = doc/fdl.texi
- man1_MANS = \
-@@ -730,7 +729,7 @@ amhello_configury = \
-   missing \
-   src/Makefile.in
- 
--dist_doc_DATA = $(srcdir)/doc/amhello-1.0.tar.gz
-+dist_doc_DATA = 
- setup_autotools_paths = { \
-   $(extend_PATH) \
-     && ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL \
-@@ -866,7 +865,7 @@ dist_automake_ac_DATA = \
-   m4/upc.m4 \
-   m4/vala.m4
- 
--dist_system_ac_DATA = m4/acdir/README
-+dist_system_ac_DATA = 
- automake_internal_acdir = $(automake_acdir)/internal
- dist_automake_internal_ac_DATA = m4/internal/ac-config-macro-dirs.m4
- 
-@@ -3456,7 +3455,6 @@ install-dvi-am: $(DVIS)
- 	done
- install-exec-am: install-binSCRIPTS
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
- install-html: install-html-am
- 
- install-html-am: $(HTMLS)
diff --git a/devel/automake/files/patch-doc__automake.texi b/devel/automake/files/patch-doc__automake.texi
deleted file mode 100644
index fdf7873174e6..000000000000
--- a/devel/automake/files/patch-doc__automake.texi
+++ /dev/null
@@ -1,21 +0,0 @@
---- doc/automake.texi.orig	2017-06-17 01:28:31 UTC
-+++ doc/automake.texi
-@@ -38,17 +38,11 @@ section entitled ``GNU Free Documentatio
- @end quotation
- @end copying
- 
--@dircategory Software development
-+@dircategory Programming & development toolS
- @direntry
- * Automake: (automake).         Making GNU standards-compliant Makefiles.
- @end direntry
- 
--@dircategory Individual utilities
--@direntry
--* aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
--* automake-invocation: (automake)automake Invocation. Generating Makefile.in.
--@end direntry
--
- @titlepage
- @title GNU Automake
- @subtitle For version @value{VERSION}, @value{UPDATED}
diff --git a/devel/automake/pkg-plist b/devel/automake/pkg-plist
index 0537c7b74130..dfa78dbb8064 100644
--- a/devel/automake/pkg-plist
+++ b/devel/automake/pkg-plist
@@ -1,9 +1,12 @@
+bin/aclocal
 bin/aclocal-%%BUILD_VERSION%%
+bin/automake
 bin/automake-%%BUILD_VERSION%%
-man/man1/aclocal-%%BUILD_VERSION%%-%%BUILD_VERSION%%.1.gz
+man/man1/aclocal.1.gz
 man/man1/aclocal-%%BUILD_VERSION%%.1.gz
-man/man1/automake-%%BUILD_VERSION%%-%%BUILD_VERSION%%.1.gz
+man/man1/automake.1.gz
 man/man1/automake-%%BUILD_VERSION%%.1.gz
+share/aclocal/README
 share/aclocal-%%BUILD_VERSION%%/amversion.m4
 share/aclocal-%%BUILD_VERSION%%/ar-lib.m4
 share/aclocal-%%BUILD_VERSION%%/as.m4
@@ -113,4 +116,4 @@ share/automake-%%BUILD_VERSION%%/tap-driver.sh
 share/automake-%%BUILD_VERSION%%/test-driver
 share/automake-%%BUILD_VERSION%%/texinfo.tex
 share/automake-%%BUILD_VERSION%%/ylwrap
-@dir share/aclocal
+%%PORTDOCS%%%%DOCSDIR%%/amhello-1.0.tar.gz
diff --git a/devel/autotools/Makefile b/devel/autotools/Makefile
index 06af96a58e1d..cf1fc3d430ed 100644
--- a/devel/autotools/Makefile
+++ b/devel/autotools/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Autotools meta-port
 
 RUN_DEPENDS=	libtoolize:devel/libtool \
 		autoconf-2.13:devel/autoconf213 \
-		autoconf-2.69:devel/autoconf \
-		automake-1.15:devel/automake
+		autoconf>=2.69:devel/autoconf \
+		automake>=1.15:devel/automake
 
 PLIST_FILES=	share/${PORTNAME}
 NO_BUILD=	yes
diff --git a/devel/git-merge-changelog/Makefile b/devel/git-merge-changelog/Makefile
index 3bfc592b25c4..cad4400b2735 100644
--- a/devel/git-merge-changelog/Makefile
+++ b/devel/git-merge-changelog/Makefile
@@ -13,8 +13,8 @@ MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Git "merge" driver for GNU style ChangeLog files
 
 EXTRACT_DEPENDS=	${GNULIB_DIR}/lib/${PORTNAME}.c:${GNULIB_PORTDIR}	\
-			automake-1.15:devel/automake		\
-			autoconf-2.69:devel/autoconf
+			automake>=1.15:devel/automake		\
+			autoconf>=2.69:devel/autoconf
 
 GNU_CONFIGURE=	yes
 
diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile
index 97938e9c2bc3..5820475e6bc0 100644
--- a/devel/kBuild/Makefile
+++ b/devel/kBuild/Makefile
@@ -28,7 +28,8 @@ KBUILD_VERSION=	0.1.9998
 KBUILD_ARCH=	${MACHINE_ARCH:S/i386/x86/:S/x86_64/amd64/:S/powerpc/ppc32/:C/armv.*/arm/}
 KBUILD_ENV=	AUTORECONF=${AUTORECONF} \
 		AUTOPOINT=true \
-		CFLAGS="-D_WITH_GETLINE -D_WITH_DPRINTF"
+		CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" MAKE="${MAKE_CMD}"
 KBUILD_TARGET=	${OPSYS:tl}
 
 KBUILD_BINS=	kDepIDB kDepObj kDepPre kObjCache kmk kmk_append kmk_ash \
@@ -48,9 +49,7 @@ GCC_DESC=	Build with GCC (should almost always be enabled)
 GCC_USE=	GCC=any
 
 post-patch:
-	for f in ${WRKSRC}/kBuild/tools/*.kmk; do \
-		${REINPLACE_CMD} -e 's|gcc|${CC}|g' $$f ; \
-	done
+	@${REINPLACE_CMD} 's|gcc|${CC}|g' ${WRKSRC}/kBuild/tools/*.kmk
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${KBUILD_ENV} ./kBuild/env.sh --full ${MAKE_CMD} -f bootstrap.gmk
diff --git a/devel/liblouis/files/patch-tools_Makefile.am b/devel/liblouis/files/patch-tools_Makefile.am
new file mode 100644
index 000000000000..8f8e3ff7f782
--- /dev/null
+++ b/devel/liblouis/files/patch-tools_Makefile.am
@@ -0,0 +1,11 @@
+--- tools/Makefile.am.orig	2018-06-04 16:18:47 UTC
++++ tools/Makefile.am
+@@ -14,7 +14,7 @@ lou_compare_CPPFLAGS = $(AM_CPPFLAGS) -w
+ LDADD =							\
+ 	$(top_builddir)/liblouis/liblouis.la		\
+ 	$(top_builddir)/tools/gnulib/libgnutools.la	\
+-	$(top_builddir)/tools/libbrlcheck.la		\
++	libbrlcheck.la					\
+ 	$(LTLIBINTL)
+ 
+ # libbrlcheck is a convenience library that contains functionality to
diff --git a/devel/libsmpp34/Makefile b/devel/libsmpp34/Makefile
index d3bceeff6f6c..ebe3cbbef282 100644
--- a/devel/libsmpp34/Makefile
+++ b/devel/libsmpp34/Makefile
@@ -19,19 +19,14 @@ USES=		autoreconf libtool pathfix
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
-MAKE_JOBS_UNSAFE=yes
-
 post-patch:
-	${REINPLACE_CMD} -e 's|AC_CONFIG_AUX_DIR.*|AC_CONFIG_AUX_DIR([.])|g' \
-		${WRKSRC}/configure.ac
-	${REINPLACE_CMD} -e 's|AM_CONFIG_HEADER.*|AM_CONFIG_HEADER([./config.h])|g' \
-		${WRKSRC}/configure.ac
-	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/smpp34_dumpBuf.c
-	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/smpp34_dumpPdu.c
-	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/smpp34_pack.c
-	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/smpp34_params.c
-	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/smpp34_structs.c
-	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/smpp34_unpack.c
-	${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
+	@${REINPLACE_CMD} 's|malloc.h|stdlib.h|' \
+		${WRKSRC}/src/smpp34_dumpBuf.c \
+		${WRKSRC}/src/smpp34_dumpPdu.c \
+		${WRKSRC}/src/smpp34_pack.c \
+		${WRKSRC}/src/smpp34_params.c \
+		${WRKSRC}/src/smpp34_structs.c \
+		${WRKSRC}/src/smpp34_unpack.c
+	@${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
 
 .include <bsd.port.mk>
diff --git a/devel/libsmpp34/files/patch-binary-Makefile.am b/devel/libsmpp34/files/patch-binary-Makefile.am
new file mode 100644
index 000000000000..7d4b6a42b6d5
--- /dev/null
+++ b/devel/libsmpp34/files/patch-binary-Makefile.am
@@ -0,0 +1,11 @@
+--- binary/Makefile.am.orig	2012-11-07 07:32:31 UTC
++++ binary/Makefile.am
+@@ -5,7 +5,7 @@ include $(top_srcdir)/test_pdu/Makefile.am
+ include $(top_srcdir)/test_apps/Makefile.am
+ include $(top_srcdir)/src/Makefile.am
+ 
+-LDADD = $(top_srcdir)/binary/libsmpp34.la
++LDADD = libsmpp34.la
+ AM_CPPFLAGS = -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS
+ AM_CFLAGS = @CFLAGS@ -Wall -fPIC # -static
+ INCLUDES = -I../src -I..
diff --git a/devel/libsmpp34/files/patch-binary-Makefile.in b/devel/libsmpp34/files/patch-binary-Makefile.in
deleted file mode 100644
index ac6fa5f3b423..000000000000
--- a/devel/libsmpp34/files/patch-binary-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- binary/Makefile.in.orig	2014-07-14 15:29:16.000000000 +0300
-+++ binary/Makefile.in	2014-07-14 15:28:49.000000000 +0300
-@@ -676,6 +676,8 @@ clean-libLTLIBRARIES:
- 	done
- libsmpp34.la: $(libsmpp34_la_OBJECTS) $(libsmpp34_la_DEPENDENCIES) 
- 	$(libsmpp34_la_LINK) -rpath $(libdir) $(libsmpp34_la_OBJECTS) $(libsmpp34_la_LIBADD) $(LIBS)
-+../binary/libsmpp34.la: $(libsmpp34_la_OBJECTS) $(libsmpp34_la_DEPENDENCIES) 
-+	$(libsmpp34_la_LINK) -rpath $(libdir) $(libsmpp34_la_OBJECTS) $(libsmpp34_la_LIBADD) $(LIBS)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile
index 70cd008a25ca..4d622f22491f 100644
--- a/devel/tclreadline/Makefile
+++ b/devel/tclreadline/Makefile
@@ -25,4 +25,7 @@ USE_LDCONFIG=	yes
 TCL_PKG=	${PORTNAME}${PORTVERSION}
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} TCL_PKG=${TCL_PKG}
 
+post-patch:
+	@${RM} ${WRKSRC}/INSTALL
+
 .include <bsd.port.mk>
diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile
index eb12ed0dccff..e3b28a2b8250 100644
--- a/devel/xfce4-dev-tools/Makefile
+++ b/devel/xfce4-dev-tools/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Xfce development tools
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	autoconf-2.69:devel/autoconf \
-		automake-1.15:devel/automake \
+RUN_DEPENDS=	autoconf>=2.69:devel/autoconf \
+		automake>=1.15:devel/automake \
 		libtoolize:devel/libtool \
 		bash:shells/bash
 
diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile
index 8d06a8e1a64b..d1c5d3d46432 100644
--- a/emulators/tme/Makefile
+++ b/emulators/tme/Makefile
@@ -20,6 +20,7 @@ USE_GNOME=	gdkpixbuf2 gtk20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static --disable-warnings
+CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
 MAKE_JOBS_UNSAFE=yes
 INSTALL_TARGET=	install-strip
 
diff --git a/emulators/tme/files/patch-configure.in b/emulators/tme/files/patch-configure.in
index c30979246962..de5ba13bc7a0 100644
--- a/emulators/tme/files/patch-configure.in
+++ b/emulators/tme/files/patch-configure.in
@@ -1,6 +1,14 @@
---- configure.in.orig
+--- configure.in.orig	2010-06-05 19:56:37 UTC
 +++ configure.in
-@@ -599,18 +599,16 @@
+@@ -33,6 +33,7 @@ dnl POSSIBILITY OF SUCH DAMAGE.
+ 
+ dnl Checks that we are given a good source directory.
+ AC_INIT(ic/m68k/m68k-impl.h)
++AC_CONFIG_MACRO_DIR([m4])
+ AC_CANONICAL_SYSTEM
+ AM_INIT_AUTOMAKE(tme, 0.8)
+ 
+@@ -599,18 +600,14 @@ i[3456789]86-* | x86_64-*) misc_hosts="x86" ;;
  esac
  changequote([, ])dnl
  AC_MSG_RESULT([${misc_hosts}])
@@ -11,19 +19,19 @@
  
  dnl Configure for libtool.
 -AC_LIBLTDL_INSTALLABLE
-+LT_CONFIG_LTDL_DIR([libltdl])
-+LT_INIT([dlopen])
-+LTDL_INIT([installable])
- AC_SUBST(INCLTDL)
- AC_SUBST(LIBLTDL)
+-AC_SUBST(INCLTDL)
+-AC_SUBST(LIBLTDL)
 -AC_LIBTOOL_DLOPEN
 -AM_PROG_LIBTOOL
 -AC_SUBST(LTLIBOBJS)
 -AC_CONFIG_SUBDIRS(libltdl)
++LT_CONFIG_LTDL_DIR([libltdl])
++LT_INIT([dlopen])
++LTDL_INIT
  TME_PREOPEN=
  if test $enable_shared = no; then
    TME_PREOPEN='`sort -u $(top_builddir)/tme-preopen.txt`'
-@@ -683,11 +681,8 @@
+@@ -683,11 +680,8 @@ if test "x$gen_tmeconfig_h" = xyes; then
  #define _TMECONFIG_H
  
  TMEEOF
diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile
index 47535aaf42af..a18463acbe9f 100644
--- a/graphics/agg/Makefile
+++ b/graphics/agg/Makefile
@@ -21,11 +21,10 @@ GNU_CONFIGURE=	yes
 USES=		autoreconf gmake libtool pathfix pkgconfig
 USE_XORG=	x11
 USE_SDL=	sdl
-MAKE_ENV=	C="${CC}" AGGCXXFLAGS="${CXXFLAGS}"
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
-MAKE_JOBS_UNSAFE=	yes
 
-CXXFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib -I../include -L./
+post-patch:
+	@${REINPLACE_CMD} 's/_LDFLAGS/_LDADD/' ${WRKSRC}/examples/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/mail/anubis/files/patch-src_Makefile.am b/mail/anubis/files/patch-src_Makefile.am
new file mode 100644
index 000000000000..e516ed9efeb7
--- /dev/null
+++ b/mail/anubis/files/patch-src_Makefile.am
@@ -0,0 +1,23 @@
+--- src/Makefile.am.orig	2014-05-16 04:19:46 UTC
++++ src/Makefile.am
+@@ -25,7 +25,7 @@ bin_PROGRAMS = @ANUBIS_BIN_ADM@
+ EXTRA_PROGRAMS = $(adm_bin_programs) $(adm_sbin_programs)
+ 
+ noinst_LIBRARIES = libanubisdb.a
+-anubis_LDADD = ./libanubisdb.a $(top_builddir)/lib/libanubis.a\
++anubis_LDADD = libanubisdb.a $(top_builddir)/lib/libanubis.a\
+  @LIBINTL@ $(GUILE_LIBS) @LIBGNUTLS_LIBS@ @GSASL_LIBS@ 
+ 
+ anubis_SOURCES = \
+@@ -65,9 +65,9 @@ anubis_SOURCES = \
+  xdatabase.c 
+ 
+ anubisadm_SOURCES = anubisadm.c anubisadm.h adm.c
+-anubisadm_LDADD = ./libanubisdb.a $(top_builddir)/lib/libanubis.a @LIBINTL@
++anubisadm_LDADD = libanubisdb.a $(top_builddir)/lib/libanubis.a @LIBINTL@
+ anubisusr_SOURCES = anubisusr.c anubisusr.h usr.c
+-anubisusr_LDADD = ./libanubisdb.a $(top_builddir)/lib/libanubis.a @LIBINTL@ @LIBGNUTLS_LIBS@ @GSASL_LIBS@ 
++anubisusr_LDADD = libanubisdb.a $(top_builddir)/lib/libanubis.a @LIBINTL@ @LIBGNUTLS_LIBS@ @GSASL_LIBS@ 
+ 
+ if TLS_COND
+  TLS_C=tls.c
diff --git a/math/givaro/Makefile b/math/givaro/Makefile
index 56cea022db12..da9ba5c76584 100644
--- a/math/givaro/Makefile
+++ b/math/givaro/Makefile
@@ -15,7 +15,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libgmp.so:math/gmp
 
-USES=		autoreconf compiler:c++11-lang libtool pathfix pkgconfig
+USES=		autoreconf compiler:c++11-lang gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gmp="${LOCALBASE}"
 USE_LDCONFIG=	yes
diff --git a/net-mgmt/riemann-c-client/Makefile b/net-mgmt/riemann-c-client/Makefile
index 7275470c70c5..aa8e7a7ecb29 100644
--- a/net-mgmt/riemann-c-client/Makefile
+++ b/net-mgmt/riemann-c-client/Makefile
@@ -28,8 +28,6 @@ TEST_TARGET=	check
 USE_GITHUB=	yes
 GH_ACCOUNT=	algernon
 
-MAKE_JOBS_UNSAFE=	yes
-
 post-patch:
 	@${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/Makefile.am
 
diff --git a/net-mgmt/riemann-c-client/files/patch-Makefile.am b/net-mgmt/riemann-c-client/files/patch-Makefile.am
new file mode 100644
index 000000000000..32ae447f119a
--- /dev/null
+++ b/net-mgmt/riemann-c-client/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2017-06-12 19:39:57 UTC
++++ Makefile.am
+@@ -46,7 +46,7 @@ lib_libriemann_client_la_SOURCES= \
+ 	lib/riemann/attribute.c	  \
+ 	lib/riemann/query.c	  \
+ 	lib/riemann/simple.c
+-$(am_lib_libriemann_client_la_OBJECTS): ${proto_files}
++BUILT_SOURCES = lib/riemann/proto/riemann.pb-c.h
+ noinst_HEADERS			= \
+ 	lib/riemann/_private.h	  \
+ 	lib/riemann/client/tcp.h  \
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 06e9b3e18054..8c950129508a 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -13,6 +13,8 @@ COMMENT=	Network monitoring tool with command line and web interfaces
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BROKEN=		Makefiles use hacks that don't work with recent automake.  Try net/ntopng
+
 LIB_DEPENDS=	libgdbm.so:databases/gdbm \
 		libevent.so:devel/libevent
 BUILD_DEPENDS=	rrdtool12>=1.2:databases/rrdtool12 \
diff --git a/textproc/ots/Makefile b/textproc/ots/Makefile
index 4c7f6f3e0d99..7da76d8c386f 100644
--- a/textproc/ots/Makefile
+++ b/textproc/ots/Makefile
@@ -13,6 +13,8 @@ COMMENT=	Open Text Summarizer
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BROKEN=		unfetchable
+
 LIB_DEPENDS=	libpopt.so:devel/popt
 
 USES=		autoreconf gettext libtool pathfix pkgconfig
diff --git a/textproc/randlm/Makefile b/textproc/randlm/Makefile
index 70867b19f480..2cf177d22fba 100644
--- a/textproc/randlm/Makefile
+++ b/textproc/randlm/Makefile
@@ -31,5 +31,9 @@ INSTALL_TARGET=	install-strip
 post-patch:
 	cd ${WRKSRC}/hadoop && ${MV} strings.cpp strings.cc && ${MV} strings.h s.h
 	${REINPLACE_CMD} -e s#strings.h#s.h# ${WRKSRC}/hadoop/r_compute_ngram_counts.cpp ${WRKSRC}/hadoop/m_compute_ngram_counts_batch.cpp
+	@${REINPLACE_CMD} -e 's,-L./,,' -e 's,-lLDHT,libLDHT.la,' \
+		-e 's,-lticpp,libticpp.la,' -e 's,-lRandLM,libRandLM.la,' \
+		${WRKSRC}/src/LDHT/Makefile.am \
+		${WRKSRC}/src/RandLM/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/x11/cinnamon/files/patch-src_Makefile.am b/x11/cinnamon/files/patch-src_Makefile.am
index b3bdb04fb1df..a4d13f941c9e 100644
--- a/x11/cinnamon/files/patch-src_Makefile.am
+++ b/x11/cinnamon/files/patch-src_Makefile.am
@@ -1,6 +1,14 @@
---- src/Makefile.am.orig	2014-04-12 14:28:57.000000000 +0000
-+++ src/Makefile.am	2014-04-24 15:24:43.261840738 +0000
-@@ -267,7 +267,7 @@
+--- src/Makefile.am.orig	2015-01-19 15:45:53 UTC
++++ src/Makefile.am
+@@ -165,7 +165,6 @@ cinnamon_real_SOURCES =		\
+ 	main.c
+ cinnamon_real_CPPFLAGS = $(cinnamon_cflags)
+ cinnamon_real_LDADD = libcinnamon.la libcinnamon-js.la $(libcinnamon_la_LIBADD)
+-cinnamon_real_DEPENDENCIES = libcinnamon.la
+ 
+ ########################################
+ 
+@@ -286,7 +285,7 @@ libcinnamon_la_LIBADD =		\
  libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
  
  Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir