diff --git a/a2ps-4.14-automake.patch b/a2ps-4.14-automake.patch index cf39849..c334c1f 100644 --- a/a2ps-4.14-automake.patch +++ b/a2ps-4.14-automake.patch @@ -1,10 +1,25 @@ --- - Makefile.in | 2 -- - contrib/Makefile.in | 22 ---------------------- - 2 files changed, 24 deletions(-) + Makefile.in | 8 +------- + afm/Makefile.in | 7 ------- + auxdir/Makefile.in | 8 -------- + contrib/Makefile.in | 29 ----------------------------- + doc/Makefile.in | 8 -------- + encoding/Makefile.in | 8 -------- + etc/Makefile.in | 7 ------- + fonts/Makefile.in | 8 -------- + lib/Makefile.in | 7 ------- + m4/Makefile.in | 8 -------- + man/Makefile.in | 8 -------- + ogonkify/Makefile.in | 5 ----- + ppd/Makefile.in | 8 -------- + ps/Makefile.in | 8 -------- + sheets/Makefile.in | 8 -------- + src/Makefile.in | 7 ------- + tests/Makefile.in | 7 ------- + 17 files changed, 1 insertion(+), 148 deletions(-) --- Makefile.in -+++ Makefile.in 2015-03-03 12:08:59.000000000 +0000 ++++ Makefile.in 2018-10-17 06:37:24.654213544 +0000 @@ -286,8 +286,6 @@ all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -14,9 +29,60 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ +@@ -305,16 +303,12 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ +- echo ' $(SHELL) ./config.status'; \ +- $(SHELL) ./config.status;; \ ++ ;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- $(SHELL) ./config.status --recheck +- + $(top_srcdir)/configure: $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) + $(ACLOCAL_M4): $(am__aclocal_m4_deps) +--- afm/Makefile.in ++++ afm/Makefile.in 2018-10-17 06:28:39.571865589 +0000 +@@ -342,13 +342,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-afmSCRIPTS: $(afm_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(afmdir)" || $(mkdir_p) "$(DESTDIR)$(afmdir)" +--- auxdir/Makefile.in ++++ auxdir/Makefile.in 2018-10-17 06:28:53.627607366 +0000 +@@ -280,14 +280,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- + mostlyclean-libtool: + -rm -f *.lo + --- contrib/Makefile.in -+++ contrib/Makefile.in 2015-03-03 13:03:12.306018770 +0000 -@@ -320,28 +320,6 @@ all: all-recursive ++++ contrib/Makefile.in 2018-10-17 06:15:59.153857421 +0000 +@@ -320,35 +320,6 @@ all: all-recursive .SUFFIXES: .SUFFIXES: .m4 .in .c .l .lo .o .obj @@ -42,6 +108,234 @@ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + card: $(top_builddir)/config.status $(srcdir)/card.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + fixps: $(top_builddir)/config.status $(srcdir)/fixps.in +--- doc/Makefile.in ++++ doc/Makefile.in 2018-10-17 06:29:27.606983082 +0000 +@@ -308,14 +308,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- + mostlyclean-libtool: + -rm -f *.lo + +--- encoding/Makefile.in ++++ encoding/Makefile.in 2018-10-17 06:29:36.290823531 +0000 +@@ -300,14 +300,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- + mostlyclean-libtool: + -rm -f *.lo + +--- etc/Makefile.in ++++ etc/Makefile.in 2018-10-17 06:29:48.894591952 +0000 +@@ -292,13 +292,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + a2ps_cfg: $(top_builddir)/config.status $(srcdir)/a2ps_cfg.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + a2ps-site.cfg: $(top_builddir)/config.status $(srcdir)/a2ps-site.cfg.in +--- fonts/Makefile.in ++++ fonts/Makefile.in 2018-10-17 06:30:01.506360220 +0000 +@@ -318,14 +318,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- + mostlyclean-libtool: + -rm -f *.lo + +--- lib/Makefile.in ++++ lib/Makefile.in 2018-10-17 06:30:10.074202787 +0000 +@@ -406,13 +406,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" +--- m4/Makefile.in ++++ m4/Makefile.in 2018-10-17 06:30:17.426067696 +0000 +@@ -308,14 +308,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- + mostlyclean-libtool: + -rm -f *.lo + +--- man/Makefile.in ++++ man/Makefile.in 2018-10-17 06:30:24.965929147 +0000 +@@ -287,14 +287,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- + mostlyclean-libtool: + -rm -f *.lo + +--- ogonkify/Makefile.in ++++ ogonkify/Makefile.in 2018-10-17 06:16:20.769458703 +0000 +@@ -243,8 +243,6 @@ all: all-recursive + + .SUFFIXES: + .SUFFIXES: .enc .ps .pfa .afm +-am--refresh: +- @: + $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -269,9 +267,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- $(SHELL) ./config.status --recheck +- + $(top_srcdir)/configure: $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) + $(ACLOCAL_M4): $(am__aclocal_m4_deps) +--- ppd/Makefile.in ++++ ppd/Makefile.in 2018-10-17 06:30:31.665806033 +0000 +@@ -320,14 +320,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- + mostlyclean-libtool: + -rm -f *.lo + +--- ps/Makefile.in ++++ ps/Makefile.in 2018-10-17 06:30:38.553679461 +0000 +@@ -294,14 +294,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- + mostlyclean-libtool: + -rm -f *.lo + +--- sheets/Makefile.in ++++ sheets/Makefile.in 2018-10-17 06:30:44.737565824 +0000 +@@ -316,14 +316,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- + mostlyclean-libtool: + -rm -f *.lo + +--- src/Makefile.in ++++ src/Makefile.in 2018-10-17 06:30:51.489441747 +0000 +@@ -334,13 +334,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" +--- tests/Makefile.in ++++ tests/Makefile.in 2018-10-17 06:31:04.941194545 +0000 +@@ -314,13 +314,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + defs: $(top_builddir)/config.status $(srcdir)/defs.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ diff --git a/a2ps-4.14.diff b/a2ps-4.14.diff index 27b2974..5d999d5 100644 --- a/a2ps-4.14.diff +++ b/a2ps-4.14.diff @@ -22,7 +22,7 @@ lib/jobs.c | 10 +++++++++- lib/metaseq.c | 2 +- lib/options.c | 23 ++++++++++++++++++++++- - lib/path-concat.c | 7 +++---- + lib/path-concat.c | 9 ++++----- lib/xstrrpl.c | 1 + man/a2ps.x | 2 +- man/card.x | 2 +- @@ -45,10 +45,10 @@ ogonkify/ptmr-o.afm | 3 ++- ogonkify/ptmri-o.afm | 3 ++- src/main.c | 14 +++++++++++++- - 46 files changed, 195 insertions(+), 50 deletions(-) + 46 files changed, 196 insertions(+), 51 deletions(-) --- afm/fontsmap -+++ afm/fontsmap 2017-05-29 10:31:00.730583938 +0000 ++++ afm/fontsmap 2018-10-17 06:43:16.495744482 +0000 @@ -47,6 +47,14 @@ Bookman-Demi pbkd Bookman-DemiItalic pbkdi Bookman-Light pbkl @@ -122,7 +122,7 @@ ZapfChancery-MediumItalic pzcmi ZapfDingbats pzdr --- afm/pcrb.afm -+++ afm/pcrb.afm 2017-05-29 10:31:00.730583938 +0000 ++++ afm/pcrb.afm 2018-10-17 06:43:16.495744482 +0000 @@ -21,7 +21,7 @@ Ascender 629 Descender -157 StdHW 84 @@ -141,7 +141,7 @@ C -1 ; WX 600 ; N Lcommaaccent ; B 39 -250 578 562 ; C -1 ; WX 600 ; N Atilde ; B -9 0 609 759 ; --- afm/pcrbo.afm -+++ afm/pcrbo.afm 2017-05-29 10:31:00.734583863 +0000 ++++ afm/pcrbo.afm 2018-10-17 06:43:16.495744482 +0000 @@ -21,7 +21,7 @@ Ascender 629 Descender -157 StdHW 84 @@ -160,7 +160,7 @@ C -1 ; WX 600 ; N Lcommaaccent ; B 39 -250 636 562 ; C -1 ; WX 600 ; N Atilde ; B -9 0 669 759 ; --- afm/pcrr.afm -+++ afm/pcrr.afm 2017-05-29 10:31:00.734583863 +0000 ++++ afm/pcrr.afm 2018-10-17 06:43:16.495744482 +0000 @@ -21,7 +21,7 @@ Ascender 629 Descender -157 StdHW 51 @@ -179,7 +179,7 @@ C -1 ; WX 600 ; N Lcommaaccent ; B 47 -250 554 562 ; C -1 ; WX 600 ; N Atilde ; B 3 0 597 729 ; --- afm/pcrro.afm -+++ afm/pcrro.afm 2017-05-29 10:31:00.738583789 +0000 ++++ afm/pcrro.afm 2018-10-17 06:43:16.495744482 +0000 @@ -21,7 +21,7 @@ Ascender 629 Descender -157 StdHW 51 @@ -198,7 +198,7 @@ C -1 ; WX 600 ; N Lcommaaccent ; B 47 -250 607 562 ; C -1 ; WX 600 ; N Atilde ; B 3 0 655 729 ; --- afm/phvb.afm -+++ afm/phvb.afm 2017-05-29 10:31:00.750583563 +0000 ++++ afm/phvb.afm 2018-10-17 06:43:16.495744482 +0000 @@ -21,7 +21,7 @@ Ascender 718 Descender -207 StdHW 118 @@ -217,7 +217,7 @@ C -1 ; WX 611 ; N Lcommaaccent ; B 76 -228 583 718 ; C -1 ; WX 722 ; N Atilde ; B 20 0 702 923 ; --- afm/phvbo.afm -+++ afm/phvbo.afm 2017-05-29 10:31:00.762583338 +0000 ++++ afm/phvbo.afm 2018-10-17 06:43:16.495744482 +0000 @@ -21,7 +21,7 @@ Ascender 718 Descender -207 StdHW 118 @@ -236,7 +236,7 @@ C -1 ; WX 611 ; N Lcommaaccent ; B 76 -228 611 718 ; C -1 ; WX 722 ; N Atilde ; B 20 0 741 923 ; --- afm/phvr.afm -+++ afm/phvr.afm 2017-05-29 10:31:00.774583114 +0000 ++++ afm/phvr.afm 2018-10-17 06:43:16.499744407 +0000 @@ -21,7 +21,7 @@ Ascender 718 Descender -207 StdHW 76 @@ -255,7 +255,7 @@ C -1 ; WX 556 ; N Lcommaaccent ; B 76 -225 537 718 ; C -1 ; WX 667 ; N Atilde ; B 14 0 654 917 ; --- afm/phvro.afm -+++ afm/phvro.afm 2017-05-29 10:31:00.790582814 +0000 ++++ afm/phvro.afm 2018-10-17 06:43:16.499744407 +0000 @@ -21,7 +21,7 @@ Ascender 718 Descender -207 StdHW 76 @@ -274,7 +274,7 @@ C -1 ; WX 556 ; N Lcommaaccent ; B 76 -225 555 718 ; C -1 ; WX 667 ; N Atilde ; B 14 0 699 917 ; --- afm/ptmb.afm -+++ afm/ptmb.afm 2017-05-29 10:31:00.798582663 +0000 ++++ afm/ptmb.afm 2018-10-17 06:43:16.499744407 +0000 @@ -21,7 +21,7 @@ Ascender 683 Descender -217 StdHW 44 @@ -293,7 +293,7 @@ C -1 ; WX 667 ; N Lcommaaccent ; B 19 -218 638 676 ; C -1 ; WX 722 ; N Atilde ; B 9 0 689 884 ; --- afm/ptmbi.afm -+++ afm/ptmbi.afm 2017-05-29 10:31:00.810582439 +0000 ++++ afm/ptmbi.afm 2018-10-17 06:43:16.499744407 +0000 @@ -21,7 +21,7 @@ Ascender 683 Descender -217 StdHW 42 @@ -312,7 +312,7 @@ C -1 ; WX 611 ; N Lcommaaccent ; B -22 -218 590 669 ; C -1 ; WX 667 ; N Atilde ; B -67 0 593 862 ; --- afm/ptmi.afm -+++ afm/ptmi.afm 2017-05-29 10:31:00.822582213 +0000 ++++ afm/ptmi.afm 2018-10-17 06:43:16.499744407 +0000 @@ -21,7 +21,7 @@ Ascender 683 Descender -217 StdHW 32 @@ -331,7 +331,7 @@ C -1 ; WX 556 ; N Lcommaaccent ; B -8 -217 559 653 ; C -1 ; WX 611 ; N Atilde ; B -51 0 566 836 ; --- afm/ptmr.afm -+++ afm/ptmr.afm 2017-05-29 10:31:00.830582063 +0000 ++++ afm/ptmr.afm 2018-10-17 06:43:16.499744407 +0000 @@ -21,7 +21,7 @@ Ascender 683 Descender -217 StdHW 28 @@ -350,7 +350,7 @@ C -1 ; WX 611 ; N Lcommaaccent ; B 12 -218 598 662 ; C -1 ; WX 722 ; N Atilde ; B 15 0 706 850 ; --- configure.in -+++ configure.in 2017-05-29 10:31:00.850581688 +0000 ++++ configure.in 2018-10-17 06:43:16.499744407 +0000 @@ -207,8 +207,9 @@ AC_MSG_CHECKING(for PostScript fonts pat # Try to find some PostScript fonts. # Find out if ghostscript is installed @@ -364,7 +364,7 @@ if test "cd $ac_dir 2>/dev/null && echo *.afm"; then ac_psfont_path="$ac_psfont_path:$ac_dir"; --- configure -+++ configure 2017-05-29 10:31:00.998578914 +0000 ++++ configure 2018-10-17 06:43:16.503744334 +0000 @@ -30759,8 +30759,9 @@ echo $ECHO_N "checking for PostScript fo # Try to find some PostScript fonts. # Find out if ghostscript is installed @@ -378,7 +378,7 @@ if test "cd $ac_dir 2>/dev/null && echo *.afm"; then ac_psfont_path="$ac_psfont_path:$ac_dir"; --- contrib/emacs/a2ps.el -+++ contrib/emacs/a2ps.el 2017-05-29 10:30:59.934598860 +0000 ++++ contrib/emacs/a2ps.el 2018-10-17 06:43:16.503744334 +0000 @@ -44,7 +44,7 @@ ;; a2ps-compile-regexp @@ -389,7 +389,7 @@ ;;thank god for make-regexp.el! (defvar a2ps-font-lock-keywords --- doc/Makefile.in -+++ doc/Makefile.in 2017-05-29 10:31:01.002578839 +0000 ++++ doc/Makefile.in 2018-10-17 06:43:16.503744334 +0000 @@ -146,7 +146,7 @@ GNU_PACKAGE = @GNU_PACKAGE@ GPERF = @GPERF@ GREP = @GREP@ @@ -400,7 +400,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ --- encoding/encoding.map -+++ encoding/encoding.map 2017-05-29 10:31:00.378590536 +0000 ++++ encoding/encoding.map 2018-10-17 06:43:16.503744334 +0000 @@ -84,6 +84,10 @@ iso15 iso15 latin9 iso15 latin0 iso15 @@ -413,8 +413,8 @@ ######################################################################## # Other encodings --- etc/Makefile.in -+++ etc/Makefile.in 2017-05-29 10:31:01.002578839 +0000 -@@ -482,7 +482,7 @@ uninstall-local: ++++ etc/Makefile.in 2018-10-17 06:43:16.503744334 +0000 +@@ -475,7 +475,7 @@ uninstall-local: # Building the correct a2ps.cfg a2ps.cfg: a2ps_cfg Makefile @@ -424,7 +424,7 @@ # Building a time stamp to know the version. README: README.in Makefile --- etc/a2ps_cfg.in -+++ etc/a2ps_cfg.in 2017-05-29 10:31:00.090595935 +0000 ++++ etc/a2ps_cfg.in 2018-10-17 06:43:16.503744334 +0000 @@ -58,6 +58,39 @@ Medium: Folio 612 936 Medium: Quarto 610 780 Medium: 10x14 720 1008 @@ -487,7 +487,7 @@ # Used for the `pdf' printer. # Use as `#{ps2pdf} INPUT OUTPUT'. --- lib/jobs.c -+++ lib/jobs.c 2017-05-29 10:31:00.298592037 +0000 ++++ lib/jobs.c 2018-10-17 06:43:16.503744334 +0000 @@ -135,10 +135,18 @@ a2ps_job_new (void) /* Set the NLS on */ @@ -509,7 +509,7 @@ bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); --- lib/metaseq.c -+++ lib/metaseq.c 2017-05-29 10:31:00.110595560 +0000 ++++ lib/metaseq.c 2018-10-17 06:43:16.503744334 +0000 @@ -205,7 +205,7 @@ grow_user_string_obstack (struct obstack int justification = 1; @@ -520,7 +520,7 @@ int type; --- lib/options.c -+++ lib/options.c 2017-05-29 10:31:00.098595785 +0000 ++++ lib/options.c 2018-10-17 06:43:16.503744334 +0000 @@ -54,11 +54,14 @@ #include "argv.h" #include "quotearg.h" @@ -570,7 +570,7 @@ * the encoding.map has not been read yet (because to read * encoding.map, one has to know the lib path, and to know --- lib/path-concat.c -+++ lib/path-concat.c 2017-05-29 10:31:00.314591736 +0000 ++++ lib/path-concat.c 2018-10-17 06:45:09.369668677 +0000 @@ -21,10 +21,6 @@ # include #endif @@ -592,8 +592,17 @@ #ifndef DIRECTORY_SEPARATOR # define DIRECTORY_SEPARATOR '/' +@@ -78,7 +77,7 @@ path_concat (const char *dir, const char + dir_len = strlen (dir); + + /* This cast is a kludge for SGI IRIX with C89 */ +- p_concat = (char *) malloc (dir_len + base_len + 2); ++ p_concat = (char *) xmalloc (dir_len + base_len + 2); + if (!p_concat) + return 0; + --- lib/xstrrpl.c -+++ lib/xstrrpl.c 2017-05-29 10:31:00.314591736 +0000 ++++ lib/xstrrpl.c 2018-10-17 06:43:16.503744334 +0000 @@ -22,6 +22,7 @@ #include #include "xstrrpl.h" @@ -603,7 +612,7 @@ /* Perform subsitutions in string. Result is malloc'd --- man/a2ps.x -+++ man/a2ps.x 2017-05-29 10:33:02.156306860 +0000 ++++ man/a2ps.x 2018-10-17 06:43:16.503744334 +0000 @@ -2,4 +2,4 @@ a2ps \- format files for printing on a PostScript printer @@ -611,7 +620,7 @@ -." Add any additional description here +.\" Add any additional description here --- man/card.x -+++ man/card.x 2017-05-29 10:33:09.440169890 +0000 ++++ man/card.x 2018-10-17 06:43:16.503744334 +0000 @@ -2,4 +2,4 @@ card \- print reference card of program options @@ -619,7 +628,7 @@ -." Add any additional description here +.\" Add any additional description here --- man/fixps.x -+++ man/fixps.x 2017-05-29 10:33:18.108006894 +0000 ++++ man/fixps.x 2018-10-17 06:43:16.503744334 +0000 @@ -2,4 +2,4 @@ fixps \- sanitize PostScript files @@ -627,7 +636,7 @@ -." Add any additional description here +.\" Add any additional description here --- man/pdiff.x -+++ man/pdiff.x 2017-05-29 10:33:21.359945743 +0000 ++++ man/pdiff.x 2018-10-17 06:43:16.503744334 +0000 @@ -2,4 +2,4 @@ pdiff \- produce a pretty comparison between files @@ -635,7 +644,7 @@ -." Add any additional description here +.\" Add any additional description here --- man/psmandup.x -+++ man/psmandup.x 2017-05-29 10:33:24.959878049 +0000 ++++ man/psmandup.x 2018-10-17 06:43:16.503744334 +0000 @@ -2,4 +2,4 @@ psmandup \- print duplex on non duplex printers @@ -643,7 +652,7 @@ -." Add any additional description here +.\" Add any additional description here --- man/psset.x -+++ man/psset.x 2017-05-29 10:33:29.495792753 +0000 ++++ man/psset.x 2018-10-17 06:43:16.503744334 +0000 @@ -2,4 +2,4 @@ psset \- insert page device request in PostScript files @@ -651,7 +660,7 @@ -." Add any additional description here +.\" Add any additional description here --- ogonkify/Makefile.in -+++ ogonkify/Makefile.in 2017-05-29 10:31:01.002578839 +0000 ++++ ogonkify/Makefile.in 2018-10-17 06:43:16.503744334 +0000 @@ -223,7 +223,7 @@ PSPROGS = allchars.ps compose.ps helper. # @EXTENSIONS_TRUE@bin_SCRIPTS = ogonkify composeglyphs @@ -662,7 +671,7 @@ # --- ogonkify/ogonkify.in.in -+++ ogonkify/ogonkify.in.in 2017-05-29 10:30:59.902599460 +0000 ++++ ogonkify/ogonkify.in.in 2018-10-17 06:43:16.503744334 +0000 @@ -38,7 +38,7 @@ $encoding='L2'; 'ibmpc','IBMPCEncoding', 'mac','MacintoshEncoding', 'HP','HPRomanEncoding'); @@ -673,7 +682,7 @@ 'Helvetica', 'Helvetica-Oblique', 'Helvetica-Bold', 'Helvetica-BoldOblique'); --- ogonkify/pcrb-o.afm -+++ ogonkify/pcrb-o.afm 2017-05-29 10:30:59.902599460 +0000 ++++ ogonkify/pcrb-o.afm 2018-10-17 06:43:16.503744334 +0000 @@ -5,7 +5,7 @@ FontName Courier-Bold-Ogonki EncodingScheme StandardEncoding FullName Courier-Bold-Ogonki Composite font @@ -692,7 +701,7 @@ C -1 ; WX 600 ; N Icircumflex ; B 77 0 523 780 ; C -1 ; WX 600 ; N Atilde ; B -9 0 609 759 ; --- ogonkify/pcrbo-o.afm -+++ ogonkify/pcrbo-o.afm 2017-05-29 10:30:59.906599386 +0000 ++++ ogonkify/pcrbo-o.afm 2018-10-17 06:43:16.503744334 +0000 @@ -5,7 +5,7 @@ FontName Courier-BoldOblique-Ogonki EncodingScheme StandardEncoding FullName Courier-BoldOblique-Ogonki Composite font @@ -711,7 +720,7 @@ C -1 ; WX 600 ; N Icircumflex ; B 77 0 642 780 ; C -1 ; WX 600 ; N Atilde ; B -9 0 638 759 ; --- ogonkify/pcrr-o.afm -+++ ogonkify/pcrr-o.afm 2017-05-29 10:30:59.906599386 +0000 ++++ ogonkify/pcrr-o.afm 2018-10-17 06:43:16.503744334 +0000 @@ -5,7 +5,7 @@ FontName Courier-Ogonki EncodingScheme StandardEncoding FullName Courier-Ogonki Composite font @@ -730,7 +739,7 @@ C -1 ; WX 600 ; N Icircumflex ; B 96 0 504 775 ; C -1 ; WX 600 ; N Atilde ; B 3 0 597 732 ; --- ogonkify/pcrro-o.afm -+++ ogonkify/pcrro-o.afm 2017-05-29 10:30:59.910599309 +0000 ++++ ogonkify/pcrro-o.afm 2018-10-17 06:43:16.503744334 +0000 @@ -5,7 +5,7 @@ FontName Courier-Oblique-Ogonki EncodingScheme StandardEncoding FullName Courier-Oblique-Ogonki Composite font @@ -749,7 +758,7 @@ C -1 ; WX 600 ; N Icircumflex ; B 96 0 623 775 ; C -1 ; WX 600 ; N Atilde ; B 3 0 656 732 ; --- ogonkify/phvb-o.afm -+++ ogonkify/phvb-o.afm 2017-05-29 10:30:59.914599234 +0000 ++++ ogonkify/phvb-o.afm 2018-10-17 06:43:16.503744334 +0000 @@ -5,7 +5,7 @@ FontName Helvetica-Bold-Ogonki EncodingScheme StandardEncoding FullName Helvetica-Bold-Ogonki Composite font @@ -768,7 +777,7 @@ C -1 ; WX 737 ; N registered ; B -14 -20 751 745 ; C -1 ; WX 556 ; N scaron ; B 29 -23 520 745 ; --- ogonkify/phvbo-o.afm -+++ ogonkify/phvbo-o.afm 2017-05-29 10:30:59.914599234 +0000 ++++ ogonkify/phvbo-o.afm 2018-10-17 06:43:16.503744334 +0000 @@ -5,7 +5,7 @@ FontName Helvetica-BoldOblique-Ogonki EncodingScheme StandardEncoding FullName Helvetica-BoldOblique-Ogonki Composite font @@ -787,7 +796,7 @@ C -1 ; WX 737 ; N registered ; B 55 -20 837 745 ; C -1 ; WX 556 ; N scaron ; B 60 -23 597 745 ; --- ogonkify/phvr-o.afm -+++ ogonkify/phvr-o.afm 2017-05-29 10:30:59.914599234 +0000 ++++ ogonkify/phvr-o.afm 2018-10-17 06:43:16.503744334 +0000 @@ -5,7 +5,7 @@ FontName Helvetica-Ogonki EncodingScheme StandardEncoding FullName Helvetica-Ogonki Composite font @@ -806,7 +815,7 @@ C -1 ; WX 737 ; N registered ; B -13 -23 751 741 ; C -1 ; WX 500 ; N scaron ; B 34 -24 459 740 ; --- ogonkify/phvro-o.afm -+++ ogonkify/phvro-o.afm 2017-05-29 10:30:59.886599760 +0000 ++++ ogonkify/phvro-o.afm 2018-10-17 06:43:16.503744334 +0000 @@ -5,7 +5,7 @@ FontName Helvetica-Oblique-Ogonki EncodingScheme StandardEncoding FullName Helvetica-Oblique-Ogonki Composite font @@ -825,7 +834,7 @@ C -1 ; WX 737 ; N registered ; B 55 -23 836 741 ; C -1 ; WX 500 ; N scaron ; B 61 -24 547 740 ; --- ogonkify/ptmb-o.afm -+++ ogonkify/ptmb-o.afm 2017-05-29 10:30:59.886599760 +0000 ++++ ogonkify/ptmb-o.afm 2018-10-17 06:43:16.503744334 +0000 @@ -5,7 +5,7 @@ FontName Times-Bold-Ogonki EncodingScheme StandardEncoding FullName Times-Bold-Ogonki Composite font @@ -844,7 +853,7 @@ C -1 ; WX 747 ; N registered ; B 16 -17 730 690 ; C -1 ; WX 389 ; N scaron ; B 29 -17 359 690 ; --- ogonkify/ptmbi-o.afm -+++ ogonkify/ptmbi-o.afm 2017-05-29 10:30:59.902599460 +0000 ++++ ogonkify/ptmbi-o.afm 2018-10-17 06:43:16.503744334 +0000 @@ -5,7 +5,7 @@ FontName Times-BoldItalic-Ogonki EncodingScheme StandardEncoding FullName Times-BoldItalic-Ogonki Composite font @@ -863,7 +872,7 @@ C -1 ; WX 747 ; N registered ; B 23 -18 723 676 ; C -1 ; WX 389 ; N scaron ; B 16 -13 465 683 ; --- ogonkify/ptmr-o.afm -+++ ogonkify/ptmr-o.afm 2017-05-29 10:30:59.906599386 +0000 ++++ ogonkify/ptmr-o.afm 2018-10-17 06:43:16.507744261 +0000 @@ -5,7 +5,7 @@ FontName Times-Roman-Ogonki EncodingScheme StandardEncoding FullName Times-Roman-Ogonki Composite font @@ -882,7 +891,7 @@ C -1 ; WX 500 ; N ocircumflex ; B 29 -10 470 674 ; C -1 ; WX 500 ; N yacute ; B 14 -218 475 678 ; --- ogonkify/ptmri-o.afm -+++ ogonkify/ptmri-o.afm 2017-05-29 10:30:59.910599309 +0000 ++++ ogonkify/ptmri-o.afm 2018-10-17 06:43:16.507744261 +0000 @@ -5,7 +5,7 @@ FontName Times-Italic-Ogonki EncodingScheme StandardEncoding FullName Times-Italic-Ogonki Composite font @@ -901,7 +910,7 @@ C -1 ; WX 500 ; N ocircumflex ; B 27 -11 468 661 ; C -1 ; WX 444 ; N yacute ; B -24 -206 459 664 ; --- src/main.c -+++ src/main.c 2017-05-29 10:30:59.786601634 +0000 ++++ src/main.c 2018-10-17 06:43:16.507744261 +0000 @@ -57,6 +57,7 @@ #include "signame.h" #include "long-options.h" diff --git a/a2ps.spec b/a2ps.spec index 76ed197..76ae374 100644 --- a/a2ps.spec +++ b/a2ps.spec @@ -142,6 +142,12 @@ find -name Makefile.in | xargs touch #YYY: Not a hack and it is necessary!! # The a2ps source is much to old to (re)run auto conf tools cp -p %{_datadir}/automake-*/config.{guess,sub} auxdir/ + cp -p /bin/true auxdir/missing + export AUTOMAKE=/bin/true + export ACLOCAL=/bin/true + export AUTOCONF=/bin/true + export AUTOHEADER=/bin/true + export PATH=$PWD:$PATH export CFLAGS="%{optflags} -D_GNU_SOURCE $(getconf LFS_CFLAGS) -funroll-loops -Wall -pipe -fstack-protector -fPIE" export LPR=lpr export CC=gcc