print/a2ps: update to 4.15.3

26 files changed, 135 insertions, 489 deletions

diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index ac201ba07ef4..3a066a7eb1be 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,32 +1,23 @@
 PORTNAME=	a2ps
-PORTVERSION=	4.13b
-PORTREVISION=	18
+PORTVERSION=	4.15.3
 CATEGORIES=	print
 MASTER_SITES=	GNU LOCAL/hrs/a2ps/:i18n
 
-MAINTAINER=	dinoex@FreeBSD.org
+MAINTAINER=	dirk.meyer@dinoex.sub.org
 COMMENT=	Formats an ASCII file for printing on a postscript printer
-WWW=		https://www.gnu.org/software/a2ps/
+WWW=		http://www.inf.enst.fr/~demaille/a2ps/
 
-LICENSE=	GPLv2
+LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpaper.so:print/libpaper
+LIB_DEPENDS=	libgc.so:devel/boehm-gc \
+		libpaper.so:print/libpaper
 
-PORTSCOUT=	skipv:4.14
-
-USES=		perl5 cpe
+USES=		cpe perl5 gperf pkgconfig localbase gmake
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
 INFO=		a2ps ogonkify regex
-WRKSRC=		${WRKDIR}/${PORTNAME}-4.13
 I18N_PACKAGE=	i18n-fonts-0.1
-CPE_VENDOR=	gnu
-# CVE-2015-8107 fixed in files/patch-output.c
-# CVE-2014-0466 fixed in files/patch-fixps.in
-# CVE-2004-1377 fixed in files/patch-fixps.in files/patch-contrib-tmpdircreation
-# CVE-2004-1170 fixed in files/patch-select.c
-# CVE-2001-1593 fixed in files/patch-routines.[hc]
+MAKE_JOBS_UNSAFE=yes
 
 CONFIGURE_ARGS=	--with-medium=libpaper --sharedstatedir=${PREFIX}/share \
 	--sysconfdir=${PREFIX}/etc --datadir=${PREFIX}/share \
@@ -39,6 +30,7 @@ RUN_DEPENDS+=	${LOCALBASE}/etc/papersize:print/papersize-default-a4
 .endif
 
 OPTIONS_DEFINE=NLS I18N EMACS
+OPTIONS_DEFAULT=NLS
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
 EMACS_DESC=Enable Emacs support
@@ -46,8 +38,9 @@ I18N_DESC=Enable I18N support
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
-EMACS_USES=		emacs:build
+EMACS_USES=		emacs:noflavors
 EMACS_CONFIGURE_ON=	--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
+EMACS_CONFIGURE_OFF=	--without-emacs --without-lispdir
 
 .include <bsd.port.options.mk>
 
@@ -55,10 +48,6 @@ EMACS_CONFIGURE_ON=	--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
 CONFIGURE_ENV+=	EMACS=no
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1300512
-CFLAGS+=	-DHAVE_MEMPCPY
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e 's|^DESTDIR|#DESTDIR|' \
 		`${FIND} ${WRKSRC} -name "Makefile.in"`
@@ -84,8 +73,15 @@ post-configure:
 .endif
 
 post-install:
+.if ${PORT_OPTIONS:MEMACS}
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp
+	${LN} -sf ${PREFIX}/share/emacs/site-lisp/a2ps-print.el \
+		  ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/a2ps-print.el
+	${LN} -sf ${PREFIX}/share/emacs/site-lisp/a2ps.el \
+		  ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/a2ps.el
+.endif
 	cd ${WRKSRC}/doc && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${.MAKEFLAGS} ${MAKE_ARGS} ${INSTALL_TARGET}
-	${RM} ${STAGEDIR}${PREFIX}/lib/liba2ps.la
+	${RM} -f ${STAGEDIR}${PREFIX}/lib/liba2ps.la
 
 .include <bsd.port.mk>
diff --git a/print/a2ps/distinfo b/print/a2ps/distinfo
index f5a7b78eb097..3fe0cb3f5439 100644
--- a/print/a2ps/distinfo
+++ b/print/a2ps/distinfo
@@ -1,4 +1,3 @@
-SHA256 (a2ps-4.13b.tar.gz) = f4d2ac6f09f44eeb82621530b1970afe88fd97cfe82da43b61069800d0c06d12
-SIZE (a2ps-4.13b.tar.gz) = 1944289
-SHA256 (i18n-fonts-0.1.tar.gz) = 20628df682359044b8e5241c97a3c8da7a098aa260a7d281a87f67486a531786
-SIZE (i18n-fonts-0.1.tar.gz) = 352530
+TIMESTAMP = 1679944910
+SHA256 (a2ps-4.15.3.tar.gz) = d00e81e0eb4dcbf2d4963d89e1df2bb66f71e66d73b4152c43cf9838e6aaf7c7
+SIZE (a2ps-4.15.3.tar.gz) = 3601424
diff --git a/print/a2ps/files/patch-contrib-emacs-Makefile.in b/print/a2ps/files/patch-contrib-emacs-Makefile.in
deleted file mode 100644
index f623ca440ff2..000000000000
--- a/print/a2ps/files/patch-contrib-emacs-Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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)
--	$(mkinstalldirs) $(DESTDIR)$(lispdir)
--	@list='$(dist_lisp_LISP)'; for p in $$list; do \
-+	if test $(EMACS) != no; then \
-+	$(mkinstalldirs) $(DESTDIR)$(lispdir); \
-+	list='$(dist_lisp_LISP)'; for p in $$list; do \
- 	  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 @@ 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; \
--	done
-+	done; \
-+	fi
- 
- uninstall-dist_lispLISP:
- 	@$(NORMAL_UNINSTALL)
diff --git a/print/a2ps/files/patch-contrib-tmpdircreation b/print/a2ps/files/patch-contrib-tmpdircreation
deleted file mode 100644
index b975735d7df3..000000000000
--- a/print/a2ps/files/patch-contrib-tmpdircreation
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -ru contrib.orig/card.in contrib/card.in
---- 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=:
- RM="/bin/rm -rf"
--tmp_dir=${TMPDIR-/tmp}/$program.$$
-+tmp_dir=$(mktemp -d -t ${program}) || exit 1
- tmp_file=$tmp_dir/card
- success=false
- verbose=:
-@@ -190,7 +190,6 @@
- 
- # Create a tmp dir and be ready to clean up
- trap "$RM $tmp_dir" 0 1 2 15
--(umask 077 && mkdir $tmp_dir) || exit 1
- 
- case $LC_ALL in
-   fr) footer="Engendré par $version_short" ;;
-diff -ru contrib.orig/pdiff.in contrib/pdiff.in
---- contrib.orig/pdiff.in	1999-10-24 15:07:51 UTC
-+++ contrib/pdiff.in
-@@ -34,7 +34,7 @@
- diff_options='-u'
- file=
- output=
--tmpdir=/tmp/$program.$$
-+tmpdir=$(mktemp -d -t ${program}) || exit 1
- verbose=echo
- 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	1999-10-24 13:06:42 UTC
-+++ contrib/psmandup.in
-@@ -36,7 +36,7 @@
- message=
- psselect=${PSSELECT:-psselect}
- psset=${PSSET:-psset}
--tmpdir=/tmp/$program.$$
-+tmpdir=$(mktemp -d -t ${program}) || exit 1
- 
- # These two must be kept in synch.  They are opposed.
- verbose=echo
-@@ -184,8 +184,6 @@
-   # Temp dir.  Get ready not to leave junk (if not debugging)
-   trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15
- fi
--
--mkdir $tmpdir
- 
- # 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	1999-10-24 12:41:46 UTC
-+++ contrib/psset.in
-@@ -33,7 +33,7 @@
- output=-
- pagedevices=	# `;' separated list of `key:value'
- quiet=:         # i.e., verbose
--tmpdir=${TMPDIR:-/tmp}/$program.$$
-+tmpdir=$(mktemp -d -t ${program}) || exit 1
- sedscript=$tmpdir/psset.sed
- 
- # The version/usage strings
-@@ -185,8 +185,6 @@
-       echo "$help"  1>&2
-       exit 1;;
- esac
--
--mkdir $tmpdir
- 
- if test -n "$debug"; then
-   # Set -x now if debugging
-diff -ru contrib.orig/texi2dvi4a2ps contrib/texi2dvi4a2ps
---- 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=
- textra=
--tmpdir=${TMPDIR:-/tmp}/t2d$$  # avoid collisions on 8.3 filesystems.
-+tmpdir=$(mktemp -d -t ${program}) || exit 1
- txincludes=     # TEXINPUTS extensions
- txiprereq=19990129 # minimum texinfo.tex version to have macro expansion
- verbose=false   # echo for verbose mode
-@@ -202,9 +202,6 @@
- if test -z "$debug"; then
-   trap "cd / && rm -rf $tmpdir" 0 1 2 15
- fi
--
--# Create the temporary directory with strict rights
--(umask 077 && mkdir $tmpdir) || exit 1
- 
- # Prepare the tools we might need.  This may be extra work in some
- # cases, but improves the readibility of the script.
diff --git a/print/a2ps/files/patch-etc-Makefile.in b/print/a2ps/files/patch-etc-Makefile.in
index 713480077c38..290eb31399f5 100644
--- a/print/a2ps/files/patch-etc-Makefile.in
+++ b/print/a2ps/files/patch-etc-Makefile.in
@@ -1,11 +1,11 @@
---- etc/Makefile.in.orig	2000-02-24 17:55:34 UTC
+--- etc/Makefile.in.orig	2023-03-07 18:02:02 UTC
 +++ etc/Makefile.in
-@@ -131,7 +131,7 @@ l = @l@
- lispdir = @lispdir@
- 
- 
+@@ -1358,7 +1358,7 @@ tex = @tex@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -ogonkifydir = $(datadir)/ogonkify
 +ogonkifydir = $(datadir)/a2ps/ogonkify
  libpath = $(pkgdatadir)/sheets:$(pkgdatadir)/ps:$(pkgdatadir)/encoding:$(pkgdatadir)/afm:$(ogonkifydir)/afm:$(pkgdatadir)/ppd:$(pkgdatadir)/fonts:$(ogonkifydir)/fonts:$(pkgdatadir)
- 
  pkgdata_DATA = README
+ dsysconf = $(DESTDIR)$(sysconfdir)
diff --git a/print/a2ps/files/patch-etc-README.in b/print/a2ps/files/patch-etc-README.in
deleted file mode 100644
index 204da001e10a..000000000000
--- a/print/a2ps/files/patch-etc-README.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- etc/README.in.orig	1999-05-23 16:54:18 UTC
-+++ etc/README.in
-@@ -1,5 +1,4 @@
--The last installation in this directory occurred the
--	@date@
-+The last installation in this directory occurred
- for GNU a2ps version @version@.
- 
- The content of this directory (unless reorganized by the local
diff --git a/print/a2ps/files/patch-fixps.in b/print/a2ps/files/patch-fixps.in
deleted file mode 100644
index ac4018e56624..000000000000
--- a/print/a2ps/files/patch-fixps.in
+++ /dev/null
@@ -1,28 +0,0 @@
---- contrib/fixps.in.orig	2000-02-21 08:16:15 UTC
-+++ contrib/fixps.in
-@@ -38,7 +38,7 @@ output=-	# Default is stdout
- run_gs=0
- # What action to perform: fixps, cat, check, and gs
- task=fixps
--tmpdir=/tmp/$program.$$
-+tmpdir=$(mktemp -d -t ${program}) || exit 1
- verbose=echo
- 
- # The version/usage strings
-@@ -191,7 +191,6 @@ else
-   trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15
- fi
- 
--mkdir $tmpdir
- fixps_sed=$tmpdir/fixps.sed
- 
- # If printing from stdin, save into a tmp file
-@@ -390,7 +389,7 @@ if test $task != check; then
-   	eval "$command" ;;
-       gs)
-         $verbose "$program: making a full rewrite of the file ($gs)." >&2
--  	$gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f "$file" ;;
-+  	$gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f "$file" ;;
-     esac
-   )
- fi
diff --git a/print/a2ps/files/patch-localealias.c b/print/a2ps/files/patch-localealias.c
deleted file mode 100644
index f796d000f9ee..000000000000
--- a/print/a2ps/files/patch-localealias.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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;
- 		    }
-+		  if (string_space != new_pool)
-+		    {
-+		      size_t i;
-+
-+		      for (i = 0; i < nmap; i++)
-+			{
-+			  map[i].alias += new_pool - string_space;
-+			  map[i].value += new_pool - string_space;
-+			}
-+		    }
-+
- 		  string_space = new_pool;
- 		  string_space_max = new_size;
- 		}
diff --git a/print/a2ps/files/patch-media.c b/print/a2ps/files/patch-media.c
new file mode 100644
index 000000000000..c6507994412e
--- /dev/null
+++ b/print/a2ps/files/patch-media.c
@@ -0,0 +1,11 @@
+--- liba2ps/media.c.orig	2023-01-26 13:04:21 UTC
++++ liba2ps/media.c
+@@ -147,7 +147,7 @@ a2ps_get_medium (a2ps_job * job, const char * name)
+ 
+   token.name = NULL;
+   if (strcaseequ (name, LIBPAPER_MEDIUM))
+-    token.name = (char *) defaultpapername ();
++    token.name = (char *) systempapername ();
+ 
+   if (!token.name)
+     token.name = (char *) name;
diff --git a/print/a2ps/files/patch-ogonkify-Makefile.in b/print/a2ps/files/patch-ogonkify-Makefile.in
index 62d65c40ee33..1e0eba645090 100644
--- a/print/a2ps/files/patch-ogonkify-Makefile.in
+++ b/print/a2ps/files/patch-ogonkify-Makefile.in
@@ -1,11 +1,11 @@
---- ogonkify/Makefile.in.orig	2000-01-07 13:00:49 UTC
+--- ogonkify/Makefile.in.orig	2023-03-07 18:11:32 UTC
 +++ ogonkify/Makefile.in
-@@ -33,7 +33,7 @@ mandir = @mandir@
- 
- DESTDIR =
- 
+@@ -89,7 +89,7 @@ am__make_running_with_option = \
+   test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/a2ps/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
- 
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
diff --git a/print/a2ps/files/patch-options.c b/print/a2ps/files/patch-options.c
index e4f214a09350..69212b9863bd 100644
--- a/print/a2ps/files/patch-options.c
+++ b/print/a2ps/files/patch-options.c
@@ -1,6 +1,6 @@
---- 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 argc, char *a
+--- liba2ps/options.c.orig	2023-03-19 17:22:01 UTC
++++ liba2ps/options.c
+@@ -463,6 +463,15 @@ a2ps_handle_options (a2ps_job * job, int argc, char *a
  	  /* 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
deleted file mode 100644
index a4b487661f87..000000000000
--- a/print/a2ps/files/patch-output.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/output.c.orig	1999-08-31 17:42:41 UTC
-+++ lib/output.c
-@@ -525,7 +525,7 @@ output_file (struct output * out, a2ps_job * job,
- 		     expand_user_string (job, FIRST_FILE (job),
- 					 (const uchar *) "Expand: requirement",
- 					 (const uchar *) token));
--	output (dest, expansion);
-+	output (dest, "%s", expansion);
- 	continue;
-       }
- 
diff --git a/print/a2ps/files/patch-parseppd.y b/print/a2ps/files/patch-parseppd.y
deleted file mode 100644
index 06b0121eb1dc..000000000000
--- a/print/a2ps/files/patch-parseppd.y
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/parseppd.y.orig	1999-12-16 01:00:13 UTC
-+++ lib/parseppd.y
-@@ -154,7 +154,7 @@ font_clause :
- void
- yyerror (const char *msg)
- {
--  error_at_line (1, 0, ppdfilename, ppdlineno, msg);
-+  error_at_line (1, 0, ppdfilename, ppdlineno, "%s", msg);
- }
- 
- /*
diff --git a/print/a2ps/files/patch-parsessh.y b/print/a2ps/files/patch-parsessh.y
deleted file mode 100644
index 6cf3c874f0a4..000000000000
--- a/print/a2ps/files/patch-parsessh.y
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/parsessh.y.orig	1999-12-16 01:06:30 UTC
-+++ src/parsessh.y
-@@ -740,7 +740,7 @@ exception_def_opt:
- void
- yyerror (const char *msg)
- {
--  error_at_line (1, 0, sshfilename, sshlineno, msg);
-+  error_at_line (1, 0, sshfilename, sshlineno, "%s", msg);
- }
- 
- /*
diff --git a/print/a2ps/files/patch-path-concat.c b/print/a2ps/files/patch-path-concat.c
deleted file mode 100644
index 8f8edd4120d8..000000000000
--- a/print/a2ps/files/patch-path-concat.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/path-concat.c.orig	1999-10-10 18:34:46 UTC
-+++ lib/path-concat.c
-@@ -31,7 +31,7 @@
- #endif
- #include <sys/types.h>
- 
--char *malloc ();
-+#include <stdlib.h>
- 
- #ifndef DIRECTORY_SEPARATOR
- # define DIRECTORY_SEPARATOR '/'
diff --git a/print/a2ps/files/patch-printers.c b/print/a2ps/files/patch-printers.c
index e19d419fa0e0..73f475f7a3bb 100644
--- a/print/a2ps/files/patch-printers.c
+++ b/print/a2ps/files/patch-printers.c
@@ -1,6 +1,6 @@
---- 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 * common)
+--- liba2ps/printers.c.orig	2022-06-11 20:35:11 UTC
++++ liba2ps/printers.c
+@@ -287,8 +287,8 @@ a2ps_printers_new (struct a2ps_common_s * common)
    res->ppd = NULL;		/* Printer's ppd are not read yet */
  
    /* Output */
diff --git a/print/a2ps/files/patch-printlen.c b/print/a2ps/files/patch-printlen.c
deleted file mode 100644
index d56cc8e24b29..000000000000
--- a/print/a2ps/files/patch-printlen.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- lib/printlen.c.orig	1999-08-31 17:42:42 UTC
-+++ lib/printlen.c
-@@ -28,15 +28,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- unsigned long strtoul ();
- 
- static int
--int_printflen (const char *format, va_list *args)
-+int_printflen (const char *format, va_list ap)
- {
-   const char *cp;
-   int total_width = 0;
-   int width = 0;
--  va_list ap;
- 
--  memcpy (&ap, args, sizeof (va_list));
--
-   for (cp = format ; *cp ; cp++)
-     {
-       if (*cp != '%')
-@@ -99,7 +96,7 @@ int_printflen (const char *format, va_list *args)
- int
- vprintflen (const char *format,  va_list args)
- {
--  return int_printflen (format, &args);
-+  return int_printflen (format, args);
- }
- 
- int
diff --git a/print/a2ps/files/patch-psgen.c b/print/a2ps/files/patch-psgen.c
deleted file mode 100644
index 2007d9c4596d..000000000000
--- a/print/a2ps/files/patch-psgen.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/psgen.c.orig	2000-01-15 23:15:07 UTC
-+++ lib/psgen.c
-@@ -232,7 +232,7 @@ output_marker (a2ps_job * job, const char * kind, ucha
-     default:
-       *buf = '\0';
-       ps_escape_char (job, cp[i], buf);
--      output (jdiv, (char *) buf);
-+      output (jdiv, "%s", (char *) buf);
-       break;
-     }
-   }
diff --git a/print/a2ps/files/patch-regex.c b/print/a2ps/files/patch-regex.c
deleted file mode 100644
index 1319311cbdd9..000000000000
--- a/print/a2ps/files/patch-regex.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/regex.c.orig	1999-05-10 04:27:07 UTC
-+++ src/regex.c
-@@ -5789,7 +5789,7 @@ regerror (errcode, preg, errbuf, errbuf_size)
-       if (msg_size > errbuf_size)
-         {
- #if defined HAVE_MEMPCPY || defined _LIBC
--	  *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
-+	  *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
- #else
-           memcpy (errbuf, msg, errbuf_size - 1);
-           errbuf[errbuf_size - 1] = 0;
diff --git a/print/a2ps/files/patch-routines.c b/print/a2ps/files/patch-routines.c
deleted file mode 100644
index c59557984912..000000000000
--- a/print/a2ps/files/patch-routines.c
+++ /dev/null
@@ -1,53 +0,0 @@
---- lib/routines.c.orig	1999-10-16 04:46:37 UTC
-+++ lib/routines.c
-@@ -242,3 +242,50 @@ unlink2 (PARAM_UNUSED void * dummy, const char * filen
-   /* Don't complain if you can't unlink.  Who cares of a tmp file? */
-   unlink (filename);
- }
-+
-+/*
-+ * Securely generate a temp file, and make sure it gets
-+ * deleted upon exit.
-+ */
-+static char **	tempfiles;
-+static unsigned	ntempfiles;
-+
-+static void
-+cleanup_tempfiles()
-+{
-+	while (ntempfiles--)
-+		unlink(tempfiles[ntempfiles]);
-+}
-+
-+char *
-+safe_tempnam(const char *pfx)
-+{
-+	char	*dirname, *filename;
-+	int	fd;
-+
-+	if (!(dirname = getenv("TMPDIR")))
-+		dirname = "/tmp";
-+
-+	tempfiles = (char **) realloc(tempfiles,
-+			(ntempfiles+1) * sizeof(char *));
-+	if (tempfiles == NULL)
-+		return NULL;
-+
-+	filename = malloc(strlen(dirname) + strlen(pfx) + sizeof("/XXXXXX"));
-+	if (!filename)
-+		return NULL;
-+
-+	sprintf(filename, "%s/%sXXXXXX", dirname, pfx);
-+
-+	if ((fd = mkstemp(filename)) < 0) {
-+		free(filename);
-+		return NULL;
-+	}
-+	close(fd);
-+
-+	if (ntempfiles == 0)
-+		atexit(cleanup_tempfiles);
-+	tempfiles[ntempfiles++] = filename;
-+
-+	return filename;
-+}
diff --git a/print/a2ps/files/patch-routines.h b/print/a2ps/files/patch-routines.h
deleted file mode 100644
index 68a01d5e2325..000000000000
--- a/print/a2ps/files/patch-routines.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/routines.h.orig	1999-10-18 20:24:41 UTC
-+++ lib/routines.h
-@@ -255,7 +255,8 @@ FILE * xwpopen PARAMS ((const char * command));
- /* If _STR_ is not defined, give it a tempname in _TMPDIR_ */
- #define tempname_ensure(Str)				\
- do {							\
--  (Str) = (Str) ? (Str) : tempnam (NULL, "a2_");	\
-+  (Str) = (Str) ? (Str) : safe_tempnam("a2_");	\
- } while (0)
-+char * safe_tempnam(const char *);
- 
- #endif
diff --git a/print/a2ps/files/patch-select.c b/print/a2ps/files/patch-select.c
deleted file mode 100644
index 58fd686c38b8..000000000000
--- a/print/a2ps/files/patch-select.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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;
- }
- 
-+/* escapes the name of a file so that the shell groks it in 'single' q.marks. 
-+   The resulting pointer has to be free()ed when not longer used. */
-+char *
-+shell_escape(const char *fn)
-+{
-+  size_t len = 0;
-+  const char *inp;
-+  char *retval, *outp;
-+
-+  for(inp = fn; *inp; ++inp)
-+    switch(*inp)
-+    {
-+      case '\'': len += 4; break;
-+      default:   len += 1; break;
-+    }
-+
-+  outp = retval = malloc(len + 1);
-+  if(!outp)
-+    return NULL; /* perhaps one should do better error handling here */
-+  for(inp = fn; *inp; ++inp)
-+    switch(*inp)
-+    {
-+      case '\'': *outp++ = '\''; *outp++ = '\\'; *outp++ = '\'', *outp++ = '\''; break;
-+      default:   *outp++ = *inp; break;
-+    }
-+  *outp = 0;
-+
-+  return retval;
-+}
-+
- /* What says file about the type of a file (result is malloc'd).  NULL
-   if could not be run.  */
- 
-@@ -144,11 +174,15 @@ file_verdict_on (const uchar *filename)
-   if (IS_EMPTY (job->file_command))
-     return NULL;
- 
-+  filename = shell_escape(filename);
-+  if(filename == NULL)
-+    return NULL;
-   /* Call file(1) with the correct option */
--  command = ALLOCA (char, (2
-+  command = ALLOCA (char, (4
- 			   + strlen (job->file_command)
- 			   + ustrlen (filename)));
--  sprintf (command, "%s %s", job->file_command, (const char *) filename);
-+  sprintf (command, "%s '%s'", job->file_command, (const char *) filename);
-+  free(filename);
-   message (msg_tool, (stderr, "Reading pipe: `%s'\n", command));
-   file_out = popen (command, "r");
- 
diff --git a/print/a2ps/files/patch-title.c b/print/a2ps/files/patch-title.c
deleted file mode 100644
index a444fc7ead76..000000000000
--- a/print/a2ps/files/patch-title.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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_alist)
-   if (center_p)
-     for (padding = 0 ; padding < 79 - len ; padding += 2)
-       putc (' ', stream);
-+  va_end(args);
-+  VA_START(args, format);
- # if HAVE_VPRINTF || _LIBC
-   vfprintf (stream, format, args);
- # else
diff --git a/print/a2ps/files/patch-xgethostname.c b/print/a2ps/files/patch-xgethostname.c
deleted file mode 100644
index ac18474971a2..000000000000
--- a/print/a2ps/files/patch-xgethostname.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- lib/xgethostname.c.orig	1999-08-28 17:11:35 UTC
-+++ lib/xgethostname.c
-@@ -21,6 +21,7 @@
- # include <config.h>
- #endif
- 
-+#include <sys/param.h>
- #include <sys/types.h>
- 
- #include <errno.h>
-@@ -38,7 +39,7 @@ extern int errno;
- int gethostname ();
- 
- #ifndef INITIAL_HOSTNAME_LENGTH
--# define INITIAL_HOSTNAME_LENGTH 34
-+# define INITIAL_HOSTNAME_LENGTH MAXHOSTNAMELEN
- #endif
- 
- char *
-@@ -63,7 +64,7 @@ xgethostname ()
-       if (err == 0 && hostname[k] == '\0')
- 	break;
- #ifdef ENAMETOOLONG
--      else if (err != 0 && errno != ENAMETOOLONG && errno != 0)
-+      else if (err != 0 && errno != ENAMETOOLONG && errno != ENOMEM && errno != 0)
- 	error (EXIT_FAILURE, errno, "gethostname");
- #endif
-       size *= 2;
diff --git a/print/a2ps/pkg-descr b/print/a2ps/pkg-descr
index 56a0bb8a7b4a..89f40f08cede 100644
--- a/print/a2ps/pkg-descr
+++ b/print/a2ps/pkg-descr
@@ -8,4 +8,4 @@ This is very useful for making archive listings of programs.
 Additionally, A2ps "pretty print"s using special fonts for a wide array
 of languages, making things like program listings much more legible.
 
-LICENSE: GPL2 or later
+LICENSE: GPL3 or later
diff --git a/print/a2ps/pkg-plist b/print/a2ps/pkg-plist
index 99f55748268e..e4a3e8755168 100644
--- a/print/a2ps/pkg-plist
+++ b/print/a2ps/pkg-plist
@@ -1,28 +1,27 @@
 bin/a2ps
+bin/a2ps-lpr-wrapper
 bin/card
 bin/composeglyphs
-bin/fixnt
 bin/fixps
+bin/lp2
 bin/ogonkify
 bin/pdiff
-bin/psmandup
-bin/psset
-bin/texi2dvi4a2ps
 etc/a2ps-site.cfg
 etc/a2ps.cfg
-include/liba2ps.h
-lib/liba2ps.a
 man/man1/a2ps.1.gz
+man/man1/a2ps-lpr-wrapper.1.gz
 man/man1/ogonkify.1.gz
 man/man1/card.1.gz
-man/man1/psmandup.1.gz
+man/man1/lp2.1.gz
 man/man1/fixps.1.gz
 man/man1/pdiff.1.gz
-man/man1/psset.1.gz
-man/man1/texi2dvi4a2ps.1.gz
 %%DATADIR%%/README
 %%DATADIR%%/afm/fonts.map
 %%DATADIR%%/afm/make_fonts_map.sh
+%%DATADIR%%/afm/pagb.afm
+%%DATADIR%%/afm/pagbo.afm
+%%DATADIR%%/afm/pagd.afm
+%%DATADIR%%/afm/pagdo.afm
 %%DATADIR%%/afm/pbkd.afm
 %%DATADIR%%/afm/pbkdi.afm
 %%DATADIR%%/afm/pbkl.afm
@@ -67,6 +66,7 @@ man/man1/texi2dvi4a2ps.1.gz
 %%I18N%%%%DATADIR%%/afm/textb20.afm
 %%DATADIR%%/encoding/ascii.edf
 %%DATADIR%%/encoding/encoding.map
+%%DATADIR%%/encoding/euc-jp.edf
 %%DATADIR%%/encoding/hp.edf
 %%DATADIR%%/encoding/ibm-cp437.edf
 %%DATADIR%%/encoding/ibm-cp850.edf
@@ -83,6 +83,7 @@ man/man1/texi2dvi4a2ps.1.gz
 %%DATADIR%%/encoding/koi8.edf
 %%DATADIR%%/encoding/mac.edf
 %%DATADIR%%/encoding/ms-cp1250.edf
+%%DATADIR%%/encoding/ms-cp1251.edf
 %%DATADIR%%/fonts/pcfont.pfa
 %%I18N%%%%DATADIR%%/fonts/colle10.pfb
 %%I18N%%%%DATADIR%%/fonts/colle8.pfb
@@ -160,6 +161,7 @@ man/man1/texi2dvi4a2ps.1.gz
 %%DATADIR%%/ps/color.hdr
 %%DATADIR%%/ps/color.pro
 %%DATADIR%%/ps/diff.pro
+%%DATADIR%%/ps/diffcolor.pro
 %%DATADIR%%/ps/ehandler.ps
 %%DATADIR%%/ps/fixed.pro
 %%DATADIR%%/ps/gray.pro
@@ -184,6 +186,7 @@ man/man1/texi2dvi4a2ps.1.gz
 %%DATADIR%%/sheets/coqv.ssh
 %%DATADIR%%/sheets/cpp.ssh
 %%DATADIR%%/sheets/csh.ssh
+%%DATADIR%%/sheets/csharp.ssh
 %%DATADIR%%/sheets/cxx.ssh
 %%DATADIR%%/sheets/dc_shell.ssh
 %%DATADIR%%/sheets/eiffel.ssh
@@ -213,11 +216,13 @@ man/man1/texi2dvi4a2ps.1.gz
 %%DATADIR%%/sheets/mail.ssh
 %%DATADIR%%/sheets/make.ssh
 %%DATADIR%%/sheets/maple.ssh
+%%DATADIR%%/sheets/matlab.ssh
 %%DATADIR%%/sheets/matlab4.ssh
 %%DATADIR%%/sheets/mib.ssh
 %%DATADIR%%/sheets/mly.ssh
 %%DATADIR%%/sheets/modula2.ssh
 %%DATADIR%%/sheets/modula3.ssh
+%%DATADIR%%/sheets/nasm.ssh
 %%DATADIR%%/sheets/o2c.ssh
 %%DATADIR%%/sheets/oberon.ssh
 %%DATADIR%%/sheets/objc.ssh
@@ -226,6 +231,8 @@ man/man1/texi2dvi4a2ps.1.gz
 %%DATADIR%%/sheets/oracle.ssh
 %%DATADIR%%/sheets/pascal.ssh
 %%DATADIR%%/sheets/perl.ssh
+%%DATADIR%%/sheets/php.ssh
+%%DATADIR%%/sheets/pic16f84.ssh
 %%DATADIR%%/sheets/plsql.ssh
 %%DATADIR%%/sheets/pov.ssh
 %%DATADIR%%/sheets/ppd.ssh
@@ -235,7 +242,10 @@ man/man1/texi2dvi4a2ps.1.gz
 %%DATADIR%%/sheets/promela.ssh
 %%DATADIR%%/sheets/ps.ssh
 %%DATADIR%%/sheets/python.ssh
+%%DATADIR%%/sheets/rd.ssh
 %%DATADIR%%/sheets/rexx.ssh
+%%DATADIR%%/sheets/ruby.ssh
+%%DATADIR%%/sheets/s.ssh
 %%DATADIR%%/sheets/sather.ssh
 %%DATADIR%%/sheets/scheme.ssh
 %%DATADIR%%/sheets/sdl88.ssh
@@ -243,10 +253,14 @@ man/man1/texi2dvi4a2ps.1.gz
 %%DATADIR%%/sheets/sh.ssh
 %%DATADIR%%/sheets/sheets.map
 %%DATADIR%%/sheets/shell.ssh
+%%DATADIR%%/sheets/small.ssh
 %%DATADIR%%/sheets/sml.ssh
+%%DATADIR%%/sheets/specc.ssh
 %%DATADIR%%/sheets/sql.ssh
 %%DATADIR%%/sheets/sql92.ssh
 %%DATADIR%%/sheets/ssh.ssh
+%%DATADIR%%/sheets/st.ssh
+%%DATADIR%%/sheets/stratego.ssh
 %%DATADIR%%/sheets/symbols.ssh
 %%DATADIR%%/sheets/tcl.ssh
 %%DATADIR%%/sheets/tclx.ssh
@@ -267,24 +281,82 @@ man/man1/texi2dvi4a2ps.1.gz
 %%DATADIR%%/sheets/xs.ssh
 %%DATADIR%%/sheets/yacc.ssh
 %%DATADIR%%/sheets/zsh.ssh
+%%NLS%%share/locale/af/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/be/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/be/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/a2ps-gnulib.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/a2ps-gnulib.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/da/LC_MESSAGES/a2ps-gnulib.mo
 %%NLS%%share/locale/da/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/de/LC_MESSAGES/a2ps-gnulib.mo
 %%NLS%%share/locale/de/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/el/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/el/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/es/LC_MESSAGES/a2ps-gnulib.mo
 %%NLS%%share/locale/es/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/et/LC_MESSAGES/a2ps-gnulib.mo
 %%NLS%%share/locale/et/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/a2ps-gnulib.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/id/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/it/LC_MESSAGES/a2ps-gnulib.mo
 %%NLS%%share/locale/it/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/a2ps-gnulib.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/a2ps-gnulib.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/a2ps.mo
-%%NLS%%share/locale/no/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/a2ps-gnulib.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/a2ps-gnulib.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/a2ps-gnulib.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/a2ps-gnulib.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/a2ps-gnulib.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/th/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/a2ps-gnulib.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/a2ps-gnulib.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/a2ps.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/a2ps-gnulib.mo
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps-print.el
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps-print.elc
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps.el
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps.elc
+%%EMACS%%lib/xemacs/site-lisp/a2ps-print.el
+%%EMACS%%lib/xemacs/site-lisp/a2ps.el