[Groff] [PATCH] '+' isn't a regex metacharacter in sed by default

[Colin Watson]

This is based on an old patch from Fumitoshi UKAI <address@hidden> in
the Debian groff packaging, cleaned up and extended to cover all fonts
by me.
---
 font/devascii/Makefile.sub  | 4 ++--
 font/devcp1047/Makefile.sub | 4 ++--
 font/devhtml/Makefile.sub   | 4 ++--
 font/devlatin1/Makefile.sub | 4 ++--
 font/devutf8/Makefile.sub   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/font/devascii/Makefile.sub b/font/devascii/Makefile.sub
index 43b2b46..0fa2e77 100644
--- a/font/devascii/Makefile.sub
+++ b/font/devascii/Makefile.sub
@@ -12,8 +12,8 @@ $(FONTS): R.proto
        @-rm -f $@
        @(charwidth=`expr $(RES) / $(CPI)` ; \
         sed -e "s/^name [A-Z]*$$/name $@/" \
-            -e "s/^\\([^       ]*\\)   [0-9]+  /\\1    $$charwidth     /" \
-            -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
+            -e "s/^\\([^       ]*\\)   [0-9][0-9]*     /\\1    $$charwidth     
/" \
+            -e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \
             -e "s/^internalname .*$$/internalname $@/" \
             -e "/^internalname/s/BI/3/" \
             -e "/^internalname/s/B/2/" \
diff --git a/font/devcp1047/Makefile.sub b/font/devcp1047/Makefile.sub
index 4c2d1db..5aa6cff 100644
--- a/font/devcp1047/Makefile.sub
+++ b/font/devcp1047/Makefile.sub
@@ -12,8 +12,8 @@ $(FONTS): R.proto
        @-rm -f $@
        @(charwidth=`expr $(RES) / $(CPI)` ; \
         sed -e "s/^name [A-Z]*$$/name $@/" \
-            -e "s/^\\([^       ]*\\)   [0-9]+  /\\1    $$charwidth     /" \
-            -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
+            -e "s/^\\([^       ]*\\)   [0-9][0-9]*     /\\1    $$charwidth     
/" \
+            -e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \
             -e "s/^internalname .*$$/internalname $@/" \
             -e "/^internalname/s/BI/3/" \
             -e "/^internalname/s/B/2/" \
diff --git a/font/devhtml/Makefile.sub b/font/devhtml/Makefile.sub
index c1e5525..36fcf77 100644
--- a/font/devhtml/Makefile.sub
+++ b/font/devhtml/Makefile.sub
@@ -13,8 +13,8 @@ $(FONTS): R.proto
        @-rm -f $@
        @(charwidth=`expr $(RES) / $(CPI)` ; \
         sed -e "s/^name [A-Z]*$$/name $@/" \
-            -e "s/^\\([^       ]*\\)   [0-9]+  /\\1    $$charwidth     /" \
-            -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
+            -e "s/^\\([^       ]*\\)   [0-9][0-9]*     /\\1    $$charwidth     
/" \
+            -e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \
             -e "s/^internalname .*$$/internalname $@/" \
             -e "/^internalname/s/CR/4/" \
             -e "/^internalname/s/BI/3/" \
diff --git a/font/devlatin1/Makefile.sub b/font/devlatin1/Makefile.sub
index 127e02c..b261f57 100644
--- a/font/devlatin1/Makefile.sub
+++ b/font/devlatin1/Makefile.sub
@@ -12,8 +12,8 @@ $(FONTS): R.proto
        @-rm -f $@
        @(charwidth=`expr $(RES) / $(CPI)` ; \
         sed -e "s/^name [A-Z]*$$/name $@/" \
-            -e "s/^\\([^       ]*\\)   [0-9]+  /\\1    $$charwidth     /" \
-            -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
+            -e "s/^\\([^       ]*\\)   [0-9][0-9]*     /\\1    $$charwidth     
/" \
+            -e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \
             -e "s/^internalname .*$$/internalname $@/" \
             -e "/^internalname/s/BI/3/" \
             -e "/^internalname/s/B/2/" \
diff --git a/font/devutf8/Makefile.sub b/font/devutf8/Makefile.sub
index 221bd3f..1047bdc 100644
--- a/font/devutf8/Makefile.sub
+++ b/font/devutf8/Makefile.sub
@@ -12,8 +12,8 @@ $(FONTS): R.proto
        @-rm -f $@
        @(charwidth=`expr $(RES) / $(CPI)` ; \
         sed -e "s/^name [A-Z]*$$/name $@/" \
-            -e "s/^\\([^       ]*\\)   [0-9]+  /\\1    $$charwidth     /" \
-            -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
+            -e "s/^\\([^       ]*\\)   [0-9][0-9]*     /\\1    $$charwidth     
/" \
+            -e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \
             -e "s/^internalname .*$$/internalname $@/" \
             -e "/^internalname/s/BI/3/" \
             -e "/^internalname/s/B/2/" \
-- 
1.8.5.2