From yzlin@cs.nctu.edu.tw  Tue Sep 23 10:58:10 2008
Return-Path: <yzlin@cs.nctu.edu.tw>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BEEF3106566C
	for <bug-followup@FreeBSD.org>; Tue, 23 Sep 2008 10:58:10 +0000 (UTC)
	(envelope-from yzlin@cs.nctu.edu.tw)
Received: from csmailgate.cs.nctu.edu.tw (csmailgate.cs.nctu.edu.tw [140.113.235.103])
	by mx1.freebsd.org (Postfix) with ESMTP id 448758FC0C
	for <bug-followup@FreeBSD.org>; Tue, 23 Sep 2008 10:58:10 +0000 (UTC)
	(envelope-from yzlin@cs.nctu.edu.tw)
Received: from stucgi.cs.nctu.edu.tw (stucgi [140.113.235.130])
	by csmailgate.cs.nctu.edu.tw (Postfix) with ESMTP id BF9DD104857;
	Tue, 23 Sep 2008 18:41:27 +0800 (CST)
Received: (from yzlin@localhost)
	by stucgi.cs.nctu.edu.tw (8.14.2/8.14.2/Submit) id m8NAfQe1080377;
	Tue, 23 Sep 2008 18:41:26 +0800 (CST)
	(envelope-from yzlin)
Message-Id: <20080923104126.GB68847@stucgi.cs.nctu.edu.tw>
Date: Tue, 23 Sep 2008 18:41:26 +0800
From: Yi-Jheng Lin <yzlin@cs.nctu.edu.tw>
To: Guy Brand <gb@isis.u-strasbg.fr>
Cc: lwbsd@cs.nctu.edu.tw, bug-followup@FreeBSD.org
In-Reply-To: <20080922201809.GM3732@isis.u-strasbg.fr>
Subject: Re: [PATCH] sysutils/tree: update to 1.5.2.1
References: <200809220818.m8M8I0U9056263@stucgi.cs.nctu.edu.tw> <20080922092952.GG1668@isis.u-strasbg.fr> <20080922135044.GA24771@stucgi.cs.nctu.edu.tw> <20080922162051.GL1745@isis.u-strasbg.fr> <20080922200929.GA68583@stucgi.cs.nctu.edu.tw>

>Number:         127564
>Category:       ports
>Synopsis:       Re: [PATCH] sysutils/tree: update to 1.5.2.1
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 23 11:00:04 UTC 2008
>Closed-Date:    Tue Sep 23 16:20:06 UTC 2008
>Last-Modified:  Thu Dec 18 03:41:07 UTC 2008
>Originator:     
>Release:        
>Organization:
>Environment:
>Description:
 --sHrvAb52M6C8blB9
 Content-Type: multipart/mixed; boundary="UHN/qo2QbUvPLonB"
 Content-Disposition: inline
 
 
 --UHN/qo2QbUvPLonB
 Content-Type: text/plain; charset=utf-8
 Content-Disposition: inline
 
 The attachment is the new patch file.
 
 
 --UHN/qo2QbUvPLonB
 Content-Type: text/x-diff; charset=utf-8
 Content-Disposition: attachment; filename="tree-1.5.2.1.patch"
 Content-Transfer-Encoding: quoted-printable
 
 diff -ruN --exclude=3DCVS /usr/ports/sysutils/tree/Makefile /amd/account/gc=
 s/96/9655630/dev/ports/sysutils/tree/Makefile
 --- /usr/ports/sysutils/tree/Makefile	2008-04-27 03:27:48.000000000 +0800
 +++ /amd/account/gcs/96/9655630/dev/ports/sysutils/tree/Makefile	2008-09-22=
  16:16:32.000000000 +0800
 @@ -6,10 +6,10 @@
  #
 =20
  PORTNAME=3D	tree
 -PORTVERSION=3D	1.5.1.1
 -PORTREVISION=3D	1
 +PORTVERSION=3D	1.5.2.1
  CATEGORIES=3D	sysutils
 -MASTER_SITES=3D	ftp://mama.indstate.edu/linux/tree/ CENKES
 +MASTER_SITES=3D	ftp://mama.indstate.edu/linux/tree/ \
 +		CENKES
  EXTRACT_SUFX=3D	.tgz
 =20
  MAINTAINER=3D	gb@isis.u-strasbg.fr
 @@ -20,4 +20,12 @@
  MAN1=3D		tree.1
  PLIST_FILES=3D	bin/tree
 =20
 +PORTDOCS=3D	CHANGES LICENSE README
 +
 +post-install:
 +.if !defined(NOPORTDOCS)
 +	@${MKDIR} ${DOCSDIR}
 +	${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 +.endif
 +
  .include <bsd.port.mk>
 diff -ruN --exclude=3DCVS /usr/ports/sysutils/tree/distinfo /amd/account/gc=
 s/96/9655630/dev/ports/sysutils/tree/distinfo
 --- /usr/ports/sysutils/tree/distinfo	2007-08-02 03:21:07.000000000 +0800
 +++ /amd/account/gcs/96/9655630/dev/ports/sysutils/tree/distinfo	2008-09-22=
  15:45:55.000000000 +0800
 @@ -1,3 +1,3 @@
 -MD5 (tree-1.5.1.1.tgz) =3D f8fc70a9260b50bf8b4613e9d5f5e589
 -SHA256 (tree-1.5.1.1.tgz) =3D de16db952531f76f4e83f10e5eeb3f810b4bf984d4b1=
 1aa3378e71dfa1d13aec
 -SIZE (tree-1.5.1.1.tgz) =3D 30792
 +MD5 (tree-1.5.2.1.tgz) =3D 73d5fa220dfef1ee9c1876c3966f1c18
 +SHA256 (tree-1.5.2.1.tgz) =3D 9189a74ee6f740e48884e3eedf9b55013a8f4a46c1f4=
 48ce79bdf39ed9a708f4
 +SIZE (tree-1.5.2.1.tgz) =3D 33584
 diff -ruN --exclude=3DCVS /usr/ports/sysutils/tree/files/patch-Makefile /am=
 d/account/gcs/96/9655630/dev/ports/sysutils/tree/files/patch-Makefile
 --- /usr/ports/sysutils/tree/files/patch-Makefile	2007-08-02 03:21:07.00000=
 0000 +0800
 +++ /amd/account/gcs/96/9655630/dev/ports/sysutils/tree/files/patch-Makefil=
 e	2008-09-23 16:39:09.000000000 +0800
 @@ -1,37 +1,41 @@
 ---- Makefile.orig	Mon Jun 11 09:22:47 2007
 -+++ Makefile	Tue Jul 31 21:41:14 2007
 -@@ -6,14 +6,9 @@
 +--- Makefile.orig	2008-09-22 15:51:25.000000000 +0800
 ++++ Makefile	2008-09-22 15:56:58.000000000 +0800
 +@@ -6,27 +6,27 @@
   # warranties, including, without limitation, the implied warranties
   # of merchant-ability and fitness for a particular purpose.
  =20
 --CC=3Dgcc
 --#CFLAGS=3D-ggdb -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=3D64
 --CFLAGS=3D-O2 -Wall -fomit-frame-pointer -D_LARGEFILE64_SOURCE -D_FILE_OFF=
 SET_BITS=3D64
 --LDFLAGS=3D-s
 --
 - # Uncomment for FreeBSD:
 - #CC=3Dgcc
 --#CFLAGS=3D-O2 -Wall -fomit-frame-pointer
 -+CFLAGS=3D-O2 -Wall -fomit-frame-pointer
 - #LDFLAGS=3D-s
 -=20
 - # Uncomment for Cygwin:
 -@@ -38,12 +33,12 @@
 - #CFLAGS=3D-02 -Wall -fomit-frame-pointer -Zomf -Zsmall-conv
 - #LDFLAGS=3D-s -Zomf -Zsmall-conv
 -=20
  -prefix =3D /usr
  +prefix =3D ${PREFIX}
  =20
 - VERSION=3D1.5.1.1
 + CC=3Dgcc
 +=20
 + VERSION=3D1.5.2.1
   TREE_DEST=3Dtree
   BINDIR=3D${prefix}/bin
  -MAN=3Dtree.1
  +MAN=3Dman/tree.1
   MANDIR=3D${prefix}/man/man1
  =20
 - all:	tree
 -@@ -58,13 +53,11 @@
 + # Uncomment options below for your particular OS:
 +=20
 + # Linux defaults:
 + #CFLAGS=3D-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=
 =3D64
 +-CFLAGS=3D-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_=
 FILE_OFFSET_BITS=3D64
 +-LDFLAGS=3D-s
 ++#CFLAGS=3D-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D=
 _FILE_OFFSET_BITS=3D64
 ++#LDFLAGS=3D-s
 +=20
 + # Uncomment for FreeBSD:
 +-#CFLAGS=3D-O2 -Wall -fomit-frame-pointer
 +-#LDFLAGS=3D-s
 +-#XOBJS=3Dstrverscmp.o
 ++CFLAGS?=3D-O2 -Wall -fomit-frame-pointer
 ++LDFLAGS?=3D-s
 ++XOBJS=3Dstrverscmp.o
 +=20
 + # Uncomment for Cygwin:
 + #CFLAGS=3D-O2 -Wall -fomit-frame-pointer -DCYGWIN
 +@@ -68,13 +68,11 @@
   	if [ -f tree.o ]; then rm *.o; fi
   	rm -f *~
  =20
 diff -ruN --exclude=3DCVS /usr/ports/sysutils/tree/files/patch-tree.c /amd/=
 account/gcs/96/9655630/dev/ports/sysutils/tree/files/patch-tree.c
 --- /usr/ports/sysutils/tree/files/patch-tree.c	2008-04-27 03:27:48.0000000=
 00 +0800
 +++ /amd/account/gcs/96/9655630/dev/ports/sysutils/tree/files/patch-tree.c	=
 2008-09-23 03:55:02.000000000 +0800
 @@ -1,62 +1,37 @@
 ---- tree.c.orig	Tue Jan  9 23:07:16 2007
 -+++ tree.c	Thu Jan 25 18:58:28 2007
 -@@ -17,7 +17,6 @@
 -  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  =
 USA
 -  */
 -=20
 --#include <features.h>
 - #include <stdlib.h>
 - #include <stdio.h>
 - #include <time.h>
 -@@ -148,7 +147,7 @@
 - int findino(ino_t, dev_t);
 - void *xmalloc(size_t), *xrealloc(void *, size_t);
 - void listdir(char *, int *, int *, u_long, dev_t), usage(int);
 --void parse_dir_colors(), printit(unsigned char *), free_dir(struct _info =
 **), indent();
 -+void parse_dir_colors(), printit(char *), free_dir(struct _info **), inde=
 nt();
 - void saveino(ino_t, dev_t);
 - char **split(char *, char *, int *);
 - char *gidtoname(int), *uidtoname(int), *do_date(time_t);
 -@@ -178,12 +177,6 @@
 - char *sLevel, *curdir, *outfilename =3D NULL;
 - FILE *outfile;
 - int *dirs, maxdirs;
 --
 --#ifdef CYGWIN
 --extern int MB_CUR_MAX;
 --#else
 --extern size_t MB_CUR_MAX;
 --#endif
 -=20
 - int main(int argc, char **argv)
 - {
 -@@ -622,7 +615,7 @@
 +--- 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 @@
   #ifdef __USE_FILE_OFFSET64
       if (inodeflag) sprintf(path," %7lld",(*dir)->inode);
   #else
  -    if (inodeflag) sprintf(path," %7ld",(*dir)->inode);
 -+    if (inodeflag) sprintf(path," %7i",(*dir)->inode);
 ++    if (inodeflag) sprintf(path," %7u",(*dir)->inode);
   #endif
       if (devflag) sprintf(path+strlen(path), " %3d", (int)(*dir)->dev);
   #ifdef __EMX__
 -@@ -1041,8 +1034,10 @@
 +@@ -1087,8 +1087,10 @@
     } else {
       if (Hflag) fprintf(outfile,"<br>\t\t\t\t   ");
       for(i=3D0;dirs[i];i++) {
  +      if( dirs[i] <=3D 0 )
 -+          break;
 ++        break;
         fprintf(outfile,"%s ",
  -	      dirs[i+1] ? (dirs[i]=3D=3D1 ? linedraw->vert     : (Hflag? "&nbsp;=
 &nbsp;&nbsp;" : "   ") )
 -+	      dirs[i+1] > 0 ? (dirs[i]=3D=3D1 ? linedraw->vert     : (Hflag? "&n=
 bsp;&nbsp;&nbsp;" : "   ") )
 ++          dirs[i+1] > 0 ? (dirs[i]=3D=3D1 ? linedraw->vert     : (Hflag? =
 "&nbsp;&nbsp;&nbsp;" : "   ") )
   			: (dirs[i]=3D=3D1 ? linedraw->vert_left:linedraw->corner));
       }
     }
 -@@ -1180,7 +1175,7 @@
 -   return t->name;
 - }
 -=20
 --void printit(unsigned char *s)
 -+void printit(char *s)
 - {
 -   int c;
 +@@ -1276,7 +1276,12 @@
 +   char *unit=3D"BKMGTPEZY";
 +   int idx;
  =20
 +-  if (!hflag) sprintf(buf, sizeof(off_t) =3D=3D sizeof(long long)? " %11l=
 ld" : " %9ld", size);
 ++  if (!hflag) {
 ++	if (sizeof(off_t) =3D=3D sizeof(__int64_t))
 ++	  sprintf(buf, sizeof(long) =3D=3D sizeof(long long) ? " %11ld" : " %11l=
 ld", size);
 ++	else
 ++	  sprintf(buf, sizeof(long) =3D=3D sizeof(long long) ? " %9ld" : " %9lld=
 ", size);
 ++  }
 +   else {
 +     for (idx=3Dsize<1024?0:1; size >=3D (1024*1024); idx++,size>>=3D10);
 +     if (!idx) sprintf(buf, " %4d", (int)size);
 
 --UHN/qo2QbUvPLonB--
 
 --sHrvAb52M6C8blB9
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (FreeBSD)
 
 iEYEARECAAYFAkjYx9UACgkQBPkQzQ9N7oXkmACdEhR3SsZM5hL4Bo6bHByK45QZ
 jYQAnArzCToovKyuqe9qEvMPVzweLckO
 =bAET
 -----END PGP SIGNATURE-----
 
 --sHrvAb52M6C8blB9--
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Tue Sep 23 16:19:28 UTC 2008 
State-Changed-Why:  
Misfiled followup to ports/127535; content migrated. 


Responsible-Changed-From-To: gnats-admin->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Sep 23 16:19:28 UTC 2008 
Responsible-Changed-Why:  

http://www.freebsd.org/cgi/query-pr.cgi?pr=127564 
>Unformatted:
