11 files changed, 41 insertions, 42 deletions

diff --git a/print/a2ps/files/patch-contrib-emacs-Makefile.in b/print/a2ps/files/patch-contrib-emacs-Makefile.in
index 9befc5690773..f623ca440ff2 100644
--- a/print/a2ps/files/patch-contrib-emacs-Makefile.in
+++ b/print/a2ps/files/patch-contrib-emacs-Makefile.in
@@ -1,7 +1,6 @@
-Index: contrib/emacs/Makefile.in
---- contrib/emacs/Makefile.in.orig	2011-09-27 15:17:26.000000000 +0900
-+++ contrib/emacs/Makefile.in	2011-09-27 15:18:10.000000000 +0900
-@@ -159,8 +159,9 @@
+--- contrib/emacs/Makefile.in.orig	2000-02-24 18:01:08 UTC
++++ contrib/emacs/Makefile.in
+@@ -159,8 +159,9 @@ Makefile: $(srcdir)/Makefile.in  $(top_b
  
  install-dist_lispLISP: $(dist_lisp_LISP) $(ELCFILES)
  	@$(NORMAL_INSTALL)
@@ -13,7 +12,7 @@ Index: contrib/emacs/Makefile.in
  	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
  	  f="`echo $$p | sed -e 's|^.*/||'`"; \
  	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$f"; \
-@@ -169,7 +170,8 @@
+@@ -169,7 +170,8 @@ install-dist_lispLISP: $(dist_lisp_LISP)
  	    echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${f}c"; \
  	    $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${f}c; \
  	  else : ; fi; \
diff --git a/print/a2ps/files/patch-contrib-tmpdircreation b/print/a2ps/files/patch-contrib-tmpdircreation
index e47e97120ad4..6c1e8059a985 100644
--- a/print/a2ps/files/patch-contrib-tmpdircreation
+++ b/print/a2ps/files/patch-contrib-tmpdircreation
@@ -1,6 +1,6 @@
 diff -ru contrib.orig/card.in contrib/card.in
---- contrib.orig/card.in	Thu Dec 30 19:23:25 2004
-+++ contrib/card.in	Thu Dec 30 19:29:49 2004
+--- contrib.orig/card.in	2000-01-27 00:42:36 UTC
++++ contrib/card.in
 @@ -38,7 +38,7 @@
  LC_ALL="${LC_ALL-C}" export LC_ALL
  print_form_feeds=:
@@ -19,8 +19,8 @@ diff -ru contrib.orig/card.in contrib/card.in
  case $LC_ALL in
    fr) footer="Engendré par $version_short" ;;
 diff -ru contrib.orig/fixps.in contrib/fixps.in
---- contrib.orig/fixps.in	Thu Dec 30 19:23:25 2004
-+++ contrib/fixps.in	Thu Dec 30 19:31:22 2004
+--- contrib.orig/fixps.in	2000-02-21 08:16:15 UTC
++++ contrib/fixps.in
 @@ -38,7 +38,7 @@
  run_gs=0
  # What action to perform: fixps, cat, check, and gs
@@ -39,8 +39,8 @@ diff -ru contrib.orig/fixps.in contrib/fixps.in
  
  # If printing from stdin, save into a tmp file
 diff -ru contrib.orig/pdiff.in contrib/pdiff.in
---- contrib.orig/pdiff.in	Thu Dec 30 19:23:25 2004
-+++ contrib/pdiff.in	Thu Dec 30 19:16:59 2004
+--- contrib.orig/pdiff.in	1999-10-24 15:07:51 UTC
++++ contrib/pdiff.in
 @@ -34,7 +34,7 @@
  diff_options='-u'
  file=
@@ -51,8 +51,8 @@ diff -ru contrib.orig/pdiff.in contrib/pdiff.in
  wdiff_prog=${WDIFF:-wdiff}
  wdiff_options='-w[wd- -x-wd] -y{wd+ -z+wd}'
 diff -ru contrib.orig/psmandup.in contrib/psmandup.in
---- contrib.orig/psmandup.in	Thu Dec 30 19:23:25 2004
-+++ contrib/psmandup.in	Thu Dec 30 19:32:30 2004
+--- contrib.orig/psmandup.in	1999-10-24 13:06:42 UTC
++++ contrib/psmandup.in
 @@ -36,7 +36,7 @@
  message=
  psselect=${PSSELECT:-psselect}
@@ -72,8 +72,8 @@ diff -ru contrib.orig/psmandup.in contrib/psmandup.in
  # If printing from stdin, save into a tmp file
  if test $file = '-'; then
 diff -ru contrib.orig/psset.in contrib/psset.in
---- contrib.orig/psset.in	Thu Dec 30 19:23:25 2004
-+++ contrib/psset.in	Thu Dec 30 19:33:50 2004
+--- contrib.orig/psset.in	1999-10-24 12:41:46 UTC
++++ contrib/psset.in
 @@ -33,7 +33,7 @@
  output=-
  pagedevices=	# `;' separated list of `key:value'
@@ -93,8 +93,8 @@ diff -ru contrib.orig/psset.in contrib/psset.in
  if test -n "$debug"; then
    # Set -x now if debugging
 diff -ru contrib.orig/texi2dvi4a2ps contrib/texi2dvi4a2ps
---- contrib.orig/texi2dvi4a2ps	Thu Dec 30 19:23:25 2004
-+++ contrib/texi2dvi4a2ps	Thu Dec 30 19:34:36 2004
+--- contrib.orig/texi2dvi4a2ps	2000-02-24 17:45:31 UTC
++++ contrib/texi2dvi4a2ps
 @@ -91,7 +91,7 @@
  quiet=          # by default let the tools' message be displayed
  set_language=
diff --git a/print/a2ps/files/patch-etc-Makefile.in b/print/a2ps/files/patch-etc-Makefile.in
index 6dddd830dcbf..713480077c38 100644
--- a/print/a2ps/files/patch-etc-Makefile.in
+++ b/print/a2ps/files/patch-etc-Makefile.in
@@ -1,6 +1,6 @@
---- etc/Makefile.in.orig	Tue Nov 20 19:09:45 2001
-+++ etc/Makefile.in	Tue Nov 20 19:09:53 2001
-@@ -131,7 +131,7 @@
+--- etc/Makefile.in.orig	2000-02-24 17:55:34 UTC
++++ etc/Makefile.in
+@@ -131,7 +131,7 @@ l = @l@
  lispdir = @lispdir@
  
  
diff --git a/print/a2ps/files/patch-localealias.c b/print/a2ps/files/patch-localealias.c
index 074a19569ca5..f796d000f9ee 100644
--- a/print/a2ps/files/patch-localealias.c
+++ b/print/a2ps/files/patch-localealias.c
@@ -1,6 +1,6 @@
---- intl/localealias.c.orig	Tue Aug 31 13:29:35 1999
-+++ intl/localealias.c	Tue Aug 12 11:09:53 2003
-@@ -329,6 +329,17 @@
+--- intl/localealias.c.orig	1999-08-31 17:29:35 UTC
++++ intl/localealias.c
+@@ -329,6 +329,17 @@ read_alias_file (fname, fname_len)
  		      FREE_BLOCKS (block_list);
  		      return added;
  		    }
diff --git a/print/a2ps/files/patch-ogonkify-Makefile.in b/print/a2ps/files/patch-ogonkify-Makefile.in
index 4b8428030547..62d65c40ee33 100644
--- a/print/a2ps/files/patch-ogonkify-Makefile.in
+++ b/print/a2ps/files/patch-ogonkify-Makefile.in
@@ -1,6 +1,6 @@
---- ogonkify/Makefile.in.orig	Tue Apr 20 00:07:03 1999
-+++ ogonkify/Makefile.in	Tue Apr 20 00:07:07 1999
-@@ -37,7 +37,7 @@
+--- ogonkify/Makefile.in.orig	2000-01-07 13:00:49 UTC
++++ ogonkify/Makefile.in
+@@ -33,7 +33,7 @@ mandir = @mandir@
  
  DESTDIR =
  
diff --git a/print/a2ps/files/patch-options.c b/print/a2ps/files/patch-options.c
index e85e42c0dc42..a5ec2217d8ad 100644
--- a/print/a2ps/files/patch-options.c
+++ b/print/a2ps/files/patch-options.c
@@ -1,6 +1,6 @@
---- lib/options.c.orig	Thu Sep 21 23:22:36 2000
-+++ lib/options.c	Thu Sep 21 23:22:42 2000
-@@ -493,6 +493,15 @@
+--- lib/options.c.orig	1999-08-31 17:42:41 UTC
++++ lib/options.c
+@@ -493,6 +493,15 @@ a2ps_handle_options (a2ps_job * job, int
  	  /* A font size is given */
  	  job->fontsize = get_length ("--font-size", cp,
  				      0.0, 0.0, "pt", range_min_strict);
diff --git a/print/a2ps/files/patch-output.c b/print/a2ps/files/patch-output.c
index a58e3bfc8d68..325dc1887b78 100644
--- a/print/a2ps/files/patch-output.c
+++ b/print/a2ps/files/patch-output.c
@@ -1,6 +1,6 @@
 Fix for CVE-2015-8107
 http://www.openwall.com/lists/oss-security/2015/11/16/4
---- lib/output.c.orig	1999-08-31 19:42:41.000000000 +0200
+--- lib/output.c.orig	1999-08-31 17:42:41 UTC
 +++ lib/output.c	2015-11-18 07:08:31.672864000 +0100
 @@ -525,7 +525,7 @@
  		     expand_user_string (job, FIRST_FILE (job),
diff --git a/print/a2ps/files/patch-printers.c b/print/a2ps/files/patch-printers.c
index 943fc6445a24..52ff8ac9b185 100644
--- a/print/a2ps/files/patch-printers.c
+++ b/print/a2ps/files/patch-printers.c
@@ -1,6 +1,6 @@
---- lib/printers.c.orig	Tue Oct 12 00:01:59 1999
-+++ lib/printers.c	Wed May  2 11:23:25 2001
-@@ -315,8 +315,8 @@
+--- lib/printers.c.orig	1999-10-11 22:01:59 UTC
++++ lib/printers.c
+@@ -315,8 +315,8 @@ a2ps_printers_new (struct a2ps_common_s 
    res->ppd = NULL;		/* Printer's ppd are not read yet */
  
    /* Output */
diff --git a/print/a2ps/files/patch-select.c b/print/a2ps/files/patch-select.c
index a2c38898fdc6..58fd686c38b8 100644
--- a/print/a2ps/files/patch-select.c
+++ b/print/a2ps/files/patch-select.c
@@ -1,6 +1,6 @@
---- src/select.c.orig	Thu Dec 16 02:04:56 1999
-+++ src/select.c	Sat Aug 21 12:05:31 2004
-@@ -131,6 +131,36 @@
+--- src/select.c.orig	1999-12-16 01:04:56 UTC
++++ src/select.c
+@@ -131,6 +131,36 @@ sheets_map_load_main (void)
    return 1;
  }
  
@@ -37,7 +37,7 @@
  /* What says file about the type of a file (result is malloc'd).  NULL
    if could not be run.  */
  
-@@ -144,11 +174,15 @@
+@@ -144,11 +174,15 @@ file_verdict_on (const uchar *filename)
    if (IS_EMPTY (job->file_command))
      return NULL;
  
diff --git a/print/a2ps/files/patch-title.c b/print/a2ps/files/patch-title.c
index 08a8b8d7f850..7f0a807aa26f 100644
--- a/print/a2ps/files/patch-title.c
+++ b/print/a2ps/files/patch-title.c
@@ -1,4 +1,4 @@
---- lib/title.c.orig	2015-09-25 08:26:23 UTC
+--- lib/title.c.orig	1999-08-28 16:54:19 UTC
 +++ lib/title.c
 @@ -88,6 +88,8 @@ title (stream, c, center_p, format, va_a
    if (center_p)
diff --git a/print/a2ps/files/patch-xgethostname.c b/print/a2ps/files/patch-xgethostname.c
index 10246118e252..ac18474971a2 100644
--- a/print/a2ps/files/patch-xgethostname.c
+++ b/print/a2ps/files/patch-xgethostname.c
@@ -1,5 +1,5 @@
---- lib/xgethostname.c.orig	Tue Sep  4 00:51:26 2001
-+++ lib/xgethostname.c	Tue Sep  4 00:55:39 2001
+--- lib/xgethostname.c.orig	1999-08-28 17:11:35 UTC
++++ lib/xgethostname.c
 @@ -21,6 +21,7 @@
  # include <config.h>
  #endif
@@ -8,7 +8,7 @@
  #include <sys/types.h>
  
  #include <errno.h>
-@@ -38,7 +39,7 @@
+@@ -38,7 +39,7 @@ extern int errno;
  int gethostname ();
  
  #ifndef INITIAL_HOSTNAME_LENGTH
@@ -17,7 +17,7 @@
  #endif
  
  char *
-@@ -63,7 +64,7 @@
+@@ -63,7 +64,7 @@ xgethostname ()
        if (err == 0 && hostname[k] == '\0')
  	break;
  #ifdef ENAMETOOLONG