Multiple ports: improve regex compliance (part 2)

This is again a part of the project to stop extraneous escaping of
ordinary characters and redefine some ordinary escapes as special
behavior.

Most of these ports are pushed over to use textproc/gsed because they
want to use GNU extensions.  Others are fixed to either escape appropriately
(e.g. $$ rather than \$ in Makefiles!) or just remove redundant escapes
(e.g. backtick in single quotes doesn't need escaped).

PR:		229925
MFH:		no (invasive risk)

1 files changed, 8 insertions, 1 deletions

diff --git a/french/aster/files/patch-as_setup.py b/french/aster/files/patch-as_setup.py
index 7d349c06c04a..b81531ba8c17 100644
--- a/french/aster/files/patch-as_setup.py
+++ b/french/aster/files/patch-as_setup.py
@@ -17,7 +17,7 @@
        self._print(self._fmt_title % _('Extraction'))
        if kargs.get('external')!=None:
           self._call_external(**kargs)
-@@ -518,6 +521,81 @@ class SETUP:
+@@ -518,6 +521,88 @@ class SETUP:
        if iextr_as:
           self.Clean(to_delete=path)
  
@@ -65,6 +65,13 @@
 +         sys.stdout.write(ligne)
 +      system=SYSTEM({ 'verbose' : True, 'debug' : False },
 +         **{'maxcmdlen' : 2**31, 'log' : self})
++      file2patch = os.path.join(self.workdir, self.content, 'waf.main')
++      self._print('FreeBSD patch: remove extraneous escape => modify waf.main')
++      for ligne in fileinput.input(file2patch, inplace=1):
++         nl = ligne.find("\main$")
++         if nl > 0:
++            ligne =ligne.replace("\main$", "main$")
++         sys.stdout.write(ligne)
 +      for f2p in ('waf', 'waf.main', 'waf_variant', 'waf_std', 'waf_mpi', 'bibpyt/Macro/macr_ecre_calc_ops.py'):
 +         file2patch = os.path.join(self.workdir, self.content, f2p)
 +         self._print('FreeBSD patch: /bin/bash => modify ' + file2patch)