[pkgsrc/trunk]: pkgsrc/sysutils/tree merge patch (build fix for some platform...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/68e8f1f3505a
branches:  trunk
changeset: 397019:68e8f1f3505a
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Aug 08 05:20:02 2009 +0000

description:
merge patch (build fix for some platform where MB_CUR_MAX is not defined?)
from wip/tree to allow that package to go away.

diffstat:

 sysutils/tree/Makefile         |   4 ++--
 sysutils/tree/distinfo         |   6 +++---
 sysutils/tree/patches/patch-aa |  21 ++++++++++++++++++---
 sysutils/tree/patches/patch-ab |   6 +++---
 4 files changed, 26 insertions(+), 11 deletions(-)

diffs (85 lines):

diff -r 49094005f4ee -r 68e8f1f3505a sysutils/tree/Makefile
--- a/sysutils/tree/Makefile    Sat Aug 08 04:46:24 2009 +0000
+++ b/sysutils/tree/Makefile    Sat Aug 08 05:20:02 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/10/28 10:10:09 heinz Exp $
+# $NetBSD: Makefile,v 1.5 2009/08/08 05:20:02 tnn Exp $
 #
 
 DISTNAME=      tree-1.5.1.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils
 MASTER_SITES=  ftp://mama.indstate.edu/linux/tree/
 EXTRACT_SUFX=  .tgz
diff -r 49094005f4ee -r 68e8f1f3505a sysutils/tree/distinfo
--- a/sysutils/tree/distinfo    Sat Aug 08 04:46:24 2009 +0000
+++ b/sysutils/tree/distinfo    Sat Aug 08 05:20:02 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2007/10/28 16:18:02 heinz Exp $
+$NetBSD: distinfo,v 1.6 2009/08/08 05:20:02 tnn Exp $
 
 SHA1 (tree-1.5.1.1.tgz) = ca4145bf1d2957ff3f4e6af0f64ce92d102fd356
 RMD160 (tree-1.5.1.1.tgz) = 7cc78b7a0103a7f81ec40c2c5e1ff2399fd7bb20
 Size (tree-1.5.1.1.tgz) = 30792 bytes
-SHA1 (patch-aa) = 9dc8935975f6ccd8efab4c0b017d4806c22194d5
-SHA1 (patch-ab) = 3d2ac13f762bccc0bd45990b3f2aae64b2e12669
+SHA1 (patch-aa) = 813d77169d72bf52dccfa455bd5832d4f095afab
+SHA1 (patch-ab) = aec0fe0c3911eb16c35e770dd3bea3d946c34650
diff -r 49094005f4ee -r 68e8f1f3505a sysutils/tree/patches/patch-aa
--- a/sysutils/tree/patches/patch-aa    Sat Aug 08 04:46:24 2009 +0000
+++ b/sysutils/tree/patches/patch-aa    Sat Aug 08 05:20:02 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2007/10/28 10:27:34 heinz Exp $
+$NetBSD: patch-aa,v 1.4 2009/08/08 05:20:02 tnn Exp $
 
---- tree.c.orig        2007-06-11 15:22:06.000000000 +0200
+--- tree.c.orig        2007-06-11 22:22:06.000000000 +0900
 +++ tree.c
 @@ -17,7 +17,9 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -12,7 +12,22 @@
  #include <stdlib.h>
  #include <stdio.h>
  #include <time.h>
-@@ -619,7 +621,7 @@ void listdir(char *d, int *dt, int *ft, 
+@@ -179,10 +181,12 @@ char *sLevel, *curdir, *outfilename = NU
+ FILE *outfile;
+ int *dirs, maxdirs;
+ 
+-#ifdef CYGWIN
++#ifndef MB_CUR_MAX
++#  ifdef CYGWIN
+ extern int MB_CUR_MAX;
+-#else
++#  else
+ extern size_t MB_CUR_MAX;
++#  endif
+ #endif
+ 
+ int main(int argc, char **argv)
+@@ -619,7 +623,7 @@ void listdir(char *d, int *dt, int *ft, 
      if (!noindent) indent();
  
      path[0] = 0;
diff -r 49094005f4ee -r 68e8f1f3505a sysutils/tree/patches/patch-ab
--- a/sysutils/tree/patches/patch-ab    Sat Aug 08 04:46:24 2009 +0000
+++ b/sysutils/tree/patches/patch-ab    Sat Aug 08 05:20:02 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2007/10/28 10:10:10 heinz Exp $
+$NetBSD: patch-ab,v 1.4 2009/08/08 05:20:02 tnn Exp $
 
---- Makefile.orig      2007-06-11 15:22:47.000000000 +0200
+--- Makefile.orig      2007-06-11 22:22:47.000000000 +0900
 +++ Makefile
 @@ -8,7 +8,8 @@
  
@@ -17,7 +17,7 @@
  #LDFLAGS=-s -Zomf -Zsmall-conv
  
 -prefix = /usr
-+PREFIX = /usr
++PREFIX = /NONEXISTENT
  
  VERSION=1.5.1.1
  TREE_DEST=tree