[pkgsrc/trunk]: pkgsrc/news/pan Make this build with gcc4, from PR 34237. Bum...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/da96a2118762
branches:  trunk
changeset: 518094:da96a2118762
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Thu Aug 31 12:04:25 2006 +0000

description:
Make this build with gcc4, from PR 34237. Bump PKGREVISION.

diffstat:

 news/pan/Makefile         |   4 +-
 news/pan/distinfo         |   3 +-
 news/pan/patches/patch-ai |  49 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 3 deletions(-)

diffs (79 lines):

diff -r 978adb16d87c -r da96a2118762 news/pan/Makefile
--- a/news/pan/Makefile Thu Aug 31 11:17:19 2006 +0000
+++ b/news/pan/Makefile Thu Aug 31 12:04:25 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2006/05/15 22:45:05 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2006/08/31 12:04:25 hubertf Exp $
 #
 
 DISTNAME=              pan-0.14.2
-PKGREVISION=           9
+PKGREVISION=           10
 CATEGORIES=            news
 MASTER_SITES=          http://pan.rebelbase.com/download/releases/${DISTNAME:C/pan-//}/SOURCE/
 EXTRACT_SUFX=          .tar.bz2
diff -r 978adb16d87c -r da96a2118762 news/pan/distinfo
--- a/news/pan/distinfo Thu Aug 31 11:17:19 2006 +0000
+++ b/news/pan/distinfo Thu Aug 31 12:04:25 2006 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.15 2005/02/24 12:19:55 agc Exp $
+$NetBSD: distinfo,v 1.16 2006/08/31 12:04:25 hubertf Exp $
 
 SHA1 (pan-0.14.2.tar.bz2) = 39c0128906d389524e24d55691e017cf509516a0
 RMD160 (pan-0.14.2.tar.bz2) = 0dff24b1d83b6fabfb9cc38a7dea5f9e99513009
 Size (pan-0.14.2.tar.bz2) = 1834784 bytes
 SHA1 (patch-aa) = bfa992f0ad8f2dfcfd1bb9c848ff774bc5cec2b6
+SHA1 (patch-ai) = 3d4f70a9e23f905bf2ff24c87b28539c4abb94bd
diff -r 978adb16d87c -r da96a2118762 news/pan/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/news/pan/patches/patch-ai Thu Aug 31 12:04:25 2006 +0000
@@ -0,0 +1,49 @@
+$NetBSD: patch-ai,v 1.1 2006/08/31 12:04:25 hubertf Exp $
+
+--- pan/base/msort.c.orig      2001-06-18 20:33:38.000000000 +0200
++++ pan/base/msort.c
+@@ -42,6 +42,7 @@ msort_with_tmp (
+ {
+       char *tmp;
+       char *b1, *b2;
++      unsigned long int *b1_ul, *b2_ul, *tmp_ul;
+       size_t n1, n2;
+       const int opsiz = sizeof(unsigned long int);
+ 
+@@ -57,24 +58,30 @@ msort_with_tmp (
+       msort_with_tmp (b2, n2, s, cmp, t);
+ 
+       tmp = t;
+-
+       if (s == opsiz && (b1 - (char *) 0) % opsiz == 0)
++      {
+               /* operating on aligned words.  Use direct word stores. */
++              b1_ul = (unsigned long int *) b1;
++              b2_ul = (unsigned long int *) b2;
++              tmp_ul = (unsigned long int *) tmp;
++
+               while (n1 > 0 && n2 > 0)
+               {
+-                      if ((*cmp) (b1, b2) <= 0)
++                      if ((*cmp) (b1_ul, b2_ul) <= 0)
+                       {
+                               --n1;
+-                              *((unsigned long int *) tmp)++ =
+-                                      *((unsigned long int *) b1)++;
++                              *tmp_ul++ = *b1_ul++;
+                       }
+                       else
+                       {
+                               --n2;
+-                              *((unsigned long int *) tmp)++ =
+-                                      *((unsigned long int *) b2)++;
++                              *tmp_ul++ = *b2_ul++;
+                       }
+               }
++              b1 = (char *) b1_ul;
++              b2 = (char *) b2_ul;
++              tmp = (char *) tmp_ul;
++      }
+       else
+               while (n1 > 0 && n2 > 0)
+               {