diff options
| author | hubertf <hubertf> | 2006-08-31 12:04:25 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2006-08-31 12:04:25 +0000 |
| commit | ce5cd348217165f783281cedc36d262f1358df91 (patch) | |
| tree | 77a4bee4798ff17f9b21004644ac9f0e43de9f13 | |
| parent | 26afc342aa40a2c16139a491dcff05b1b4ed4adf (diff) | |
| download | pkgsrc-ce5cd348217165f783281cedc36d262f1358df91.tar.gz | |
Make this build with gcc4, from PR 34237. Bump PKGREVISION.
| -rw-r--r-- | news/pan/Makefile | 4 | ||||
| -rw-r--r-- | news/pan/distinfo | 3 | ||||
| -rw-r--r-- | news/pan/patches/patch-ai | 49 |
3 files changed, 53 insertions, 3 deletions
diff --git a/news/pan/Makefile b/news/pan/Makefile index 6297929d2d9..a17205700b5 100644 --- a/news/pan/Makefile +++ b/news/pan/Makefile @@ -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 --git a/news/pan/distinfo b/news/pan/distinfo index e5cca905550..1b1bec94957 100644 --- a/news/pan/distinfo +++ b/news/pan/distinfo @@ -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 --git a/news/pan/patches/patch-ai b/news/pan/patches/patch-ai new file mode 100644 index 00000000000..11a2e9ba051 --- /dev/null +++ b/news/pan/patches/patch-ai @@ -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) + { |