Re: git: 131592de52da - main - devel/automake: Update to 1.19

From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Tue, 22 Sep 2026 14:16:56 UTC
Hello!


BTW, while our python framework still not ready for -OO optimisation and leads to rebuild site-packages/_distutils_hack/__pycache__/__init__.cpython-3??.opt-2.pyc every time, may be avoid it at all?

diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 078d642667..6de086de57 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -27,4 +27,8 @@ PLIST_SUB=    BUILD_VERSION=${DISTVERSION:C/(\.[^.]*).*/\1/}

  OPTIONS_DEFINE=        DOCS

+# avoid generating "*.cpython3*.opt-2.pyc" by -OO on byte compiling
+post-patch:
+       @${REINPLACE_CMD} -e '/PYTHON/ s|-OO|-O|' ${WRKSRC}/lib/py-compile
+
  .include <bsd.port.mk>

Only small list of ports will be affected

accessibility/caribou
comms/hamlib
devel/libsearpc
japanese/ibus-anthy
korean/ibus-hangul
mail/fetchmailconf
math/py-spot
net-mgmt/seafile-client
net/pacemaker2
net/py-avahi
print/lyx
science/code_saturne
science/fastjet
science/meep
security/py-privleap
security/py-unicode-show
security/wazuh-manager
www/py-css-html-js-minify
www/py-flatnotes
x11/alacarte
x11/kitty
x11/mate-dock-applet
x11/xcb-proto

If needed, patches for this list are already ready at my buildbox

On 22.09.2026 16:35, Tijl Coosemans wrote:
> The branch main has been updated by tijl:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=131592de52daf5200a55cb9e7cb214668183ac60
> 
> commit 131592de52daf5200a55cb9e7cb214668183ac60
> Author:     Tijl Coosemans <tijl@FreeBSD.org>
> AuthorDate: 2026-09-12 10:58:03 +0000
> Commit:     Tijl Coosemans <tijl@FreeBSD.org>
> CommitDate: 2026-09-22 13:33:28 +0000
> 
>      devel/automake: Update to 1.19
>      
>      net/py-avahi: Run autoreconf instead of copying from a directory
>      with a versioned name.  While here, use SETENVI WRK_ENV to run make
>      with a clean environment.
>      
>      PR:             298435
>      Exp-run by:     antoine
> ---
>   devel/automake/Makefile  |  2 +-
>   devel/automake/distinfo  |  6 +++---
>   devel/automake/pkg-plist |  1 +
>   net/py-avahi/Makefile    | 12 ++++++------
>   4 files changed, 11 insertions(+), 10 deletions(-)
> 
> diff --git a/devel/automake/Makefile b/devel/automake/Makefile
> index 7d93546924e4..078d6426677f 100644
> --- a/devel/automake/Makefile
> +++ b/devel/automake/Makefile
> @@ -1,5 +1,5 @@
>   PORTNAME=	automake
> -DISTVERSION=	1.18.1
> +DISTVERSION=	1.19
>   CATEGORIES=	devel
>   MASTER_SITES=	GNU
>   
> 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
> @@ -24,6 +24,7 @@ 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
> 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
> @@ -7,8 +7,7 @@ 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} \
> @@ -23,7 +22,7 @@ PLIST=		${.CURDIR}/pkg-plist
>   AVAHI_SLAVE=	python
>   
>   USE_GNOME=	pygobject3 gtk30
> -USES=		python
> +USES=		autoreconf python
>   USE_PYTHON=	flavors py3kplist
>   MANPAGES=	avahi-bookmarks.1
>   
> @@ -34,13 +33,14 @@ 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 \

-- 
Sincerely,
Dima (fluffy@FreeBSD.org, https://t.me/FluffyBSD, @fluffy:matrix-dev.freebsd.org)
(desktop, kde, x11, office, ports-secteam)@FreeBSD team