From 9bd69db81ebcd57d1ade3d1bf670f5c35ff77778 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Wed, 30 May 2012 06:42:34 +0000
Subject: Fix build with gc-7.2b.

---
 www/w3m/distinfo         |  4 ++--
 www/w3m/patches/patch-ab | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'www/w3m')

diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index 0594a96ebb5..5e5a48feb29 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.23 2011/04/05 05:55:29 uebayasi Exp $
+$NetBSD: distinfo,v 1.24 2012/05/30 06:42:34 wiz Exp $
 
 SHA1 (w3m-0.5.3.tar.gz) = 444b6c8cf7094ee95f8e9de96b37f814b9d83237
 RMD160 (w3m-0.5.3.tar.gz) = 6a0153bc53f7c107c700404262ce1b4d02e6dd91
 Size (w3m-0.5.3.tar.gz) = 2202328 bytes
 SHA1 (patch-aa) = 2de78a6db9bd483416895b393935ccadab879932
-SHA1 (patch-ab) = 2d60d7a2946f13a185591c0b927cf0f8b5ea351b
+SHA1 (patch-ab) = e1264e0b5e0dc2a1aaf7cc1e6067afd556792dd4
 SHA1 (patch-ac) = 37c6c78a208c50876641aa90164cc46106403260
 SHA1 (patch-ak) = ac0ee99d5ab49c431cfa496d0d2d509efd6b06fa
 SHA1 (patch-al) = 8b393004eed249449151d1f2b9252fcb1b55922d
diff --git a/www/w3m/patches/patch-ab b/www/w3m/patches/patch-ab
index 8424ffaac28..63885677c27 100644
--- a/www/w3m/patches/patch-ab
+++ b/www/w3m/patches/patch-ab
@@ -1,10 +1,21 @@
-$NetBSD: patch-ab,v 1.11 2008/12/13 08:24:55 obache Exp $
+$NetBSD: patch-ab,v 1.12 2012/05/30 06:42:34 wiz Exp $
 
-Suspend the job w3m belongs to, not w3m only.
+First chunk: adapt for gc-7.2 API change.
+Second chunk: suspend the job w3m belongs to, not w3m only.
 
---- main.c.orig	2007-05-31 01:19:50.000000000 +0000
+--- main.c.orig	2011-01-04 09:42:19.000000000 +0000
 +++ main.c
-@@ -2496,7 +2496,17 @@ DEFUN(susp, INTERRUPT SUSPEND, "Stop loa
+@@ -833,7 +833,8 @@ main(int argc, char **argv, char **envp)
+     mySignal(SIGPIPE, SigPipe);
+ #endif
+ 
+-    orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
++    orig_GC_warn_proc = GC_get_warn_proc();
++    GC_set_warn_proc(wrap_GC_warn_proc);
+     err_msg = Strnew();
+     if (load_argc == 0) {
+ 	/* no URL specified */
+@@ -2517,7 +2518,17 @@ DEFUN(susp, INTERRUPT SUSPEND, "Stop loa
  	shell = "/bin/sh";
      system(shell);
  #else				/* SIGSTOP */
-- 
cgit v1.2.3