View | Details | Raw Unified | Return to bug 142830
Collapse All | Expand All

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

Return to bug 142830