Attachment 102979 Details for Bug 142830 – tree-1.5.3.patch

[patch] tree-1.5.3.patch

tree-1.5.3.patch (text/plain), 4.21 KB, created by Sofian Brabez on 2010-01-14 13:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sofian Brabez

Created: 2010-01-14 13:30:01 UTC

Size: 4.21 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/sysutils/tree/Makefile /tmp/tree/Makefile
>--- /usr/ports/sysutils/tree/Makefile	2009-02-07 06:37:11.000000000 +0100
>+++ /tmp/tree/Makefile	2010-01-14 14:02:52.000000000 +0100
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	tree
>-PORTVERSION=	1.5.2.2
>+PORTVERSION=	1.5.3
> CATEGORIES=	sysutils
> MASTER_SITES=	ftp://mama.indstate.edu/linux/tree/ \
> 		CENKES
>diff -ruN --exclude=CVS /usr/ports/sysutils/tree/distinfo /tmp/tree/distinfo
>--- /usr/ports/sysutils/tree/distinfo	2009-02-07 06:37:11.000000000 +0100
>+++ /tmp/tree/distinfo	2010-01-14 14:03:22.000000000 +0100
>@@ -1,3 +1,3 @@
>-MD5 (tree-1.5.2.2.tgz) = a7731a898e2c0d7e422a57a84ffbb06c
>-SHA256 (tree-1.5.2.2.tgz) = bfd4ceca156a9f20352c1b5d44312c5a223a7cac3480d6eaef46edadded7c539
>-SIZE (tree-1.5.2.2.tgz) = 33993
>+MD5 (tree-1.5.3.tgz) = c07ce9065667a23f27aca4de8ecccb10
>+SHA256 (tree-1.5.3.tgz) = 1128755ea9455615188212bb04319cf103114fb78f687aa887ce29ef184ffb8d
>+SIZE (tree-1.5.3.tgz) = 34494
>diff -ruN --exclude=CVS /usr/ports/sysutils/tree/files/patch-Makefile /tmp/tree/files/patch-Makefile
>--- /usr/ports/sysutils/tree/files/patch-Makefile	2009-02-07 06:37:11.000000000 +0100
>+++ /tmp/tree/files/patch-Makefile	2010-01-14 14:17:38.000000000 +0100
>@@ -1,8 +1,5 @@
>-
>-$FreeBSD: ports/sysutils/tree/files/patch-Makefile,v 1.8 2009/02/07 05:37:11 rafan Exp $
>-
>---- Makefile.orig
>-+++ Makefile
>+--- ./Makefile.orig	2010-01-14 14:04:12.000000000 +0100
>++++ ./Makefile	2010-01-14 14:08:21.000000000 +0100
> @@ -6,27 +6,27 @@
>  # warranties, including, without limitation, the implied warranties
>  # of merchant-ability and fitness for a particular purpose.
>@@ -13,7 +10,7 @@
> -CC=gcc
> +CC?=gcc
>  
>- VERSION=1.5.2.2
>+ VERSION=1.5.3
>  TREE_DEST=tree
>  BINDIR=${prefix}/bin
> -MAN=tree.1
>@@ -23,11 +20,10 @@
>  # Uncomment options below for your particular OS:
>  
>  # Linux defaults:
>- #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
>--CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
>--LDFLAGS=-s
>-+#CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
>-+#LDFLAGS=-s
>+-CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
>++#CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
>+ #CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
>+ #LDFLAGS=-s
>  
>  # Uncomment for FreeBSD:
> -#CFLAGS=-O2 -Wall -fomit-frame-pointer
>@@ -35,7 +31,7 @@
> -#XOBJS=strverscmp.o
> +CFLAGS?=-O2 -Wall -fomit-frame-pointer
> +LDFLAGS?=-s
>-+XOBJS=strverscmp.o
>++XOBJS?=strverscmp.o
>  
>  # Uncomment for Solaris:
>  #CC=cc
>diff -ruN --exclude=CVS /usr/ports/sysutils/tree/files/patch-tree.c /tmp/tree/files/patch-tree.c
>--- /usr/ports/sysutils/tree/files/patch-tree.c	2008-09-26 17:44:01.000000000 +0200
>+++ /tmp/tree/files/patch-tree.c	2010-01-14 14:16:47.000000000 +0100
>@@ -1,6 +1,6 @@
>---- tree.c.orig	2008-08-28 03:05:43.000000000 +0800
>-+++ tree.c	2008-09-22 21:37:05.000000000 +0800
>-@@ -663,7 +663,7 @@
>+--- ./tree.c.orig	2010-01-14 14:08:55.000000000 +0100
>++++ ./tree.c	2010-01-14 14:15:23.000000000 +0100
>+@@ -682,7 +682,7 @@
>  #ifdef __USE_FILE_OFFSET64
>      if (inodeflag) sprintf(path," %7lld",(*dir)->inode);
>  #else
>@@ -9,22 +9,23 @@
>  #endif
>      if (devflag) sprintf(path+strlen(path), " %3d", (int)(*dir)->dev);
>  #ifdef __EMX__
>-@@ -1087,8 +1087,10 @@
>+@@ -1106,8 +1106,10 @@
>    } else {
>      if (Hflag) fprintf(outfile,"<br>\t\t\t\t   ");
>-     for(i=0;dirs[i];i++) {
>-+      if( dirs[i] <= 0 )
>-+        break;
>+     for(i=0; dirs[i] && i <= maxlevel; i++) {
>++      if (dirs[i] <= 0)
>++         break;
>        fprintf(outfile,"%s ",
> -	      dirs[i+1] ? (dirs[i]==1 ? linedraw->vert     : (Hflag? "&nbsp;&nbsp;&nbsp;" : "   ") )
>-+          dirs[i+1] > 0 ? (dirs[i]==1 ? linedraw->vert     : (Hflag? "&nbsp;&nbsp;&nbsp;" : "   ") )
>++             dirs[i+1] > 0 ? (dirs[i]==1 ? linedraw->vert     : (Hflag? "&nbsp;&nbsp;&nbsp;" : "   ") )
>  			: (dirs[i]==1 ? linedraw->vert_left:linedraw->corner));
>      }
>    }
>-@@ -1276,7 +1276,12 @@
>+@@ -1294,8 +1296,12 @@
>+ {
>    char *unit="BKMGTPEZY";
>    int idx;
>- 
>+-
> -  if (!hflag) sprintf(buf, sizeof(off_t) == sizeof(long long)? " %11lld" : " %9ld", size);
> +  if (!hflag) {
> +	if (sizeof(off_t) == sizeof(__int64_t))

Actions: View | Diff

Attachments on bug 142830: 102979