Update to 1.6.5.2

* Set LICENSE.
* Make pkglint happy

Changelog:
Summary of changes in enscript version 1.6.5.2:

* Fix CFG_FATAL macro in util.c; this prevents a segmentation fault
  when the configuration file contains unknown parameters. (Savannah
  bug #28769)

* Fix segmentation fault with line lengths over 90 characters.
  (Savannah bug #29198)

Summary of changes in enscript version 1.6.5.1:

* Typo corrections in the manual pages.

* Reorganise source tree to use a single ChangeLog file.

* Actually ship f90.st in the tarball.

* Reorganise INSTALL and README.

Noteworthy changes in enscript version 1.6.5:

* New maintainer.

* Licensing change: GNU Enscript is now distributed under version 3 or
  later of the GNU GPL.

* Build system fixes - distcheck now passes.

* At least four security bug fixes:
  - CAN-2004-1184
  - CAN-2004-1185
  - CAN-2004-1186
  - CVE-2008-3863, CVE-2008-4306

* Syntax highlighting fixes.
  - shell escaping rules from Shawn McMahon.
  - JavaScript regexps now recognised.
  - New highlighting rules for Fortran 90 from David Bowler.

See changelogs for more detailed notes.

12 files changed, 16 insertions, 364 deletions

diff --git a/print/enscript/Makefile b/print/enscript/Makefile
index d2f94236e5d..934a8c34994 100644
--- a/print/enscript/Makefile
+++ b/print/enscript/Makefile
@@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.45 2011/04/22 13:44:31 obache Exp $
+# $NetBSD: Makefile,v 1.46 2011/10/21 19:37:28 ryoon Exp $
 #
 
-DISTNAME=		enscript-1.6.4
-PKGREVISION=		3
+DISTNAME=		enscript-1.6.5.2
 CATEGORIES=		print
-MASTER_SITES=		http://www.iki.fi/mtr/genscript/
+MASTER_SITES=		${MASTER_SITE_GNU:=enscript/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.codento.com/people/mtr/genscript/
 COMMENT=		ASCII-to-PostScript filter
+LICENSE=		gnu-gpl-v3
 
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake lex perl:run xgettext
 BROKEN_GETTEXT_DETECTION=	yes
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 INFO_FILES=		YES
 
 EGDIR=			${PREFIX}/share/examples/enscript
 CONF_FILES=		${EGDIR}/enscript.cfg ${PKG_SYSCONFDIR}/enscript.cfg
-INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
 MAKE_ENV+=		prefix=${PREFIX}
 BUILD_DEFS+=		PAPERSIZE
 
diff --git a/print/enscript/PLIST b/print/enscript/PLIST
index 7acf1b6a26f..9f05bf815ac 100644
--- a/print/enscript/PLIST
+++ b/print/enscript/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:11:54 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/10/21 19:37:28 ryoon Exp $
 bin/diffpp
 bin/enscript
 bin/mkafmmap
@@ -89,6 +89,7 @@ share/enscript/hl/diffs.st
 share/enscript/hl/diffu.st
 share/enscript/hl/elisp.st
 share/enscript/hl/enscript.st
+share/enscript/hl/f90.st
 share/enscript/hl/fortran.st
 share/enscript/hl/fortran_pp.st
 share/enscript/hl/haskell.st
diff --git a/print/enscript/distinfo b/print/enscript/distinfo
index e41f1c62f2e..e5c6605963e 100644
--- a/print/enscript/distinfo
+++ b/print/enscript/distinfo
@@ -1,14 +1,6 @@
-$NetBSD: distinfo,v 1.10 2011/02/16 19:19:28 shattered Exp $
+$NetBSD: distinfo,v 1.11 2011/10/21 19:37:28 ryoon Exp $
 
-SHA1 (enscript-1.6.4.tar.gz) = 9dd7128a508d4c9671659b9520028d12add50cfa
-RMD160 (enscript-1.6.4.tar.gz) = 9050728f14500f0360c5a4e258cba0646694bfeb
-Size (enscript-1.6.4.tar.gz) = 1036734 bytes
-SHA1 (patch-aa) = 0b095dbb1681b121a417bd7b3fb2dff351fcfa86
-SHA1 (patch-ab) = 67cf45f43ad282174b5bbaf8c60be3448c76f235
-SHA1 (patch-ac) = d43a55bfde2afe9bf49ab8cdd6bf7b2205d3952b
-SHA1 (patch-ad) = 31e461f8b2647699a2847445703745a07994e571
-SHA1 (patch-ae) = 311ee615f231adbeece251606617065d306249ac
-SHA1 (patch-af) = ae3f6a37dab2ac1b5d95288555eeef5a25660547
-SHA1 (patch-ag) = aab78f9f1c9bc35f45d44498f0eec7c3ad82e33c
-SHA1 (patch-ah) = 6188dec56487a211b7028fdaf40e88aa14bccaf1
-SHA1 (patch-ai) = 141be819aa31212fe6edaf22e003a44864ff5fcb
+SHA1 (enscript-1.6.5.2.tar.gz) = b6d08e72e8e75e7c8a72c75a55c8de3bdebcf22c
+RMD160 (enscript-1.6.5.2.tar.gz) = 065f516bbeec8d2fd5f60b2e869312d7eb1b8a69
+Size (enscript-1.6.5.2.tar.gz) = 1318283 bytes
+SHA1 (patch-ai) = e0f5d63126f1d8c78f01d30f1dee6c890aabae4d
diff --git a/print/enscript/patches/patch-aa b/print/enscript/patches/patch-aa
deleted file mode 100644
index 6ed2accb8f7..00000000000
--- a/print/enscript/patches/patch-aa
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/02/13 18:53:28 abs Exp $
-
---- src/main.c.orig	2003-03-05 07:36:32.000000000 +0000
-+++ src/main.c
-@@ -1546,9 +1546,13 @@ name             width\theight\tllx\tlly
-       buffer_append (&cmd, intbuf);
-       buffer_append (&cmd, " ");
- 
--      buffer_append (&cmd, "-Ddocument_title=\"");
--      buffer_append (&cmd, title);
--      buffer_append (&cmd, "\" ");
-+      buffer_append (&cmd, "-Ddocument_title=\'");
-+      if ((cp = shell_escape (title)) != NULL)
-+	{
-+	  buffer_append (&cmd, cp);
-+	  free (cp);
-+	}
-+      buffer_append (&cmd, "\' ");
- 
-       buffer_append (&cmd, "-Dtoc=");
-       buffer_append (&cmd, toc ? "1" : "0");
-@@ -1565,8 +1569,14 @@ name             width\theight\tllx\tlly
-       /* Append input files. */
-       for (i = optind; i < argc; i++)
- 	{
--	  buffer_append (&cmd, " ");
--	  buffer_append (&cmd, argv[i]);
-+	  char *cp;
-+	  if ((cp = shell_escape (argv[i])) != NULL)
-+	    {
-+	      buffer_append (&cmd, " \'");
-+	      buffer_append (&cmd, cp);
-+	      buffer_append (&cmd, "\'");
-+	      free (cp);
-+	    }
- 	}
- 
-       /* And do the job. */
-@@ -1627,7 +1637,7 @@ name             width\theight\tllx\tlly
- 				 buffer_ptr (opts), buffer_len (opts));
- 	    }
- 
--	  buffer_append (&buffer, " \"%s\"");
-+	  buffer_append (&buffer, " \'%s\'");
- 
- 	  input_filter = buffer_copy (&buffer);
- 	  input_filter_stdin = "-";
diff --git a/print/enscript/patches/patch-ab b/print/enscript/patches/patch-ab
deleted file mode 100644
index 1217c51890c..00000000000
--- a/print/enscript/patches/patch-ab
+++ /dev/null
@@ -1,125 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2009/02/25 18:44:30 drochner Exp $
-
---- src/psgen.c.orig	2003-03-05 08:36:53.000000000 +0100
-+++ src/psgen.c
-@@ -24,6 +24,7 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#include <limits.h>
- #include "gsint.h"
- 
- /*
-@@ -124,7 +125,7 @@ struct gs_token_st
- 	  double xscale;
- 	  double yscale;
- 	  int llx, lly, urx, ury; /* Bounding box. */
--	  char filename[512];
-+	  char filename[PATH_MAX];
- 	  char *skipbuf;
- 	  unsigned int skipbuf_len;
- 	  unsigned int skipbuf_pos;
-@@ -135,11 +136,11 @@ struct gs_token_st
-       Color bgcolor;
-       struct
- 	{
--	  char name[512];
-+	  char name[PATH_MAX];
- 	  FontPoint size;
- 	  InputEncoding encoding;
- 	} font;
--      char filename[512];
-+      char filename[PATH_MAX];
-     } u;
- };
- 
-@@ -248,7 +249,7 @@ static int do_print = 1;
- static int user_fontp = 0;
- 
- /* The user ^@font{}-defined font. */
--static char user_font_name[256];
-+static char user_font_name[PATH_MAX];
- static FontPoint user_font_pt;
- static InputEncoding user_font_encoding;
- 
-@@ -978,7 +979,8 @@ large for page\n"),
- 			FATAL ((stderr,
- 				_("user font encoding can be only the system's default or `ps'")));
- 
--		      strcpy (user_font_name, token.u.font.name);
-+		      memset  (user_font_name, 0, sizeof(user_font_name));
-+		      strncpy (user_font_name, token.u.font.name, sizeof(user_font_name) - 1);
- 		      user_font_pt.w = token.u.font.size.w;
- 		      user_font_pt.h = token.u.font.size.h;
- 		      user_font_encoding = token.u.font.encoding;
-@@ -1444,7 +1446,7 @@ read_special_escape (InputStream *is, To
- 	  buf[i] = ch;
- 	  if (i + 1 >= sizeof (buf))
- 	    FATAL ((stderr, _("too long argument for %s escape:\n%.*s"),
--		    escapes[i].name, i, buf));
-+		    escapes[e].name, i, buf));
- 	}
-       buf[i] = '\0';
- 
-@@ -1452,7 +1454,8 @@ read_special_escape (InputStream *is, To
-       switch (escapes[e].escape)
- 	{
- 	case ESC_FONT:
--	  strcpy (token->u.font.name, buf);
-+	  memset  (token->u.font.name, 0, sizeof(token->u.font.name));
-+	  strncpy (token->u.font.name, buf, sizeof(token->u.font.name) - 1);
- 
- 	  /* Check for the default font. */
- 	  if (strcmp (token->u.font.name, "default") == 0)
-@@ -1465,7 +1468,8 @@ read_special_escape (InputStream *is, To
- 		FATAL ((stderr, _("malformed font spec for ^@font escape: %s"),
- 			token->u.font.name));
- 
--	      strcpy (token->u.font.name, cp);
-+	      memset  (token->u.font.name, 0, sizeof(token->u.font.name));
-+	      strncpy (token->u.font.name, cp, sizeof(token->u.font.name) - 1);
- 	      xfree (cp);
- 	    }
- 	  token->type = tFONT;
-@@ -1544,7 +1548,8 @@ read_special_escape (InputStream *is, To
- 	  break;
- 
- 	case ESC_SETFILENAME:
--	  strcpy (token->u.filename, buf);
-+	  memset  (token->u.filename, 0, sizeof(token->u.font.name));
-+	  strncpy (token->u.filename, buf, sizeof(token->u.filename) - 1);
- 	  token->type = tSETFILENAME;
- 	  break;
- 
-@@ -2034,8 +2039,9 @@ dump_ps_page_header (char *fname, int em
-   else
-     {
-       ftail++;
--      strncpy (buf, fname, ftail - fname);
--      buf[ftail - fname] = '\0';
-+      i = ftail - fname >= sizeof (buf)-1 ? sizeof (buf)-1 : ftail - fname;
-+      strncpy (buf, fname, i);
-+      buf[i] = '\0';
-     }
- 
-   if (nup > 1)
-@@ -2385,9 +2391,10 @@ recognize_eps_file (Token *token)
-   MESSAGE (2, (stderr, "^@epsf=\"%s\"\n", token->u.epsf.filename));
- 
-   i = strlen (token->u.epsf.filename);
-+  /*
-   if (i > 0 && token->u.epsf.filename[i - 1] == '|')
-     {
--      /* Read EPS data from pipe. */
-+      / * Read EPS data from pipe. * /
-       token->u.epsf.pipe = 1;
-       token->u.epsf.filename[i - 1] = '\0';
-       token->u.epsf.fp = popen (token->u.epsf.filename, "r");
-@@ -2400,6 +2407,7 @@ recognize_eps_file (Token *token)
- 	}
-     }
-   else
-+  */
-     {
-       char *filename;
- 
diff --git a/print/enscript/patches/patch-ac b/print/enscript/patches/patch-ac
deleted file mode 100644
index 66705857894..00000000000
--- a/print/enscript/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2009/02/13 18:53:28 abs Exp $
-
---- configure.orig	2003-03-05 07:40:58.000000000 +0000
-+++ configure
-@@ -1836,6 +1836,7 @@ echo "${ECHO_T}no" >&6
- fi
- 
- fi
-+fi
- if test -z "$ac_cv_prog_CC"; then
-   ac_ct_CC=$CC
-   # Extract the first word of "gcc", so it can be a program name with args.
-@@ -2816,7 +2817,6 @@ else
- fi
- 
- 
--fi
- 
- 
- 
diff --git a/print/enscript/patches/patch-ad b/print/enscript/patches/patch-ad
deleted file mode 100644
index 756cd2585aa..00000000000
--- a/print/enscript/patches/patch-ad
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2009/02/13 18:53:28 abs Exp $
-
---- src/util.c.orig	2003-03-05 07:26:32.000000000 +0000
-+++ src/util.c
-@@ -1239,6 +1239,8 @@ escape_string (char *string)
- 
-   /* Create result. */
-   cp = xmalloc (len + 1);
-+  if (cp == NULL)
-+      return NULL;
-   for (i = 0, j = 0; string[i]; i++)
-     switch (string[i])
-       {
-@@ -1879,6 +1881,7 @@ is_open (InputStream *is, FILE *fp, char
-       char *cmd = NULL;
-       int cmdlen;
-       int i, pos;
-+      char *cp;
- 
-       is->is_pipe = 1;
- 
-@@ -1902,12 +1905,16 @@ is_open (InputStream *is, FILE *fp, char
- 		{
- 		case 's':
- 		  /* Expand cmd-buffer. */
--		  cmdlen += strlen (fname);
-+		  if ((cp = shell_escape (fname)) != NULL)
-+		    {
-+		      cmdlen += strlen (cp);
- 		  cmd = xrealloc (cmd, cmdlen);
- 
- 		  /* Paste filename. */
--		  strcpy (cmd + pos, fname);
--		  pos += strlen (fname);
-+		      strcpy (cmd + pos, cp);
-+		      pos += strlen (cp);
-+		      free (cp);
-+		    }
- 
- 		  i++;
- 		  break;
-@@ -2116,3 +2123,36 @@ buffer_len (Buffer *buffer)
- {
-   return buffer->len;
- }
-+
-+/*
-+ * Escapes the name of a file so that the shell groks it in 'single'
-+ * quotation 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;
-+}
diff --git a/print/enscript/patches/patch-ae b/print/enscript/patches/patch-ae
deleted file mode 100644
index c7ff675bdf0..00000000000
--- a/print/enscript/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2009/02/13 18:53:28 abs Exp $
-
---- src/gsint.h.orig	2003-03-05 07:37:06.000000000 +0000
-+++ src/gsint.h
-@@ -701,4 +701,9 @@ FILE *printer_open ___P ((char *cmd, cha
-  */
- void printer_close ___P ((void *context));
- 
-+/*
-+ * Escape filenames for shell usage
-+ */
-+char *shell_escape ___P ((const char *fn));
-+
- #endif /* not GSINT_H */
diff --git a/print/enscript/patches/patch-af b/print/enscript/patches/patch-af
deleted file mode 100644
index 8f46c3f2ded..00000000000
--- a/print/enscript/patches/patch-af
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-af,v 1.2 2009/02/13 18:53:28 abs Exp $
-
---- states/hl/Makefile.in.orig	2003-03-05 07:40:07.000000000 +0000
-+++ states/hl/Makefile.in
-@@ -330,10 +330,10 @@ uninstall-am: uninstall-info-am uninstal
- 
- 
- install-data-local:
--	$(top_srcdir)/mkinstalldirs $(datadir)/enscript
--	$(top_srcdir)/mkinstalldirs $(datadir)/enscript/hl
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript/hl
- 	for f in $(states); do \
--	  $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/hl/$$f; \
-+	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(datadir)/enscript/hl/$$f; \
- 	done
- 
- uninstall-local:
diff --git a/print/enscript/patches/patch-ag b/print/enscript/patches/patch-ag
deleted file mode 100644
index 42f398cf877..00000000000
--- a/print/enscript/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2009/02/13 18:53:28 abs Exp $
-
---- afm/Makefile.in.orig	2003-03-05 07:40:06.000000000 +0000
-+++ afm/Makefile.in
-@@ -319,10 +319,10 @@ uninstall-am: uninstall-info-am uninstal
- 
- 
- install-data-local:
--	$(top_srcdir)/mkinstalldirs $(datadir)/enscript
--	$(top_srcdir)/mkinstalldirs $(datadir)/enscript/afm
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript/afm
- 	for f in $(EXTRA_DIST); do \
--	  $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/afm/$$f; \
-+	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(datadir)/enscript/afm/$$f; \
- 	done
- 
- uninstall-local:
diff --git a/print/enscript/patches/patch-ah b/print/enscript/patches/patch-ah
deleted file mode 100644
index c23aaf1d9ab..00000000000
--- a/print/enscript/patches/patch-ah
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2009/02/13 18:53:28 abs Exp $
-
---- lib/Makefile.in.orig	2003-03-05 07:40:07.000000000 +0000
-+++ lib/Makefile.in
-@@ -345,12 +345,12 @@ uninstall-am: uninstall-info-am uninstal
- all-local: enscript.cfg
- 
- install-data-local: enscript.cfg
--	$(top_srcdir)/mkinstalldirs $(sysconfdir)
--	if test -r $(sysconfdir)/enscript.cfg; then \
--	  cp $(sysconfdir)/enscript.cfg $(sysconfdir)/enscript.cfg.old; \
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
-+	if test -r $(DESTDIR)$(sysconfdir)/enscript.cfg; then \
-+	  cp $(DESTDIR)$(sysconfdir)/enscript.cfg $(DESTDIR)$(sysconfdir)/enscript.cfg.old; \
- 	else :; \
- 	fi
--	$(INSTALL_DATA) enscript.cfg $(sysconfdir)/enscript.cfg
-+	$(INSTALL_DATA) enscript.cfg $(DESTDIR)$(sysconfdir)/enscript.cfg
- 
- uninstall-local:
- 	rm -f $(sysconfdir)/enscript.cfg
diff --git a/print/enscript/patches/patch-ai b/print/enscript/patches/patch-ai
index af5a00ef5e6..b9e0fdd71fa 100644
--- a/print/enscript/patches/patch-ai
+++ b/print/enscript/patches/patch-ai
@@ -1,9 +1,9 @@
-$NetBSD: patch-ai,v 1.1 2011/02/16 19:19:28 shattered Exp $
+$NetBSD: patch-ai,v 1.2 2011/10/21 19:37:29 ryoon Exp $
 
 Highlight folded header lines properly (PR 36612)
 
---- states/hl/mail.st.orig	2003-03-05 08:26:33.000000000 +0100
-+++ states/hl/mail.st	2007-07-05 09:08:04.000000000 +0200
+--- states/hl/mail.st.orig	2009-01-11 19:21:13.000000000 +0000
++++ states/hl/mail.st
 @@ -27,7 +27,7 @@ state mail_header extends Highlight
    END {
      comment_face (true);