[pkgsrc/trunk]: pkgsrc/print/web2c Make web2c build with the recent kpathsea.

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8dd35e1d4b60
branches:  trunk
changeset: 394415:8dd35e1d4b60
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Tue Jun 09 21:32:03 2009 +0000

description:
Make web2c build with the recent kpathsea.

diffstat:

 print/web2c/distinfo         |   3 +-
 print/web2c/patches/patch-ak |  47 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletions(-)

diffs (68 lines):

diff -r 22e6e5a5c377 -r 8dd35e1d4b60 print/web2c/distinfo
--- a/print/web2c/distinfo      Tue Jun 09 21:31:03 2009 +0000
+++ b/print/web2c/distinfo      Tue Jun 09 21:32:03 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2009/04/11 21:32:46 minskim Exp $
+$NetBSD: distinfo,v 1.3 2009/06/09 21:32:03 minskim Exp $
 
 SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d
 RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38
@@ -13,6 +13,7 @@
 SHA1 (patch-ah) = b518352ae6b2839b2790550b422f1c2860821350
 SHA1 (patch-ai) = 85d011bd5023ea6ef984836d49d7b8d439ce725a
 SHA1 (patch-aj) = 986cae97bbe29164ab0e5ab2b0f9dc9d7c6f8e10
+SHA1 (patch-ak) = 6315532bc4929dcec2d06d1112e424f74a2ae7a9
 SHA1 (patch-al) = b8fc7bad60bffac60a48dccc63af2b9b736b84f0
 SHA1 (patch-am) = fbca2d97fe693b6d964f596e79908680a6e03965
 SHA1 (patch-an) = e2cb5013c035fd9d3ec288af37b7c4f40c6648eb
diff -r 22e6e5a5c377 -r 8dd35e1d4b60 print/web2c/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/web2c/patches/patch-ak      Tue Jun 09 21:32:03 2009 +0000
@@ -0,0 +1,47 @@
+$NetBSD: patch-ak,v 1.3 2009/06/09 21:32:03 minskim Exp $
+
+Avoid using program_invocation_name (r12635).
+
+--- web2c/splitup.c.orig       2008-03-24 08:47:15.000000000 -0700
++++ web2c/splitup.c
+@@ -9,11 +9,30 @@
+ #include "config.h"
+ #include <kpathsea/getopt.h>
+ 
++#if defined (FATAL)
++#undef FATAL
++#endif
++
++#define FATAL(str) do {                                                 \
++        fprintf (stderr, "%s: fatal: ", argv[0]);                       \
++        fputs (str, stderr);                                            \
++        fputs (".\n", stderr); exit (1); } while (0)
++
++
++#if defined (FATAL1)
++#undef FATAL1
++#endif
++
++#define FATAL1(str, e1) do {                                            \
++        fprintf (stderr, "%s: fatal: ", argv[0]);                       \
++        fprintf (stderr, str, e1);                                      \
++        fputs (".\n", stderr); exit (1); } while (0)
++
++
+ #ifdef VMS
+ #define unlink delete
+ #endif
+ 
+-char *program_invocation_name;
+ int filenumber = 0, ifdef_nesting = 0, lines_in_file = 0;
+ char *output_name = NULL;
+ boolean has_ini;
+@@ -63,8 +82,6 @@ main P2C(int, argc, string *, argv)
+   unsigned coerce_len;
+   int option;
+ 
+-  program_invocation_name = argv[0];
+-  
+   while ((option = getopt(argc, argv, "il:")) != -1) {
+     switch (option) {
+     case 'i':