Date: Thu, 18 Jul 2019 18:49:34 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506870 - in head/devel/automake: . files Message-ID: <201907181849.x6IInYmi026290@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Thu Jul 18 18:49:33 2019 New Revision: 506870 URL: https://svnweb.freebsd.org/changeset/ports/506870 Log: Add patch with upstream commit a348d830659fffd2cfc42994524783b07e69b4b5: Don't use '\n' in sed substitution. FreeBSD sed interprets it as a regular 'n', not as a newline. PR: 239285 Submitted by: Ting-Wei Lan <lantw44@gmail.com> Added: head/devel/automake/files/patch-bug31222 (contents, props changed) Modified: head/devel/automake/Makefile Modified: head/devel/automake/Makefile ============================================================================== --- head/devel/automake/Makefile Thu Jul 18 18:12:22 2019 (r506869) +++ head/devel/automake/Makefile Thu Jul 18 18:49:33 2019 (r506870) @@ -3,7 +3,7 @@ PORTNAME= automake PORTVERSION= 1.16.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= GNU Added: head/devel/automake/files/patch-bug31222 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/automake/files/patch-bug31222 Thu Jul 18 18:49:33 2019 (r506870) @@ -0,0 +1,31 @@ +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 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907181849.x6IInYmi026290>