6 files changed, 369 insertions, 286 deletions

diff --git a/print/enscript-letter/Makefile b/print/enscript-letter/Makefile
index 7601386fb707..632547a49fdc 100644
--- a/print/enscript-letter/Makefile
+++ b/print/enscript-letter/Makefile
@@ -6,21 +6,24 @@
 #
 
 PORTNAME=	enscript-${PAPERSIZE}
-PORTVERSION=	1.6.1
-PORTREVISION=	2
+PORTVERSION=	1.6.4
 CATEGORIES+=	print
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	enscript
+MASTER_SITES=	http://people.ssh.com/mtr/genscript/
 DISTNAME=	enscript-${PORTVERSION}
 
 MAINTAINER=	kline@thought.org
 COMMENT=	ASCII-to-PostScript filter
 
+# Work around configure issue
+CC=
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--disable-nls --with-media=${PS}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAKE_FLAGS=	WIDTH=${WIDTH} HEIGHT=${HEIGHT} A4_PAPERSIZE=${A4_PAPERSIZE} -f
 
+INFO=		enscript
 MAN1=		diffpp.1 enscript.1 sliceprint.1 states.1
 STRIP=
 
@@ -28,7 +31,7 @@ STRIP=
 #LDFLAGS+=-static
 
 PAPERSIZE?=	letter
-PS!=		echo ${PAPERSIZE} | tr l L | tr a A
+PS!=		${ECHO} ${PAPERSIZE} | tr l L | tr a A
 
 .if ${PAPERSIZE} == a4
 WIDTH=8.27
diff --git a/print/enscript-letter/distinfo b/print/enscript-letter/distinfo
index 950a1a3fb831..dafb8aef9636 100644
--- a/print/enscript-letter/distinfo
+++ b/print/enscript-letter/distinfo
@@ -1 +1,2 @@
-MD5 (enscript-1.6.1.tar.gz) = 5ebcd29011806fb038b088a6adbda8b2
+MD5 (enscript-1.6.4.tar.gz) = b5174b59e4a050fb462af5dbf28ebba3
+SIZE (enscript-1.6.4.tar.gz) = 1036734
diff --git a/print/enscript-letter/files/patch-Makefile.in b/print/enscript-letter/files/patch-Makefile.in
new file mode 100644
index 000000000000..c2dcb562a18b
--- /dev/null
+++ b/print/enscript-letter/files/patch-Makefile.in
@@ -0,0 +1,15 @@
+--- states/hl/Makefile.in.orig	Wed Mar  5 01:40:07 2003
++++ states/hl/Makefile.in	Tue Mar  2 06:33:27 2004
+@@ -186,9 +186,9 @@
+ diffs.st diffu.st elisp.st fortran.st fortran_pp.st haskell.st html.st	\
+ idl.st inf.st java.st javascript.st ksh.st m4.st mail.st makefile.st	\
+ matlab.st nroff.st objc.st outline.st pascal.st passthrough.st perl.st	\
+-postscript.st python.st pyrex.st rfc.st scheme.st sh.st skill.st	\
+-sql.st states.st synopsys.st tcl.st tcsh.st tex.st vba.st verilog.st	\
+-vhdl.st vrml.st wmlscript.st zsh.st
++postscript.st python.st pyrex.st rfc.st ruby.st scheme.st sh.st		\
++skill.st sql.st states.st synopsys.st tcl.st tcsh.st tex.st vba.st	\
++verilog.st vhdl.st vrml.st wmlscript.st zsh.st
+ 
+ 
+ states = $(misc) $(styles) $(languages) $(highlightings)
diff --git a/print/enscript-letter/files/patch-enscript.st b/print/enscript-letter/files/patch-enscript.st
index c990fd77bba4..24e3b6916151 100644
--- a/print/enscript-letter/files/patch-enscript.st
+++ b/print/enscript-letter/files/patch-enscript.st
@@ -1,239 +1,19 @@
-*** states/enscript.st.bak	Mon Feb  5 14:38:08 2001
---- states/enscript.st	Wed Feb  7 08:51:50 2001
-***************
-*** 1285,1290 ****
---- 1285,1291 ----
-    /\.idl$/				idl;
-    /\.(hs|lhs|gs|lgs)$/			haskell;
-    /\.(pm|pl)$/				perl;
-+   /\.(rb|rbw)$/				ruby;
-    /\.(eps|EPS|ps|PS)$/			postscript;
-    /\.py$/				python;
-    /\.js$/				javascript;
-***************
-*** 1313,1318 ****
---- 1314,1321 ----
-    /-\*- [Ii][Dd][Ll] -\*-/				idl;
-    /-\*- [Pp][Ee][Rr][Ll] -\*-/				perl;
-    /^#![ \t]*\/.*\/perl/					perl;
-+   /-\*- [Rr][Uu][Bb][Yy] -\*-/                          ruby;
-+   /^#![ \t]*\/.*\/(env )?ruby/                                 ruby;
-    /^\04?%!/						postscript;
-    /^From:/						mail;
-    /^#![ \t]*(\/usr)?\/bin\/[ngmt]?awk/			awk;
-***************
-*** 4530,4535 ****
---- 4533,4745 ----
-  
-  }
-  
-+ 
-+ /**
-+  * Name: ruby
-+  * Description: Ruby programming language.
-+  * Author: Mike Wilson <m.v.wilson@home.com>
-+  */
-+ 
-+ state ruby_comment
-+ {
-+   /\*\\\// {
-+     language_print ($0);
-+     return;
-+   }
-+   LANGUAGE_SPECIALS {
-+    language_print ($0);
-+   }
-+ }
-+ 
-+ state ruby_dquot_string
-+ {
-+   /\\\\./ {
-+     language_print ($0);
-+   }
-+   /\"/ {
-+     language_print ($0);
-+     return;
-+   }
-+   LANGUAGE_SPECIALS {
-+     language_print ($0);
-+   }
-+ }
-+ 
-+ state ruby_quot_string
-+ {
-+   /\\\\./ {
-+     language_print ($0);
-+   }
-+   /[\']/ {
-+     language_print ($0);
-+     return;
-+   }
-+   LANGUAGE_SPECIALS {
-+     language_print ($0);
-+   }
-+ }
-+ 
-+ state ruby_bquot_string
-+ {
-+   /\\\\./ {
-+     language_print ($0);
-+   }
-+   /`/ {
-+     language_print ($0);
-+     return;
-+   }
-+   LANGUAGE_SPECIALS {
-+     language_print ($0);
-+   }
-+ }
-+ 
-+ state ruby
-+ {
-+   BEGIN {
-+     header ();
-+   }
-+   END {
-+     trailer ();
-+   }
-+ 
-+   /* Comments. */
-+   /#[^{].*$/ {
-+     comment_face (true);
-+     language_print ($0);
-+     comment_face (false);
-+   }
-+ 
-+   /* Ignore escaped quote marks */
-+   /\\\"/ {
-+     language_print ($0);
-+   }
-+   /\\\'/ {
-+     language_print ($0);
-+   }
-+   /\\\`/ {
-+     language_print ($0);
-+   }
-+ 
-+   /* In cgi files, JavaScript might be imbedded, so we need to look out
-+    * for the JavaScript comments, because they might contain something
-+    * we don't like, like a contraction (don't, won't, etc.)
-+    * We won't put them in comment face, because they are not ruby
-+    * comments.
-+    */
-+   /\/\// {
-+     language_print ($0);
-+     call (eat_one_line);
-+   }
-+ 
-+   /* String constants. */
-+   /\"/ {
-+     string_face (true);
-+     language_print ($0);
-+     call (ruby_dquot_string);
-+     string_face (false);
-+   }
-+   /[\']/ {
-+     string_face (true);
-+     language_print ($0);
-+     call (ruby_quot_string);
-+     string_face (false);
-+   }
-+ 
-+   /* Backquoted command string */
-+   /`/ {
-+     string_face (true);
-+     language_print ($0);
-+     call (ruby_bquot_string);
-+     string_face (false);
-+   }
-+ 
-+   /* Variables globals and instance */
-+   /[$@]\w+/ {
-+     variable_name_face (true);
-+     language_print ($0);
-+     variable_name_face (false);
-+   }
-+ 
-+   /* Variables class variable */
-+   /@@\w+/ {
-+     variable_name_face (true);
-+     language_print ($0);
-+     variable_name_face (false);
-+   }
-+ 
-+    /([ \t]*)(def)([ \t]+)([^(]*)/ {
-+     /* indentation */
-+     language_print ($1);
-+ 
-+     /* def */
-+     keyword_face (true);
-+     language_print ($2);
-+     keyword_face (false);
-+ 
-+     /* middle */
-+     language_print ($3);
-+ 
-+     /* Function name. */
-+     function_name_face (true);
-+     language_print ($4);
-+     function_name_face (false);
-+   }
-+ 
-+   /\$[!@&`'+~=\/\\,;.<>_*$?:"]/ {
-+     variable_name_face (true);
-+     language_print ($0);
-+     variable_name_face (false);
-+   }
-+ 
-+   /* Highlighting
-+ 	--Type face
-+  	private protected public
-+ 
-+ 	--Builtin face (I consider these to be somewhat special)
-+ 	alias alias_method attr attr_accessor attr_reader attr_writer 
-+ 	module_alias module_function self super
-+ 
-+ 	--Reference face
-+ 	require include
-+ 
-+ 	--Keyword face
-+ 	and begin break case class def defined? do else elsif end 
-+ 	ensure eval extend false for if in method module next nil not 
-+ 	or redo rescue retry return then true undef unless until when
-+ 	while yield
-+    */
-+ /\\b(private|protected|public)\\b/ {
-+     type_face (true);
-+     language_print ($0);
-+     type_face (false);
-+   }
-+ 
-+ /\\b(alias|alias_method|attr|attr_accessor|attr_reader|attr_writer\\
-+ |module_alias|module_function|self|super)\\b/ {
-+     builtin_face (true);
-+     language_print ($0);
-+     builtin_face (false);
-+   }
-+ 
-+ /\\b(include|require)\\b/ {
-+     reference_face (true);
-+     language_print ($0);
-+     reference_face (false);
-+   }
-+ 
-+ /\\b(and|begin|break|case|class|def|defined?|do|else|elsif|end|ensure|eval\\
-+ |extend|false|for|if|in|method|module|next|nil|not|or|raise|redo|rescue|retry\\
-+ |return|then|true|undef|unless|until|when|while|yield)\\b/ {
-+     keyword_face (true);
-+     language_print ($0);
-+     keyword_face (false);
-+   }
-+ 
-+   LANGUAGE_SPECIALS {
-+     language_print ($0);
-+   }
-+ }
-+ 
-  
-  /**
-   * Name: scheme
+--- states/hl/enscript.st.orig	Wed Mar  5 02:31:31 2003
++++ states/hl/enscript.st	Tue Mar  2 06:09:12 2004
+@@ -489,6 +489,7 @@
+   /\.idl$/					idl;
+   /\.(hs|lhs|gs|lgs)$/				haskell;
+   /\.(pm|pl)$/					perl;
++  /\.(rb|rbw)$/					ruby;
+   /\.(eps|EPS|ps|PS)$/				postscript;
+   /\.py$/					python;
+   /\.pyx$/					pyrex;
+@@ -530,6 +531,8 @@
+   /-\*- [Ii][Dd][Ll] -\*-/				idl;
+   /-\*- [Pp][Ee][Rr][Ll] -\*-/				perl;
+   /^#![ \t]*\/.*\/perl/					perl;
++  /-\*- [Rr][Uu][Bb][Yy] -\*-/				ruby;
++  /^#![ \t]*\/.*\/(env )?ruby/				ruby;
+   /^From:/						mail;
+   /^#![ \t]*(\/usr)?\/bin\/[ngmt]?awk/			awk;
+   /^#![ \t]*(\/usr)?\/bin\/sh/				sh;
diff --git a/print/enscript-letter/files/patch-ruby.st b/print/enscript-letter/files/patch-ruby.st
new file mode 100644
index 000000000000..a34b4fd61f04
--- /dev/null
+++ b/print/enscript-letter/files/patch-ruby.st
@@ -0,0 +1,208 @@
+--- states/hl/ruby.st.orig	Wed Dec 31 18:00:00 1969
++++ states/hl/ruby.st	Tue Mar  2 06:11:05 2004
+@@ -0,0 +1,205 @@
++/**
++ * Name: ruby
++ * Description: Ruby programming language.
++ * Author: Mike Wilson <m.v.wilson@home.com>
++ */
++
++state ruby_comment
++{
++  /\*\\\// {
++    language_print ($0);
++    return;
++  }
++  LANGUAGE_SPECIALS {
++   language_print ($0);
++  }
++}
++
++state ruby_dquot_string
++{
++  /\\\\./ {
++    language_print ($0);
++  }
++  /\"/ {
++    language_print ($0);
++    return;
++  }
++  LANGUAGE_SPECIALS {
++    language_print ($0);
++  }
++}
++
++state ruby_quot_string
++{
++  /\\\\./ {
++    language_print ($0);
++  }
++  /[\']/ {
++    language_print ($0);
++    return;
++  }
++  LANGUAGE_SPECIALS {
++    language_print ($0);
++  }
++}
++
++state ruby_bquot_string
++{
++  /\\\\./ {
++    language_print ($0);
++  }
++  /`/ {
++    language_print ($0);
++    return;
++  }
++  LANGUAGE_SPECIALS {
++    language_print ($0);
++  }
++}
++
++state ruby
++{
++  BEGIN {
++    header ();
++  }
++  END {
++    trailer ();
++  }
++
++  /* Comments. */
++  /#[^{].*$/ {
++    comment_face (true);
++    language_print ($0);
++    comment_face (false);
++  }
++
++  /* Ignore escaped quote marks */
++  /\\\"/ {
++    language_print ($0);
++  }
++  /\\\'/ {
++    language_print ($0);
++  }
++  /\\\`/ {
++    language_print ($0);
++  }
++
++  /* In cgi files, JavaScript might be imbedded, so we need to look out
++   * for the JavaScript comments, because they might contain something
++   * we don't like, like a contraction (don't, won't, etc.)
++   * We won't put them in comment face, because they are not ruby
++   * comments.
++   */
++  /\/\// {
++    language_print ($0);
++    call (eat_one_line);
++  }
++
++  /* String constants. */
++  /\"/ {
++    string_face (true);
++    language_print ($0);
++    call (ruby_dquot_string);
++    string_face (false);
++  }
++  /[\']/ {
++    string_face (true);
++    language_print ($0);
++    call (ruby_quot_string);
++    string_face (false);
++  }
++
++  /* Backquoted command string */
++  /`/ {
++    string_face (true);
++    language_print ($0);
++    call (ruby_bquot_string);
++    string_face (false);
++  }
++
++  /* Variables globals and instance */
++  /[$@]\w+/ {
++    variable_name_face (true);
++    language_print ($0);
++    variable_name_face (false);
++  }
++
++  /* Variables class variable */
++  /@@\w+/ {
++    variable_name_face (true);
++    language_print ($0);
++    variable_name_face (false);
++  }
++
++   /([ \t]*)(def)([ \t]+)([^(]*)/ {
++    /* indentation */
++    language_print ($1);
++
++    /* def */
++    keyword_face (true);
++    language_print ($2);
++    keyword_face (false);
++
++    /* middle */
++    language_print ($3);
++
++    /* Function name. */
++    function_name_face (true);
++    language_print ($4);
++    function_name_face (false);
++  }
++
++  /\$[!@&`'+~=\/\\,;.<>_*$?:"]/ {
++    variable_name_face (true);
++    language_print ($0);
++    variable_name_face (false);
++  }
++
++  /* Highlighting
++        --Type face
++        private protected public
++
++        --Builtin face (I consider these to be somewhat special)
++        alias alias_method attr attr_accessor attr_reader attr_writer
++        module_alias module_function self super
++
++        --Reference face
++        require include
++
++        --Keyword face
++        and begin break case class def defined? do else elsif end
++        ensure eval extend false for if in method module next nil not
++        or redo rescue retry return then true undef unless until when
++        while yield
++   */
++/\\b(private|protected|public)\\b/ {
++    type_face (true);
++    language_print ($0);
++    type_face (false);
++  }
++
++/\\b(alias|alias_method|attr|attr_accessor|attr_reader|attr_writer\\
++|module_alias|module_function|self|super)\\b/ {
++    builtin_face (true);
++    language_print ($0);
++    builtin_face (false);
++  }
++
++/\\b(include|require)\\b/ {
++    reference_face (true);
++    language_print ($0);
++    reference_face (false);
++  }
++
++/\\b(and|begin|break|case|class|def|defined?|do|else|elsif|end|ensure|eval\\
++|extend|false|for|if|in|method|module|next|nil|not|or|raise|redo|rescue|retry\\
++|return|then|true|undef|unless|until|when|while|yield)\\b/ {
++    keyword_face (true);
++    language_print ($0);
++    keyword_face (false);
++  }
++
++  LANGUAGE_SPECIALS {
++    language_print ($0);
++  }
++}
diff --git a/print/enscript-letter/pkg-plist b/print/enscript-letter/pkg-plist
index 4b1ac920db06..cb98cc1eccac 100644
--- a/print/enscript-letter/pkg-plist
+++ b/print/enscript-letter/pkg-plist
@@ -6,68 +6,144 @@ bin/sliceprint
 bin/states
 etc/enscript.cfg
 share/enscript/88591.enc
+share/enscript/885910.enc
 share/enscript/88592.enc
 share/enscript/88593.enc
 share/enscript/88594.enc
 share/enscript/88595.enc
 share/enscript/88597.enc
+share/enscript/88599.enc
 share/enscript/a2ps.hdr
-share/enscript/agd.afm
-share/enscript/agdo.afm
-share/enscript/agw.afm
-share/enscript/agwo.afm
+share/enscript/afm/agd.afm
+share/enscript/afm/agdo.afm
+share/enscript/afm/agw.afm
+share/enscript/afm/agwo.afm
+share/enscript/afm/bkd.afm
+share/enscript/afm/bkdi.afm
+share/enscript/afm/bkl.afm
+share/enscript/afm/bkli.afm
+share/enscript/afm/cob.afm
+share/enscript/afm/cobo.afm
+share/enscript/afm/com.afm
+share/enscript/afm/coo.afm
+share/enscript/afm/font.map
+share/enscript/afm/hv.afm
+share/enscript/afm/hvb.afm
+share/enscript/afm/hvbo.afm
+share/enscript/afm/hvc.afm
+share/enscript/afm/hvcb.afm
+share/enscript/afm/hvcbo.afm
+share/enscript/afm/hvcdo.afm
+share/enscript/afm/hvn.afm
+share/enscript/afm/hvnb.afm
+share/enscript/afm/hvnbo.afm
+share/enscript/afm/hvno.afm
+share/enscript/afm/hvo.afm
+share/enscript/afm/matrix.afm
+share/enscript/afm/matrix.pfa
+share/enscript/afm/ncb.afm
+share/enscript/afm/ncbi.afm
+share/enscript/afm/nci.afm
+share/enscript/afm/ncr.afm
+share/enscript/afm/pob.afm
+share/enscript/afm/pobi.afm
+share/enscript/afm/poi.afm
+share/enscript/afm/por.afm
+share/enscript/afm/sy.afm
+share/enscript/afm/tib.afm
+share/enscript/afm/tibi.afm
+share/enscript/afm/tii.afm
+share/enscript/afm/tir.afm
+share/enscript/afm/zcmi.afm
+share/enscript/afm/zd.afm
 share/enscript/ascii.enc
 share/enscript/asciidkno.enc
 share/enscript/asciifise.enc
-share/enscript/bkd.afm
-share/enscript/bkdi.afm
-share/enscript/bkl.afm
-share/enscript/bkli.afm
-share/enscript/cob.afm
-share/enscript/cobo.afm
-share/enscript/com.afm
-share/enscript/coo.afm
 share/enscript/edd.hdr
 share/enscript/emacs.hdr
+share/enscript/enscript-color.hdr
 share/enscript/enscript.hdr
 share/enscript/enscript.pro
-share/enscript/enscript.st
-share/enscript/font.map
 share/enscript/frame.hdr
+share/enscript/hl/ada.st
+share/enscript/hl/asm.st
+share/enscript/hl/awk.st
+share/enscript/hl/bash.st
+share/enscript/hl/c.st
+share/enscript/hl/c_comment.st
+share/enscript/hl/c_ppline.st
+share/enscript/hl/c_string.st
+share/enscript/hl/changelog.st
+share/enscript/hl/cpp.st
+share/enscript/hl/csh.st
+share/enscript/hl/default_faces.st
+share/enscript/hl/delphi.st
+share/enscript/hl/describe_languages.st
+share/enscript/hl/diff.st
+share/enscript/hl/diffs.st
+share/enscript/hl/diffu.st
+share/enscript/hl/elisp.st
+share/enscript/hl/enscript.st
+share/enscript/hl/fortran.st
+share/enscript/hl/fortran_pp.st
+share/enscript/hl/haskell.st
+share/enscript/hl/html.st
+share/enscript/hl/idl.st
+share/enscript/hl/inf.st
+share/enscript/hl/java.st
+share/enscript/hl/javascript.st
+share/enscript/hl/ksh.st
+share/enscript/hl/lang_ansi.st
+share/enscript/hl/lang_enscript.st
+share/enscript/hl/lang_html.st
+share/enscript/hl/lang_overstrike.st
+share/enscript/hl/lang_rtf.st
+share/enscript/hl/lang_texinfo.st
+share/enscript/hl/m4.st
+share/enscript/hl/mail.st
+share/enscript/hl/makefile.st
+share/enscript/hl/matlab.st
+share/enscript/hl/nroff.st
+share/enscript/hl/objc.st
+share/enscript/hl/outline.st
+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/ruby.st
+share/enscript/hl/scheme.st
+share/enscript/hl/sh.st
+share/enscript/hl/skill.st
+share/enscript/hl/sql.st
+share/enscript/hl/states.st
+share/enscript/hl/style_a2ps.st
+share/enscript/hl/style_emacs.st
+share/enscript/hl/style_emacs_verbose.st
+share/enscript/hl/style_ifh.st
+share/enscript/hl/style_msvc.st
+share/enscript/hl/synopsys.st
+share/enscript/hl/tcl.st
+share/enscript/hl/tcsh.st
+share/enscript/hl/tex.st
+share/enscript/hl/vba.st
+share/enscript/hl/verilog.st
+share/enscript/hl/vhdl.st
+share/enscript/hl/vrml.st
+share/enscript/hl/wmlscript.st
+share/enscript/hl/zsh.st
 share/enscript/hp8.enc
-share/enscript/hv.afm
-share/enscript/hvb.afm
-share/enscript/hvbo.afm
-share/enscript/hvc.afm
-share/enscript/hvcb.afm
-share/enscript/hvcbo.afm
-share/enscript/hvcdo.afm
-share/enscript/hvn.afm
-share/enscript/hvnb.afm
-share/enscript/hvnbo.afm
-share/enscript/hvno.afm
-share/enscript/hvo.afm
 share/enscript/ibmpc.enc
 share/enscript/koi8.enc
 share/enscript/mac.enc
 share/enscript/mp.hdr
-share/enscript/ncb.afm
-share/enscript/ncbi.afm
-share/enscript/nci.afm
-share/enscript/ncr.afm
-share/enscript/pob.afm
-share/enscript/pobi.afm
-share/enscript/poi.afm
-share/enscript/por.afm
 share/enscript/ps.enc
 share/enscript/pslatin1.enc
 share/enscript/simple.hdr
-share/enscript/sy.afm
-share/enscript/tib.afm
-share/enscript/tibi.afm
-share/enscript/tii.afm
-share/enscript/tir.afm
+share/enscript/squeeze.hdr
 share/enscript/vms.enc
-share/enscript/zcmi.afm
-share/enscript/zd.afm
+@dirrm share/enscript/afm
+@dirrm share/enscript/hl
 @dirrm share/enscript