From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Apr 26 10:00:02 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 282215CF for ; Sat, 26 Apr 2014 10:00:02 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 038CB192B for ; Sat, 26 Apr 2014 10:00:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s3QA01NI008586 for ; Sat, 26 Apr 2014 10:00:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s3QA013l008584; Sat, 26 Apr 2014 10:00:01 GMT (envelope-from gnats) Resent-Date: Sat, 26 Apr 2014 10:00:01 GMT Resent-Message-Id: <201404261000.s3QA013l008584@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Boris Samorodov Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 87BD95AD for ; Sat, 26 Apr 2014 09:57:43 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 67645191A for ; Sat, 26 Apr 2014 09:57:43 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s3Q9vgtw044701 for ; Sat, 26 Apr 2014 09:57:42 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s3Q9vgVn044700; Sat, 26 Apr 2014 09:57:42 GMT (envelope-from nobody) Message-Id: <201404260957.s3Q9vgVn044700@cgiserv.freebsd.org> Date: Sat, 26 Apr 2014 09:57:42 GMT From: Boris Samorodov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/189011: [patch] print/enscript-letter and fiends: stagify and update to version 1.6.6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Apr 2014 10:00:02 -0000 >Number: 189011 >Category: ports >Synopsis: [patch] print/enscript-letter and fiends: stagify and update to version 1.6.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Apr 26 10:00:01 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Boris Samorodov >Release: FreeBSD 10-amd64 >Organization: BSDprint >Environment: FreeBSD srv.bb.tel.ru 10.0-RELEASE-p1 FreeBSD 10.0-RELEASE-p1 #0: Tue Apr 8 06:45:06 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: A new version is available: http://www.gnu.org/software/enscript/ >How-To-Repeat: >Fix: . support STAGE; . update to version 1.6.6; . use new MASTERSITE; . update WWW at pkg-desrc. Note to a committer: print/enscript-letter/files directory has been removed. Patch attached with submission follows: Index: enscript-a4/Makefile =================================================================== --- enscript-a4/Makefile (revision 352230) +++ enscript-a4/Makefile (working copy) @@ -8,5 +8,4 @@ MASTERDIR= ${.CURDIR}/../enscript-letter -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Index: enscript-letter/Makefile =================================================================== --- enscript-letter/Makefile (revision 352230) +++ enscript-letter/Makefile (working copy) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= enscript -PORTVERSION= 1.6.4 -PORTREVISION= 5 +PORTVERSION= 1.6.6 CATEGORIES+= print -MASTER_SITES= http://www.codento.com/people/mtr/genscript/ +MASTER_SITES= GNU PKGNAMESUFFIX= -${PAPERSIZE} DISTNAME= enscript-${PORTVERSION} @@ -14,12 +13,10 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls --with-media=${PS} -NO_STAGE= yes -CONFLICTS?= enscript-a4-* enscript-letterdj-* +#CONFLICTS?= enscript-a4-* enscript-letterdj-* INFO= enscript -MAN1= diffpp.1 enscript.1 sliceprint.1 states.1 PAPERSIZE?= letter PS?= Letter @@ -31,4 +28,7 @@ @${FALSE} .endif +post-configure: + ${REINPLACE_CMD} -e 's|/usr/bin/perl|$${prefix}/bin/perl|g' ${WRKSRC}/scripts/Makefile + .include Index: enscript-letter/distinfo =================================================================== --- enscript-letter/distinfo (revision 352230) +++ enscript-letter/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (enscript-1.6.4.tar.gz) = 45299a4db47c9c08c3649d4f62b211ae79ef5143360c264a40371a728f6ad99b -SIZE (enscript-1.6.4.tar.gz) = 1036734 +SHA256 (enscript-1.6.6.tar.gz) = 6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb +SIZE (enscript-1.6.6.tar.gz) = 1330493 Index: enscript-letter/files/patch-CVE-2008-3863-and-4306 =================================================================== --- enscript-letter/files/patch-CVE-2008-3863-and-4306 (revision 352230) +++ enscript-letter/files/patch-CVE-2008-3863-and-4306 (working copy) @@ -1,94 +0,0 @@ -Patch for CVE-2008-3863 and CVE-2008-4306 - -Obtained from: http://cvs.fedoraproject.org/viewvc/devel/enscript/enscript-CVE-2008-3863%2BCVE-2008-4306.patch?revision=1.1 - ---- src/psgen.c -+++ src/psgen.c 2008-10-29 10:43:08.512598143 +0100 -@@ -24,6 +24,7 @@ - * Boston, MA 02111-1307, USA. - */ - -+#include - #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; Index: enscript-letter/files/patch-Makefile.in =================================================================== --- enscript-letter/files/patch-Makefile.in (revision 352230) +++ enscript-letter/files/patch-Makefile.in (working copy) @@ -1,15 +0,0 @@ ---- 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) Index: enscript-letter/files/patch-configure =================================================================== --- enscript-letter/files/patch-configure (revision 352230) +++ enscript-letter/files/patch-configure (working copy) @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- configure.orig -+++ configure -@@ -1793,7 +1793,6 @@ - - fi; - --if test "X$CC" = "X"; then - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -2816,7 +2815,6 @@ - fi - - --fi - - - Index: enscript-letter/files/patch-enscript.st =================================================================== --- enscript-letter/files/patch-enscript.st (revision 352230) +++ enscript-letter/files/patch-enscript.st (working copy) @@ -1,19 +0,0 @@ ---- 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; Index: enscript-letter/files/patch-ruby.st =================================================================== --- enscript-letter/files/patch-ruby.st (revision 352230) +++ enscript-letter/files/patch-ruby.st (working copy) @@ -1,208 +0,0 @@ ---- 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 -+ */ -+ -+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); -+ } -+} Index: enscript-letter/files/patch-src_gsint.h =================================================================== --- enscript-letter/files/patch-src_gsint.h (revision 352230) +++ enscript-letter/files/patch-src_gsint.h (working copy) @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- src/gsint.h.orig -+++ src/gsint.h -@@ -701,4 +701,9 @@ - */ - void printer_close ___P ((void *context)); - -+/* -+ * Escape filenames for shell usage -+ */ -+char *shell_escape ___P ((const char *fn)); -+ - #endif /* not GSINT_H */ Index: enscript-letter/files/patch-src_main.c =================================================================== --- enscript-letter/files/patch-src_main.c (revision 352230) +++ enscript-letter/files/patch-src_main.c (working copy) @@ -1,48 +0,0 @@ - -$FreeBSD$ - ---- src/main.c.orig -+++ src/main.c -@@ -1546,9 +1546,13 @@ - 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 @@ - /* 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 @@ - buffer_ptr (opts), buffer_len (opts)); - } - -- buffer_append (&buffer, " \"%s\""); -+ buffer_append (&buffer, " \'%s\'"); - - input_filter = buffer_copy (&buffer); - input_filter_stdin = "-"; Index: enscript-letter/files/patch-src_psgen.c =================================================================== --- enscript-letter/files/patch-src_psgen.c (revision 352230) +++ enscript-letter/files/patch-src_psgen.c (working copy) @@ -1,37 +0,0 @@ - -$FreeBSD$ - ---- src/psgen.c.orig -+++ src/psgen.c -@@ -2034,8 +2034,9 @@ - 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 +2386,10 @@ - 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 +2402,7 @@ - } - } - else -+ */ - { - char *filename; - Index: enscript-letter/files/patch-src_util.c =================================================================== --- enscript-letter/files/patch-src_util.c (revision 352230) +++ enscript-letter/files/patch-src_util.c (working copy) @@ -1,82 +0,0 @@ - -$FreeBSD$ - ---- src/util.c.orig -+++ src/util.c -@@ -1239,6 +1239,8 @@ - - /* 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 @@ - char *cmd = NULL; - int cmdlen; - int i, pos; -+ char *cp; - - is->is_pipe = 1; - -@@ -1902,12 +1905,16 @@ - { - case 's': - /* Expand cmd-buffer. */ -- cmdlen += strlen (fname); -- cmd = xrealloc (cmd, cmdlen); -+ if ((cp = shell_escape (fname)) != NULL) -+ { -+ cmdlen += strlen (cp); -+ cmd = xrealloc (cmd, cmdlen); - -- /* Paste filename. */ -- strcpy (cmd + pos, fname); -- pos += strlen (fname); -+ /* Paste filename. */ -+ strcpy (cmd + pos, cp); -+ pos += strlen (cp); -+ free (cp); -+ } - - i++; - break; -@@ -2115,4 +2122,37 @@ - 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; - } Index: enscript-letter/pkg-descr =================================================================== --- enscript-letter/pkg-descr (revision 352230) +++ enscript-letter/pkg-descr (working copy) @@ -4,4 +4,4 @@ Tcl, and more, can optionally be pretty-printed instead of printed as plain-text. Many printing options are available. -WWW: http://www.codento.com/people/mtr/genscript/ +WWW: http://www.gnu.org/software/enscript/ Index: enscript-letter/pkg-plist =================================================================== --- enscript-letter/pkg-plist (revision 352230) +++ enscript-letter/pkg-plist (working copy) @@ -4,7 +4,12 @@ bin/over bin/sliceprint bin/states -etc/enscript.cfg +%%ETCDIR%%.cfg +info/dir +man/man1/diffpp.1.gz +man/man1/enscript.1.gz +man/man1/sliceprint.1.gz +man/man1/states.1.gz %%DATADIR%%/88591.enc %%DATADIR%%/885910.enc %%DATADIR%%/88592.enc @@ -14,6 +19,7 @@ %%DATADIR%%/88597.enc %%DATADIR%%/88599.enc %%DATADIR%%/a2ps.hdr +%%DATADIR%%/afm/MustRead.html %%DATADIR%%/afm/agd.afm %%DATADIR%%/afm/agdo.afm %%DATADIR%%/afm/agw.afm @@ -84,6 +90,7 @@ %%DATADIR%%/hl/diffu.st %%DATADIR%%/hl/elisp.st %%DATADIR%%/hl/enscript.st +%%DATADIR%%/hl/f90.st %%DATADIR%%/hl/fortran.st %%DATADIR%%/hl/fortran_pp.st %%DATADIR%%/hl/haskell.st @@ -113,7 +120,6 @@ %%DATADIR%%/hl/pyrex.st %%DATADIR%%/hl/python.st %%DATADIR%%/hl/rfc.st -%%DATADIR%%/hl/ruby.st %%DATADIR%%/hl/scheme.st %%DATADIR%%/hl/sh.st %%DATADIR%%/hl/skill.st Index: enscript-letterdj/Makefile =================================================================== --- enscript-letterdj/Makefile (revision 352230) +++ enscript-letterdj/Makefile (working copy) @@ -8,5 +8,4 @@ MASTERDIR= ${.CURDIR}/../enscript-letter -NO_STAGE= yes .include "${MASTERDIR}/Makefile" >Release-Note: >Audit-Trail: >Unformatted: