diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2019-07-18 18:49:33 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2019-07-18 18:49:33 +0000 |
| commit | ae7aa10487f856f4c2e2e8efdf007bf77421dba5 (patch) | |
| tree | d6d65983d8e9d14ba65877948fb95bba6660b422 /devel/automake | |
| parent | ce6433b2893a07c8c21c8f3f9a1c21295d29c674 (diff) | |
| download | ports-ae7aa10487f856f4c2e2e8efdf007bf77421dba5.tar.gz ports-ae7aa10487f856f4c2e2e8efdf007bf77421dba5.zip | |
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>
Notes
Notes:
svn path=/head/; revision=506870
Diffstat (limited to 'devel/automake')
| -rw-r--r-- | devel/automake/Makefile | 2 | ||||
| -rw-r--r-- | devel/automake/files/patch-bug31222 | 31 |
2 files changed, 32 insertions, 1 deletions
diff --git a/devel/automake/Makefile b/devel/automake/Makefile index f9095413d156..8105b2bc7122 100644 --- a/devel/automake/Makefile +++ b/devel/automake/Makefile @@ -3,7 +3,7 @@ PORTNAME= automake PORTVERSION= 1.16.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= GNU diff --git a/devel/automake/files/patch-bug31222 b/devel/automake/files/patch-bug31222 new file mode 100644 index 000000000000..6cd576c978a4 --- /dev/null +++ b/devel/automake/files/patch-bug31222 @@ -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 + |