diff options
| author | Colin Watson <cjwatson@debian.org> | 2014-01-02 13:38:30 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2014-01-02 14:07:59 +0000 |
| commit | bd60d043a586f879b2194be3accf4e0fafdff23f (patch) | |
| tree | 276c189658bf6bc73fe799ba4bdbe91957aa094f | |
| parent | d5951b551a3cb8f9cbbf1458489bcbfefd390d83 (diff) | |
| download | groff-git-bd60d043a586f879b2194be3accf4e0fafdff23f.tar.gz | |
'+' isn't a regex metacharacter in sed by default
Based on an old patch from Fumitoshi UKAI <ukai@debian.or.jp>.
* font/devascii/Makefile.sub ($(FONTS)): Convert extended regex
syntax to basic for sed.
* font/devcp1047/Makefile.sub ($(FONTS)): Likewise.
* font/devhtml/Makefile.sub ($(FONTS)): Likewise.
* font/devlatin1/Makefile.sub ($(FONTS)): Likewise.
* font/devutf8/Makefile.sub ($(FONTS)): Likewise.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | font/devascii/Makefile.sub | 4 | ||||
| -rw-r--r-- | font/devcp1047/Makefile.sub | 4 | ||||
| -rw-r--r-- | font/devhtml/Makefile.sub | 4 | ||||
| -rw-r--r-- | font/devlatin1/Makefile.sub | 4 | ||||
| -rw-r--r-- | font/devutf8/Makefile.sub | 4 |
6 files changed, 19 insertions, 10 deletions
@@ -1,3 +1,12 @@ +2014-01-02 Colin Watson <cjwatson@debian.org> + + * font/devascii/Makefile.sub ($(FONTS)): Convert extended regex + syntax to basic for sed. + * font/devcp1047/Makefile.sub ($(FONTS)): Likewise. + * font/devhtml/Makefile.sub ($(FONTS)): Likewise. + * font/devlatin1/Makefile.sub ($(FONTS)): Likewise. + * font/devutf8/Makefile.sub ($(FONTS)): Likewise. + 2013-12-23 Bernd Warken <groff-bernd.warken-72@web.de> groff/src/roff/groff/groff.cpp: add groff option `-G' to the diff --git a/font/devascii/Makefile.sub b/font/devascii/Makefile.sub index 43b2b4677..0fa2e7703 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 4c2d1db15..5aa6cffe9 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 c1e5525b0..36fcf77f1 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 127e02cda..b261f574e 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 221bd3f29..1047bdc2f 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/" \ |