diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 7d93546924e4..078d6426677f 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	automake
-DISTVERSION=	1.18.1
+DISTVERSION=	1.19
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	GNU Standards-compliant Makefile generator
 WWW=		https://www.gnu.org/software/automake/
 
 LICENSE=	GPLv2+ GFDL
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 LICENSE_FILE_GFDL=	${WRKSRC}/doc/fdl.texi
 
 BUILD_DEPENDS=	autoconf>=2.72:devel/autoconf
 RUN_DEPENDS=	autoconf>=2.72:devel/autoconf
 
 USES=		cpe perl5 tar:xz
 CPE_VENDOR=	gnu
 
 GNU_CONFIGURE=	yes
 
 NO_ARCH=	yes
 
 INFO=		automake automake-history
 PLIST_SUB=	BUILD_VERSION=${DISTVERSION:C/(\.[^.]*).*/\1/}
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/devel/automake/distinfo b/devel/automake/distinfo
index 37243399ae7f..fe8ac4a545b5 100644
--- a/devel/automake/distinfo
+++ b/devel/automake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1764352805
-SHA256 (automake-1.18.1.tar.xz) = 168aa363278351b89af56684448f525a5bce5079d0b6842bd910fdd3f1646887
-SIZE (automake-1.18.1.tar.xz) = 1652392
+TIMESTAMP = 1789210538
+SHA256 (automake-1.19.tar.xz) = e3e2c2e3abf37898138db5b6c1d1dc35c9160c5978be7947d2c741705251d445
+SIZE (automake-1.19.tar.xz) = 1682600
diff --git a/devel/automake/pkg-plist b/devel/automake/pkg-plist
index 0f09e279e3dc..dc81608705c3 100644
--- a/devel/automake/pkg-plist
+++ b/devel/automake/pkg-plist
@@ -1,121 +1,122 @@
 bin/aclocal
 bin/aclocal-%%BUILD_VERSION%%
 bin/automake
 bin/automake-%%BUILD_VERSION%%
 share/aclocal-%%BUILD_VERSION%%/amversion.m4
 share/aclocal-%%BUILD_VERSION%%/ar-lib.m4
 share/aclocal-%%BUILD_VERSION%%/as.m4
 share/aclocal-%%BUILD_VERSION%%/auxdir.m4
 share/aclocal-%%BUILD_VERSION%%/cond-if.m4
 share/aclocal-%%BUILD_VERSION%%/cond.m4
 share/aclocal-%%BUILD_VERSION%%/depend.m4
 share/aclocal-%%BUILD_VERSION%%/depout.m4
 share/aclocal-%%BUILD_VERSION%%/dmalloc.m4
 share/aclocal-%%BUILD_VERSION%%/extra-recurs.m4
 share/aclocal-%%BUILD_VERSION%%/gcj.m4
 share/aclocal-%%BUILD_VERSION%%/init.m4
 share/aclocal-%%BUILD_VERSION%%/install-sh.m4
 share/aclocal-%%BUILD_VERSION%%/internal/ac-config-macro-dirs.m4
 share/aclocal-%%BUILD_VERSION%%/lead-dot.m4
 share/aclocal-%%BUILD_VERSION%%/lex.m4
 share/aclocal-%%BUILD_VERSION%%/lispdir.m4
 share/aclocal-%%BUILD_VERSION%%/maintainer.m4
 share/aclocal-%%BUILD_VERSION%%/make.m4
 share/aclocal-%%BUILD_VERSION%%/missing.m4
 share/aclocal-%%BUILD_VERSION%%/mkdirp.m4
 share/aclocal-%%BUILD_VERSION%%/obsolete.m4
+share/aclocal-%%BUILD_VERSION%%/optional.m4
 share/aclocal-%%BUILD_VERSION%%/options.m4
 share/aclocal-%%BUILD_VERSION%%/prog-cc-c-o.m4
 share/aclocal-%%BUILD_VERSION%%/python.m4
 share/aclocal-%%BUILD_VERSION%%/rmf.m4
 share/aclocal-%%BUILD_VERSION%%/runlog.m4
 share/aclocal-%%BUILD_VERSION%%/sanity.m4
 share/aclocal-%%BUILD_VERSION%%/silent.m4
 share/aclocal-%%BUILD_VERSION%%/strip.m4
 share/aclocal-%%BUILD_VERSION%%/substnot.m4
 share/aclocal-%%BUILD_VERSION%%/tar.m4
 share/aclocal-%%BUILD_VERSION%%/upc.m4
 share/aclocal-%%BUILD_VERSION%%/vala.m4
 share/aclocal-%%BUILD_VERSION%%/xargsn.m4
 share/aclocal/README
 share/automake-%%BUILD_VERSION%%/Automake/ChannelDefs.pm
 share/automake-%%BUILD_VERSION%%/Automake/Channels.pm
 share/automake-%%BUILD_VERSION%%/Automake/Condition.pm
 share/automake-%%BUILD_VERSION%%/Automake/Config.pm
 share/automake-%%BUILD_VERSION%%/Automake/Configure_ac.pm
 share/automake-%%BUILD_VERSION%%/Automake/DisjConditions.pm
 share/automake-%%BUILD_VERSION%%/Automake/FileUtils.pm
 share/automake-%%BUILD_VERSION%%/Automake/General.pm
 share/automake-%%BUILD_VERSION%%/Automake/Getopt.pm
 share/automake-%%BUILD_VERSION%%/Automake/Item.pm
 share/automake-%%BUILD_VERSION%%/Automake/ItemDef.pm
 share/automake-%%BUILD_VERSION%%/Automake/Language.pm
 share/automake-%%BUILD_VERSION%%/Automake/Location.pm
 share/automake-%%BUILD_VERSION%%/Automake/Options.pm
 share/automake-%%BUILD_VERSION%%/Automake/Rule.pm
 share/automake-%%BUILD_VERSION%%/Automake/RuleDef.pm
 share/automake-%%BUILD_VERSION%%/Automake/VarDef.pm
 share/automake-%%BUILD_VERSION%%/Automake/Variable.pm
 share/automake-%%BUILD_VERSION%%/Automake/Version.pm
 share/automake-%%BUILD_VERSION%%/Automake/Wrap.pm
 share/automake-%%BUILD_VERSION%%/Automake/XFile.pm
 share/automake-%%BUILD_VERSION%%/COPYING
 share/automake-%%BUILD_VERSION%%/INSTALL
 share/automake-%%BUILD_VERSION%%/am/check.am
 share/automake-%%BUILD_VERSION%%/am/check2.am
 share/automake-%%BUILD_VERSION%%/am/clean-hdr.am
 share/automake-%%BUILD_VERSION%%/am/clean.am
 share/automake-%%BUILD_VERSION%%/am/compile.am
 share/automake-%%BUILD_VERSION%%/am/configure.am
 share/automake-%%BUILD_VERSION%%/am/data.am
 share/automake-%%BUILD_VERSION%%/am/dejagnu.am
 share/automake-%%BUILD_VERSION%%/am/depend.am
 share/automake-%%BUILD_VERSION%%/am/depend2.am
 share/automake-%%BUILD_VERSION%%/am/distdir.am
 share/automake-%%BUILD_VERSION%%/am/footer.am
 share/automake-%%BUILD_VERSION%%/am/header-vars.am
 share/automake-%%BUILD_VERSION%%/am/header.am
 share/automake-%%BUILD_VERSION%%/am/inst-vars.am
 share/automake-%%BUILD_VERSION%%/am/install.am
 share/automake-%%BUILD_VERSION%%/am/java.am
 share/automake-%%BUILD_VERSION%%/am/lang-compile.am
 share/automake-%%BUILD_VERSION%%/am/lex.am
 share/automake-%%BUILD_VERSION%%/am/library.am
 share/automake-%%BUILD_VERSION%%/am/libs.am
 share/automake-%%BUILD_VERSION%%/am/libtool.am
 share/automake-%%BUILD_VERSION%%/am/lisp.am
 share/automake-%%BUILD_VERSION%%/am/ltlib.am
 share/automake-%%BUILD_VERSION%%/am/ltlibrary.am
 share/automake-%%BUILD_VERSION%%/am/mans-vars.am
 share/automake-%%BUILD_VERSION%%/am/mans.am
 share/automake-%%BUILD_VERSION%%/am/program.am
 share/automake-%%BUILD_VERSION%%/am/progs.am
 share/automake-%%BUILD_VERSION%%/am/python.am
 share/automake-%%BUILD_VERSION%%/am/remake-hdr.am
 share/automake-%%BUILD_VERSION%%/am/scripts.am
 share/automake-%%BUILD_VERSION%%/am/subdirs.am
 share/automake-%%BUILD_VERSION%%/am/tags.am
 share/automake-%%BUILD_VERSION%%/am/texi-vers.am
 share/automake-%%BUILD_VERSION%%/am/texibuild.am
 share/automake-%%BUILD_VERSION%%/am/texinfos.am
 share/automake-%%BUILD_VERSION%%/am/vala.am
 share/automake-%%BUILD_VERSION%%/am/yacc.am
 share/automake-%%BUILD_VERSION%%/ar-lib
 share/automake-%%BUILD_VERSION%%/compile
 share/automake-%%BUILD_VERSION%%/config.guess
 share/automake-%%BUILD_VERSION%%/config.sub
 share/automake-%%BUILD_VERSION%%/depcomp
 share/automake-%%BUILD_VERSION%%/install-sh
 share/automake-%%BUILD_VERSION%%/mdate-sh
 share/automake-%%BUILD_VERSION%%/missing
 share/automake-%%BUILD_VERSION%%/mkinstalldirs
 share/automake-%%BUILD_VERSION%%/py-compile
 share/automake-%%BUILD_VERSION%%/tap-driver.sh
 share/automake-%%BUILD_VERSION%%/test-driver
 share/automake-%%BUILD_VERSION%%/texinfo.tex
 share/automake-%%BUILD_VERSION%%/ylwrap
 %%PORTDOCS%%%%DOCSDIR%%/amhello-1.0.tar.gz
 share/man/man1/aclocal-%%BUILD_VERSION%%.1.gz
 share/man/man1/aclocal.1.gz
 share/man/man1/automake-%%BUILD_VERSION%%.1.gz
 share/man/man1/automake.1.gz
diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index ad66a082435b..a860161c5b05 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -1,51 +1,51 @@
 PORTREVISION=	5	# don't delete, reset to 0
 CATEGORIES=	net gnome python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	# empty
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python interface to the Avahi mDNS system
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR} \
-		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR} \
-		${LOCALBASE}/share/automake-1.18/py-compile:devel/automake
+		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR}
 LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR} \
 		avahi-gtk3>=0.7:net/avahi-gtk3
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-python
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
 AVAHI_SLAVE=	python
 
 USE_GNOME=	pygobject3 gtk30
-USES=		python
+USES=		autoreconf python
 USE_PYTHON=	flavors py3kplist
 MANPAGES=	avahi-bookmarks.1
 
 NO_ARCH=	yes
 
 # See https://github.com/lathiat/avahi/issues/277
 post-extract:
 	${CP} ${FILESDIR}/build-db ${WRKSRC}/service-type-database
 
 do-build:
-	${CP} ${LOCALBASE}/share/automake-1.18/py-compile ${WRKSRC}/
 	@${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}
 	@${DO_MAKE_BUILD} -C ${WRKSRC}/service-type-database
 
 do-install:
-	@(cd ${BUILD_WRKSRC}; ${MAKE_CMD} ${MAKE_ARGS} install-strip)
-	@(cd ${WRKSRC}/service-type-database; ${MAKE_CMD} ${MAKE_ARGS} install)
+	@(cd ${BUILD_WRKSRC} && ${SETENVI} ${WRK_ENV} \
+		${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-strip)
+	@(cd ${WRKSRC}/service-type-database && ${SETENVI} ${WRK_ENV} \
+		${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install)
 
 post-install:
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
 
 .include "${MASTERDIR}/Makefile"