Update to latest release, version 1.5.0.

This commit is contained in:
Tom Hukins 2004-11-16 16:32:18 +00:00
parent c62beeb451
commit 2ba1db6be8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=121761
4 changed files with 36 additions and 65 deletions

View file

@ -6,8 +6,7 @@
# #
PORTNAME= tree PORTNAME= tree
PORTVERSION= 1.3 PORTVERSION= 1.5.0
PORTREVISION= 1
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= ftp://mama.indstate.edu/linux/tree/ MASTER_SITES= ftp://mama.indstate.edu/linux/tree/
EXTRACT_SUFX= .tgz EXTRACT_SUFX= .tgz
@ -18,4 +17,13 @@ COMMENT= Display a tree-view of directories with optional color or HTML output
MAN1= tree.1 MAN1= tree.1
PLIST_FILES= bin/tree PLIST_FILES= bin/tree
.include <bsd.port.mk> .include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
USE_REINPLACE= yes
post-patch:
@${REINPLACE_CMD} -e "s:iswprint:isprint:" ${WRKSRC}/tree.c
.endif
.include <bsd.port.post.mk>

View file

@ -1,2 +1,2 @@
MD5 (tree-1.3.tgz) = 610dff913f65c1d4743f1a7e1adc0ae4 MD5 (tree-1.5.0.tgz) = e0d090c564e7ea5afa16bac80620c7e0
SIZE (tree-1.3.tgz) = 25060 SIZE (tree-1.5.0.tgz) = 26543

View file

@ -1,46 +1,33 @@
--- Makefile.orig Mon Feb 15 11:54:06 1999 --- Makefile.orig Sat Aug 14 23:07:56 2004
+++ Makefile Wed Mar 13 23:41:36 2002 +++ Makefile Thu Oct 21 11:01:14 2004
@@ -6,15 +6,15 @@ @@ -6,10 +6,6 @@
# warranties, including, without limitation, the implied warranties # warranties, including, without limitation, the implied warranties
# of merchant-ability and fitness for a particular purpose. # of merchant-ability and fitness for a particular purpose.
-CC=gcc -CC=gcc
-CFLAGS=-O2 -Wall -fomit-frame-pointer #-m486 -#CFLAGS=-ggdb -Wall -DLINUX_BIGFILE
-CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX_BIGFILE
-LDFLAGS=-s -LDFLAGS=-s
+CC?= gcc
+CFLAGS?= -O2 -Wall
+LDFLAGS?=
+BINDIR= ${PREFIX}/bin
+MANDIR= ${PREFIX}/man/man1
VERSION=1.3 # Uncomment for FreeBSD:
TREE_DEST=tree #CC=gcc
-BINDIR=/usr/local/bin @@ -51,13 +47,12 @@
MAN=tree.1 if [ -f tree.o ]; then rm *.o; fi
-MANDIR=/usr/man/man1
all: tree
@@ -28,17 +28,15 @@
if [ -e tree.o ]; then rm *.o; fi
rm -f *~ rm -f *~
-install: -install:
- install -d $(BINDIR) $(MANDIR) - install -d $(BINDIR)
- install -d $(MANDIR)
- if [ -e $(TREE_DEST) ]; then \ - if [ -e $(TREE_DEST) ]; then \
- install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ - install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
- fi - fi
- install $(MAN) $(MANDIR)/$(MAN) - install $(MAN) $(MANDIR)/$(MAN)
+install: $(TREE_DEST) $(MAN) +install: $(TREE_DEST) $(MAN)
+ mkdir -p $(BINDIR) + $(MKDIR) $(BINDIR)
+ mkdir -p $(MANDIR) + $(MKDIR) $(MANDIR)
+ ${BSD_INSTALL_PROGRAM} $(TREE_DEST) $(BINDIR) + ${BSD_INSTALL_PROGRAM} $(TREE_DEST) $(BINDIR)
+ ${BSD_INSTALL_MAN} $(MAN) $(MANDIR) + ${BSD_INSTALL_MAN} $(MAN) $(MANDIR)
+
distclean: distclean:
if [ -e tree.o ]; then rm *.o; fi if [ -f tree.o ]; then rm *.o; fi
rm -f *~
-
dist: distclean
tar zcf ../tree-$(VERSION).tgz -C .. tree-$(VERSION)/

View file

@ -1,34 +1,10 @@
--- tree.c.orig Mon May 12 16:44:19 2003 --- tree.c.orig Mon Aug 16 02:07:21 2004
+++ tree.c Mon May 12 16:44:24 2003 +++ tree.c Thu Oct 21 11:51:36 2004
@@ -22,10 +22,10 @@ @@ -189,7 +189,6 @@
#include <grp.h> FILE *outfile;
int *dirs, maxdirs;
static char *version = "$Version: $ tree v1.3 (c) 1996 - 1999 by Steve Baker, Thomas Moore $"; -extern size_t MB_CUR_MAX;
-static char *hversion= "tree v1.3 \251 1996 - 1999 by Steve Baker and Thomas Moore\
-<BR>HTML output hacked and copyleft \251 1998 by Francesc Rocher\
-<BR>This software is experimental. Send commends and/or
-<BR>suggestions to <A HREF=\"mailto:rocher@econ.udg.es\">rocher@econ.udg.es</A>";
+static char *hversion= "tree v1.3 \251 1996 - 1999 by Steve Baker and Thomas Moore"
+"<BR>HTML output hacked and copyleft \251 1998 by Francesc Rocher"
+"<BR>This software is experimental. Send commends and/or\n"
+"<BR>suggestions to <A HREF=\"mailto:rocher@econ.udg.es\">rocher@econ.udg.es</A>";
#define scopy(x) strcpy(xmalloc(strlen(x)+1),(x))
@@ -417,7 +417,7 @@
if (uflag && (gflag || sflag || Dflag)) fprintf(outfile,"%s",sp);
if (gflag) fprintf(outfile,"%-8.8s",gidtoname((*dir)->gid));
if (gflag && (sflag || Dflag)) fprintf(outfile,"%s",sp);
- if (sflag) fprintf(outfile,"%9ld",(*dir)->size);
+ if (sflag) fprintf(outfile,"%9ld",(long)(*dir)->size);
if (sflag && Dflag) fprintf(outfile,"%s",sp);
if (Dflag) fprintf(outfile,"%s",do_date((*dir)->mtime));
if (pflag || sflag || uflag || gflag || Dflag) fprintf(outfile,"]%s%s",sp,sp);
@@ -1022,6 +1022,7 @@
}
}
default:
+ ;
}
}
int main(int argc, char **argv)
{