Updated print/enscript to 1.6.4

pkgsrc changes:
    Add PKG_DESTDIR_SUPPORT, Set PAPERSIZE in BUILD_DEFS, pkglint

Changes since 1.6.3:
    2003-02-28  gettextize  <bug-gnu-gettext@gnu.org>

	* Makefile.am (SUBDIRS): Add intl.
	* configure.in (AC_OUTPUT): Add intl/Makefile,

    2003-02-28  gettextize  <bug-gnu-gettext@gnu.org>

	* Makefile.am (SUBDIRS): Add m4.
	(ACLOCAL_AMFLAGS): New variable.
	(EXTRA_DIST): Add config.rpath.
	* configure.in (AC_OUTPUT): Add po/Makefile.in,
	(AM_GNU_GETTEXT_VERSION): Bump to 0.11.5.

11 files changed, 121 insertions, 62 deletions

diff --git a/print/enscript/Makefile b/print/enscript/Makefile
index 3124da1a6eb..cdab9c2a21e 100644
--- a/print/enscript/Makefile
+++ b/print/enscript/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2006/10/24 15:39:18 obache Exp $
+# $NetBSD: Makefile,v 1.42 2009/02/13 18:53:28 abs Exp $
 #
 
-DISTNAME=		enscript-1.6.3
-PKGREVISION=		4
+DISTNAME=		enscript-1.6.4
 CATEGORIES=		print
 MASTER_SITES=		http://www.iki.fi/mtr/genscript/
 
@@ -16,11 +15,16 @@ USE_TOOLS+=		gmake lex perl:run xgettext
 BROKEN_GETTEXT_DETECTION=	yes
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-INFO_FILES=		# PLIST
+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}
+MAKE_ENV+=		prefix=${PREFIX}
+BUILD_DEFS+=		PAPERSIZE
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+INSTALLATION_DIRS+=	share/enscript/afm share/enscript/hl
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/print/enscript/PLIST b/print/enscript/PLIST
index 5e37b998358..3fbbbfc3c26 100644
--- a/print/enscript/PLIST
+++ b/print/enscript/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/17 07:07:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/02/13 18:53:28 abs Exp $
 bin/diffpp
 bin/enscript
 bin/mkafmmap
@@ -107,10 +107,7 @@ share/enscript/hl/lang_texinfo.st
 share/enscript/hl/m4.st
 share/enscript/hl/mail.st
 share/enscript/hl/makefile.st
-share/enscript/hl/maple.st
 share/enscript/hl/matlab.st
-share/enscript/hl/modula_2.st
-share/enscript/hl/nested.st
 share/enscript/hl/nroff.st
 share/enscript/hl/objc.st
 share/enscript/hl/outline.st
@@ -118,6 +115,7 @@ share/enscript/hl/pascal.st
 share/enscript/hl/passthrough.st
 share/enscript/hl/perl.st
 share/enscript/hl/postscript.st
+share/enscript/hl/pyrex.st
 share/enscript/hl/python.st
 share/enscript/hl/rfc.st
 share/enscript/hl/scheme.st
@@ -151,13 +149,19 @@ share/enscript/simple.hdr
 share/enscript/squeeze.hdr
 share/enscript/vms.enc
 share/examples/enscript/enscript.cfg
+share/locale/ca/LC_MESSAGES/enscript.mo
+share/locale/da/LC_MESSAGES/enscript.mo
 share/locale/de/LC_MESSAGES/enscript.mo
+share/locale/en_GB/LC_MESSAGES/enscript.mo
 share/locale/es/LC_MESSAGES/enscript.mo
-share/locale/fi/LC_MESSAGES/enscript.mo
 share/locale/fr/LC_MESSAGES/enscript.mo
+share/locale/hr/LC_MESSAGES/enscript.mo
 share/locale/nl/LC_MESSAGES/enscript.mo
+share/locale/pt_BR/LC_MESSAGES/enscript.mo
 share/locale/ru/LC_MESSAGES/enscript.mo
 share/locale/sl/LC_MESSAGES/enscript.mo
+share/locale/sv/LC_MESSAGES/enscript.mo
+share/locale/tr/LC_MESSAGES/enscript.mo
 @dirrm share/examples/enscript
 @dirrm share/enscript/hl
 @dirrm share/enscript/afm
diff --git a/print/enscript/distinfo b/print/enscript/distinfo
index bb076248073..f28e8e4775b 100644
--- a/print/enscript/distinfo
+++ b/print/enscript/distinfo
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.7 2008/11/14 03:25:55 chuck Exp $
+$NetBSD: distinfo,v 1.8 2009/02/13 18:53:28 abs Exp $
 
-SHA1 (enscript-1.6.3.tar.gz) = 2189c1f9b80160d4b2acac0f60cc7c7ff05f10aa
-RMD160 (enscript-1.6.3.tar.gz) = 7aafd03dad2e9a1fb3bbf61ed9b95ed6bef02921
-Size (enscript-1.6.3.tar.gz) = 814308 bytes
-SHA1 (patch-aa) = 4f958c8e2b01cf6934beebe249f1f67da2fb3f11
-SHA1 (patch-ab) = 13885dbd3aa0d0e90f8aa07640c4d917d7feaf13
-SHA1 (patch-ad) = b2f12cc6875289978194315927ccbc8e963476a2
-SHA1 (patch-ae) = 9a3209196eea1c6ed1f07f39fb7b4f1c35cdb850
-SHA1 (patch-af) = 654752413a8d1acb60ec4e6875d1b21cf4f0ac71
-SHA1 (patch-ag) = b68f44da44e07123139ff431e884201bd990ec5a
+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) = fa3103f949bf3a564afab7754a57de6b5c8cea3b
+SHA1 (patch-ac) = d43a55bfde2afe9bf49ab8cdd6bf7b2205d3952b
+SHA1 (patch-ad) = 31e461f8b2647699a2847445703745a07994e571
+SHA1 (patch-ae) = 311ee615f231adbeece251606617065d306249ac
+SHA1 (patch-af) = ae3f6a37dab2ac1b5d95288555eeef5a25660547
+SHA1 (patch-ag) = aab78f9f1c9bc35f45d44498f0eec7c3ad82e33c
+SHA1 (patch-ah) = 6188dec56487a211b7028fdaf40e88aa14bccaf1
diff --git a/print/enscript/patches/patch-aa b/print/enscript/patches/patch-aa
index 03e6b11ffd6..6ed2accb8f7 100644
--- a/print/enscript/patches/patch-aa
+++ b/print/enscript/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2005/03/17 12:24:13 salo Exp $
+$NetBSD: patch-aa,v 1.3 2009/02/13 18:53:28 abs Exp $
 
---- src/main.c.orig	2002-01-24 08:35:45.000000000 +0100
-+++ src/main.c	2005-03-17 11:52:58.000000000 +0100
-@@ -1546,9 +1546,13 @@
+--- 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, " ");
  
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.2 2005/03/17 12:24:13 salo Exp $
  
        buffer_append (&cmd, "-Dtoc=");
        buffer_append (&cmd, toc ? "1" : "0");
-@@ -1565,8 +1569,14 @@
+@@ -1565,8 +1569,14 @@ name             width\theight\tllx\tlly
        /* Append input files. */
        for (i = optind; i < argc; i++)
  	{
@@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.2 2005/03/17 12:24:13 salo Exp $
  	}
  
        /* And do the job. */
-@@ -1627,7 +1637,7 @@
+@@ -1627,7 +1637,7 @@ name             width\theight\tllx\tlly
  				 buffer_ptr (opts), buffer_len (opts));
  	    }
  
diff --git a/print/enscript/patches/patch-ab b/print/enscript/patches/patch-ab
index 77f72d304fd..a66f840b472 100644
--- a/print/enscript/patches/patch-ab
+++ b/print/enscript/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2005/03/17 12:24:13 salo Exp $
+$NetBSD: patch-ab,v 1.3 2009/02/13 18:53:28 abs Exp $
 
---- src/psgen.c.orig	2002-01-24 08:38:58.000000000 +0100
-+++ src/psgen.c	2005-03-17 11:56:57.000000000 +0100
-@@ -2034,8 +2034,9 @@
+--- src/psgen.c.orig	2003-03-05 07:36:53.000000000 +0000
++++ src/psgen.c
+@@ -2034,8 +2034,9 @@ dump_ps_page_header (char *fname, int em
    else
      {
        ftail++;
@@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.2 2005/03/17 12:24:13 salo Exp $
      }
  
    if (nup > 1)
-@@ -2385,9 +2386,10 @@
+@@ -2385,9 +2386,10 @@ recognize_eps_file (Token *token)
    MESSAGE (2, (stderr, "^@epsf=\"%s\"\n", token->u.epsf.filename));
  
    i = strlen (token->u.epsf.filename);
@@ -26,7 +26,7 @@ $NetBSD: patch-ab,v 1.2 2005/03/17 12:24:13 salo Exp $
        token->u.epsf.pipe = 1;
        token->u.epsf.filename[i - 1] = '\0';
        token->u.epsf.fp = popen (token->u.epsf.filename, "r");
-@@ -2400,6 +2402,7 @@
+@@ -2400,6 +2402,7 @@ recognize_eps_file (Token *token)
  	}
      }
    else
diff --git a/print/enscript/patches/patch-ac b/print/enscript/patches/patch-ac
new file mode 100644
index 00000000000..66705857894
--- /dev/null
+++ b/print/enscript/patches/patch-ac
@@ -0,0 +1,20 @@
+$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
index 85b3438c46d..756cd2585aa 100644
--- a/print/enscript/patches/patch-ad
+++ b/print/enscript/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2005/03/17 12:24:13 salo Exp $
+$NetBSD: patch-ad,v 1.2 2009/02/13 18:53:28 abs Exp $
 
---- src/util.c.orig	1999-09-17 17:26:51.000000000 +0200
-+++ src/util.c	2005-03-17 11:58:59.000000000 +0100
-@@ -1239,6 +1239,8 @@
+--- 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);
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1 2005/03/17 12:24:13 salo Exp $
    for (i = 0, j = 0; string[i]; i++)
      switch (string[i])
        {
-@@ -1879,6 +1881,7 @@
+@@ -1879,6 +1881,7 @@ is_open (InputStream *is, FILE *fp, char
        char *cmd = NULL;
        int cmdlen;
        int i, pos;
@@ -19,7 +19,7 @@ $NetBSD: patch-ad,v 1.1 2005/03/17 12:24:13 salo Exp $
  
        is->is_pipe = 1;
  
-@@ -1902,12 +1905,16 @@
+@@ -1902,12 +1905,16 @@ is_open (InputStream *is, FILE *fp, char
  		{
  		case 's':
  		  /* Expand cmd-buffer. */
@@ -39,7 +39,7 @@ $NetBSD: patch-ad,v 1.1 2005/03/17 12:24:13 salo Exp $
  
  		  i++;
  		  break;
-@@ -2116,3 +2123,36 @@
+@@ -2116,3 +2123,36 @@ buffer_len (Buffer *buffer)
  {
    return buffer->len;
  }
diff --git a/print/enscript/patches/patch-ae b/print/enscript/patches/patch-ae
index b491f84e82e..c7ff675bdf0 100644
--- a/print/enscript/patches/patch-ae
+++ b/print/enscript/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2005/03/17 12:24:13 salo Exp $
+$NetBSD: patch-ae,v 1.2 2009/02/13 18:53:28 abs Exp $
 
---- src/gsint.h.orig	2000-07-11 17:28:06.000000000 +0200
-+++ src/gsint.h	2005-03-17 12:00:10.000000000 +0100
-@@ -701,4 +701,9 @@
+--- 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));
  
diff --git a/print/enscript/patches/patch-af b/print/enscript/patches/patch-af
index 6c57532c0d2..8f46c3f2ded 100644
--- a/print/enscript/patches/patch-af
+++ b/print/enscript/patches/patch-af
@@ -1,15 +1,18 @@
-$NetBSD: patch-af,v 1.1 2008/11/14 03:25:55 chuck Exp $
+$NetBSD: patch-af,v 1.2 2009/02/13 18:53:28 abs Exp $
 
---- src/Makefile.in.orig	2008-11-13 22:19:15.000000000 -0500
-+++ src/Makefile.in	2008-11-13 22:19:30.000000000 -0500
-@@ -135,8 +135,8 @@
- mkafmmap_SOURCES = mkafmmap.c
+--- 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
  
- LDADD = ../afmlib/libafm.a @INTLLIBS@ ../compat/libcompat.a -lm
--enscript_DEPENDENCIES = ../afmlib/libafm.a @INTLLIBS@ ../compat/libcompat.a
--mkafmmap_DEPENDENCIES = ../afmlib/libafm.a @INTLLIBS@ ../compat/libcompat.a
-+enscript_DEPENDENCIES = ../afmlib/libafm.a @INTLDEPS@ ../compat/libcompat.a
-+mkafmmap_DEPENDENCIES = ../afmlib/libafm.a @INTLDEPS@ ../compat/libcompat.a
  
- noinst_HEADERS = gsint.h
+ 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
index e52c8fb2371..42f398cf877 100644
--- a/print/enscript/patches/patch-ag
+++ b/print/enscript/patches/patch-ag
@@ -1,13 +1,18 @@
-$NetBSD: patch-ag,v 1.1 2008/11/14 03:25:55 chuck Exp $
+$NetBSD: patch-ag,v 1.2 2009/02/13 18:53:28 abs Exp $
 
---- states/Makefile.in.orig	2008-11-13 22:19:35.000000000 -0500
-+++ states/Makefile.in	2008-11-13 22:19:48.000000000 -0500
-@@ -132,7 +132,7 @@
+--- 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
  
  
- LDADD = ../afmlib/libafm.a @INTLLIBS@ ../compat/libcompat.a @LEXLIB@
--states_DEPENDENCIES = @INTLLIBS@ ../compat/libcompat.a
-+states_DEPENDENCIES = @INTLDEPS@ ../compat/libcompat.a
- 
- noinst_HEADERS = defs.h gram.h
+ 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
new file mode 100644
index 00000000000..c23aaf1d9ab
--- /dev/null
+++ b/print/enscript/patches/patch-ah
@@ -0,0 +1,21 @@
+$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