Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Sep 2008 16:18:00 +0800 (CST)
From:      Yi-Jheng Lin <yzlin@cs.nctu.edu.tw>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        gb@isis.u-strasbg.fr
Subject:   ports/127535: [PATCH] sysutils/tree: update to 1.5.2.1
Message-ID:  <200809220818.m8M8I0U9056263@stucgi.cs.nctu.edu.tw>
Resent-Message-ID: <200809220820.m8M8K17A001173@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         127535
>Category:       ports
>Synopsis:       [PATCH] sysutils/tree: update to 1.5.2.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 22 08:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Yi-Jheng Lin
>Release:        FreeBSD 7.0-RELEASE-p4 amd64
>Organization:
NCTU CS
>Environment:
System: FreeBSD stucgi 7.0-RELEASE-p4 FreeBSD 7.0-RELEASE-p4 #0: Fri Sep  5 14:56:26 CST
>Description:
- Update to 1.5.2.1

Removed file(s):
- files/patch-tree.c

Port maintainer (gb@isis.u-strasbg.fr) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- tree-1.5.2.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/tree/Makefile /amd/account/gcs/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 @@
 #
 
 PORTNAME=	tree
-PORTVERSION=	1.5.1.1
-PORTREVISION=	1
+PORTVERSION=	1.5.2.1
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://mama.indstate.edu/linux/tree/ CENKES
+MASTER_SITES=	ftp://mama.indstate.edu/linux/tree/ \
+		CENKES
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	gb@isis.u-strasbg.fr
@@ -20,4 +20,12 @@
 MAN1=		tree.1
 PLIST_FILES=	bin/tree
 
+PORTDOCS=	CHANGES LICENSE README
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
+.endif
+
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/sysutils/tree/distinfo /amd/account/gcs/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) = f8fc70a9260b50bf8b4613e9d5f5e589
-SHA256 (tree-1.5.1.1.tgz) = de16db952531f76f4e83f10e5eeb3f810b4bf984d4b11aa3378e71dfa1d13aec
-SIZE (tree-1.5.1.1.tgz) = 30792
+MD5 (tree-1.5.2.1.tgz) = 73d5fa220dfef1ee9c1876c3966f1c18
+SHA256 (tree-1.5.2.1.tgz) = 9189a74ee6f740e48884e3eedf9b55013a8f4a46c1f448ce79bdf39ed9a708f4
+SIZE (tree-1.5.2.1.tgz) = 33584
diff -ruN --exclude=CVS /usr/ports/sysutils/tree/files/patch-Makefile /amd/account/gcs/96/9655630/dev/ports/sysutils/tree/files/patch-Makefile
--- /usr/ports/sysutils/tree/files/patch-Makefile	2007-08-02 03:21:07.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/sysutils/tree/files/patch-Makefile	2008-09-22 15:57:05.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.
  
--CC=gcc
--#CFLAGS=-ggdb -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--CFLAGS=-O2 -Wall -fomit-frame-pointer -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--LDFLAGS=-s
--
- # Uncomment for FreeBSD:
- #CC=gcc
--#CFLAGS=-O2 -Wall -fomit-frame-pointer
-+CFLAGS=-O2 -Wall -fomit-frame-pointer
- #LDFLAGS=-s
- 
- # Uncomment for Cygwin:
-@@ -38,12 +33,12 @@
- #CFLAGS=-02 -Wall -fomit-frame-pointer -Zomf -Zsmall-conv
- #LDFLAGS=-s -Zomf -Zsmall-conv
- 
 -prefix = /usr
 +prefix = ${PREFIX}
  
- VERSION=1.5.1.1
+ CC=gcc
+ 
+ VERSION=1.5.2.1
  TREE_DEST=tree
  BINDIR=${prefix}/bin
 -MAN=tree.1
 +MAN=man/tree.1
  MANDIR=${prefix}/man/man1
  
- all:	tree
-@@ -58,13 +53,11 @@
+ # 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
+ 
+ # Uncomment for FreeBSD:
+-#CFLAGS=-O2 -Wall -fomit-frame-pointer
+-#LDFLAGS=-s
+-#XOBJS=strverscmp.o
++CFLAGS=-O2 -Wall -fomit-frame-pointer
++LDFLAGS=-s
++XOBJS=strverscmp.o
+ 
+ # Uncomment for Cygwin:
+ #CFLAGS=-O2 -Wall -fomit-frame-pointer -DCYGWIN
+@@ -68,13 +68,11 @@
  	if [ -f tree.o ]; then rm *.o; fi
  	rm -f *~
  
diff -ruN --exclude=CVS /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.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/sysutils/tree/files/patch-tree.c	1970-01-01 08:00:00.000000000 +0800
@@ -1,62 +0,0 @@
---- 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
-  */
- 
--#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 **), indent();
- 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 = NULL;
- FILE *outfile;
- int *dirs, maxdirs;
--
--#ifdef CYGWIN
--extern int MB_CUR_MAX;
--#else
--extern size_t MB_CUR_MAX;
--#endif
- 
- int main(int argc, char **argv)
- {
-@@ -622,7 +615,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);
- #endif
-     if (devflag) sprintf(path+strlen(path), " %3d", (int)(*dir)->dev);
- #ifdef __EMX__
-@@ -1041,8 +1034,10 @@
-   } else {
-     if (Hflag) fprintf(outfile,"<br>\t\t\t\t   ");
-     for(i=0;dirs[i];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 ? linedraw->vert_left:linedraw->corner));
-     }
-   }
-@@ -1180,7 +1175,7 @@
-   return t->name;
- }
- 
--void printit(unsigned char *s)
-+void printit(char *s)
- {
-   int c;
- 
--- tree-1.5.2.1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809220818.m8M8I0U9056263>