7 files changed, 18 insertions, 96 deletions

diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 8105b2bc7122..db44472b907f 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	automake
-PORTVERSION=	1.16.1
-PORTREVISION=	2
+PORTVERSION=	1.16.2
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
diff --git a/devel/automake/distinfo b/devel/automake/distinfo
index 221b767e2529..d015ad46b9fb 100644
--- a/devel/automake/distinfo
+++ b/devel/automake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1528387628
-SHA256 (automake-1.16.1.tar.xz) = 5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921
-SIZE (automake-1.16.1.tar.xz) = 1534936
+TIMESTAMP = 1586784230
+SHA256 (automake-1.16.2.tar.xz) = ccc459de3d710e066ab9e12d2f119bd164a08c9341ca24ba22c9adaa179eedd0
+SIZE (automake-1.16.2.tar.xz) = 1545912
diff --git a/devel/automake/files/patch-bug31222 b/devel/automake/files/patch-bug31222
deleted file mode 100644
index 6cd576c978a4..000000000000
--- a/devel/automake/files/patch-bug31222
+++ /dev/null
@@ -1,31 +0,0 @@
-From a348d830659fffd2cfc42994524783b07e69b4b5 Mon Sep 17 00:00:00 2001
-From: Mathieu Lirzin <mthl@gnu.org>
-Date: Sun, 8 Jul 2018 23:41:42 +0200
-Subject: [PATCH] python: Don't use '\n' in sed substitution
-
-This change fixes automake bug#31222.
-
-On macOS, 'sed' interprets '\n' in the substitution text as the letter 'n'
-instead of as a newline.
-
-* lib/am/python.am [?FIRST?] (am__pep3147_tweak): Use a space instead of '\n'.
-* NEWS: Update.
----
- NEWS             | 8 ++++++++
- lib/am/python.am | 2 +-
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
---- lib/am/python.am.orig	2018-02-26 20:38:27 UTC
-+++ lib/am/python.am
-@@ -97,7 +97,7 @@ endif %?INSTALL%
- if %?INSTALL%
- 
- ?FIRST?am__pep3147_tweak = \
--?FIRST?  sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|'
-+?FIRST?  sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc &.*.pyo|'
- 
- .PHONY uninstall-am: uninstall-%DIR%PYTHON
- uninstall-%DIR%PYTHON:
--- 
-2.22.0
-
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index fd9754f1174e..b7c1f469ea26 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -25,10 +25,7 @@ UNICODE_DESC=		Normalize tokens to Unicode (UTF-8) (recommended)
 CONFLICTS_INSTALL?=	bogofilter-sqlite-[0-9]* bogofilter-tc-[0-9]* bogofilter-lmdb-[0-9]* \
 			bogofilter-kc-[0-9]*
 
-# XXX FIXME: autoreconf:build should not be required,
-# but something hoses timestamps on src/tests/Makefile.am
-# but not src/tests/Makefile.in.
-USES+=		autoreconf:build cpe perl5 shebangfix tar:xz
+USES+=		cpe perl5 shebangfix tar:xz
 SHEBANG_FILES=	contrib/randomtrain.sh contrib/scramble.sh \
 		src/tests/unsort.pl contrib/*.pl
 USE_PERL5=	run
@@ -61,7 +58,7 @@ INSTALL_TARGET=	install-strip prefix=${PREFIX} mandir=${MANPREFIX}/man
 post-patch:
 	${REINPLACE_CMD} -e 's/INTEGRITY_TESTS = t.lock1 t.lock3 t.valgrind/INTEGRITY_TESTS = t.lock1/' \
 		-e 's/ENVIRON_TESTS = t.abort/ENVIRON_TESTS =/' \
-		${WRKSRC}/src/tests/Makefile.am
+		${WRKSRC}/src/tests/Makefile.in
 
 post-build:
 	cd ${WRKSRC}/src && ${SETENV} SHELL=${SH} ${MAKE_CMD} ${TEST_TARGET} ${_MAKE_JOBS} SHELL=${SH} \
diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index 5f03efe0c911..b3ce72389502 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -86,27 +86,9 @@ WCPSKEY_EXTRA_PATCHES=	${FILESDIR}/wildcard-psk.diff ${FILESDIR}/wildcard-psk-oa
 REQUIREMOD?=	ipsec
 .endif
 
-# Need to be patched for openssl-1.1.1 (default after 1200080)
-.if ${OPSYS} == FreeBSD
-.  if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} != openssl
-BUILD_DEPENDS+=	automake>=0:devel/automake
-.  endif
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e "s/-Werror//g ; s/-R$$libdir/-Wl,-rpath=$$libdir/g" ${WRKSRC}/configure
 
-# Need to be patched for openssl-1.1.1 (default after 1200080)
-.if ${OPSYS} == FreeBSD
-.  if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} != openssl
-post-configure:
-	@${REINPLACE_CMD} -e "s/automake-1.14/automake-1.16/g" ${WRKSRC}/Makefile ${WRKSRC}/*/Makefile \
-				${WRKSRC}/*/*/Makefile
-	@${REINPLACE_CMD} -e "s/aclocal-1.14/aclocal-1.16/g" ${WRKSRC}/Makefile ${WRKSRC}/*/Makefile \
-				${WRKSRC}/*/*/Makefile
-.  endif
-.endif
-
 post-install:
 	@${MKDIR} ${STAGEDIR}/${PREFIX}/etc/racoon
 	@if [ -z `/sbin/sysctl -a | ${GREP} -q ipsec && ${ECHO_CMD} ipsec` ]; then \
@@ -125,7 +107,6 @@ post-install-DOCS-on:
 
 .if ${OPSYS} == FreeBSD
 .  if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} != openssl
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-ipsec-tools
 PLIST_FILES+=	include/racoon/openssl_compat.h
 .  endif
diff --git a/security/ipsec-tools/files/extra-patch-aclocal.m4 b/security/ipsec-tools/files/extra-patch-aclocal.m4
deleted file mode 100644
index 89fe32225ed9..000000000000
--- a/security/ipsec-tools/files/extra-patch-aclocal.m4
+++ /dev/null
@@ -1,24 +0,0 @@
---- aclocal.m4.orig	2018-10-29 00:47:18 UTC
-+++ aclocal.m4
-@@ -8619,10 +8619,10 @@ m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_L
- # generated from the m4 files accompanying Automake X.Y.
- # (This private macro should not be called outside this file.)
- AC_DEFUN([AM_AUTOMAKE_VERSION],
--[am__api_version='1.14'
-+[am__api_version='1.16'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version.  Point them to the right macro.
--m4_if([$1], [1.14.1], [],
-+m4_if([$1], [1.16.1], [],
-       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
- 
-@@ -8638,7 +8638,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.14.1])dnl
-+[AM_AUTOMAKE_VERSION([1.16.1])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/security/ipsec-tools/files/extra-patch-ipsec-tools b/security/ipsec-tools/files/extra-patch-ipsec-tools
index acae53e75edf..718ad0e807ba 100644
--- a/security/ipsec-tools/files/extra-patch-ipsec-tools
+++ b/security/ipsec-tools/files/extra-patch-ipsec-tools
@@ -1,15 +1,15 @@
---- src/racoon/Makefile.am
-+++ src/racoon/Makefile.am
-@@ -4,7 +4,7 @@ sbin_PROGRAMS = racoon racoonctl plainrsa-gen
- noinst_PROGRAMS = eaytest
+--- src/racoon/Makefile.in
++++ src/racoon/Makefile.in
+@@ -571,7 +571,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  include_racoon_HEADERS = racoonctl.h var.h vmbuf.h misc.h gcmalloc.h admin.h \
  	schedule.h sockmisc.h isakmp_var.h isakmp.h isakmp_xauth.h \
 -	isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h
 +	isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h openssl_compat.h
- lib_LTLIBRARIES = libracoon.la
  
- adminsockdir=${localstatedir}/racoon
-@@ -32,7 +32,7 @@ racoon_SOURCES = \
+ lib_LTLIBRARIES = libracoon.la
+ adminsockdir = ${localstatedir}/racoon
+@@ -597,7 +597,7 @@ racoon_SOURCES = \
  	gssapi.c dnssec.c getcertsbyname.c privsep.c \
  	pfkey.c admin.c evt.c ipsec_doi.c oakley.c grabmyaddr.c vendorid.c \
  	policy.c localconf.c remoteconf.c crypto_openssl.c algorithm.c \
@@ -18,22 +18,22 @@
  	plog.c logger.c schedule.c str2val.c \
  	safefile.c backupsa.c genlist.c rsalist.c \
  	cftoken.l cfparse.y prsa_tok.l prsa_par.y 
-@@ -51,12 +51,12 @@ libracoon_la_SOURCES = kmpstat.c vmbuf.c sockmisc.c misc.c
+@@ -617,12 +617,12 @@ racoonctl_LDADD = libracoon.la ../libipsec/libipsec.la
+ libracoon_la_SOURCES = kmpstat.c vmbuf.c sockmisc.c misc.c
  libracoon_la_CFLAGS = -DNOUSE_PRIVSEP $(AM_CFLAGS)
- 
  plainrsa_gen_SOURCES = plainrsa-gen.c plog.c \
 -	crypto_openssl.c logger.c 
 +	crypto_openssl.c logger.c openssl_compat.c
+ 
  EXTRA_plainrsa_gen_SOURCES = $(MISSING_ALGOS)
  plainrsa_gen_LDADD = $(CRYPTOBJS) vmbuf.o misc.o
  plainrsa_gen_DEPENDENCIES = $(CRYPTOBJS) vmbuf.o misc.o
- 
 -eaytest_SOURCES = eaytest.c plog.c logger.c
 +eaytest_SOURCES = eaytest.c plog.c logger.c openssl_compat.c
  EXTRA_eaytest_SOURCES = missing/crypto/sha2/sha2.c
- eaytest_LDADD =	crypto_openssl_test.o vmbuf.o str2val.o misc_noplog.o \
+ eaytest_LDADD = crypto_openssl_test.o vmbuf.o str2val.o misc_noplog.o \
  	$(CRYPTOBJS)
-@@ -75,7 +75,7 @@ noinst_HEADERS = \
+@@ -642,7 +642,7 @@ noinst_HEADERS = \
  	debugrm.h         isakmp.h      misc.h          sainfo.h \
  	dhgroup.h         isakmp_agg.h  netdb_dnssec.h  schedule.h \
  	isakmp_cfg.h      isakmp_xauth.h isakmp_unity.h isakmp_frag.h \