diff options
Diffstat (limited to 'sysutils/tree')
| -rw-r--r-- | sysutils/tree/Makefile | 14 | ||||
| -rw-r--r-- | sysutils/tree/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/tree/files/patch-Makefile | 43 | ||||
| -rw-r--r-- | sysutils/tree/files/patch-tree.c | 40 |
4 files changed, 36 insertions, 65 deletions
diff --git a/sysutils/tree/Makefile b/sysutils/tree/Makefile index 814a25ca03e5..812a27e4a045 100644 --- a/sysutils/tree/Makefile +++ b/sysutils/tree/Makefile @@ -6,8 +6,7 @@ # PORTNAME= tree -PORTVERSION= 1.3 -PORTREVISION= 1 +PORTVERSION= 1.5.0 CATEGORIES= sysutils MASTER_SITES= ftp://mama.indstate.edu/linux/tree/ EXTRACT_SUFX= .tgz @@ -18,4 +17,13 @@ COMMENT= Display a tree-view of directories with optional color or HTML output MAN1= tree.1 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> diff --git a/sysutils/tree/distinfo b/sysutils/tree/distinfo index 16d07f91c602..65f5fcd7c873 100644 --- a/sysutils/tree/distinfo +++ b/sysutils/tree/distinfo @@ -1,2 +1,2 @@ -MD5 (tree-1.3.tgz) = 610dff913f65c1d4743f1a7e1adc0ae4 -SIZE (tree-1.3.tgz) = 25060 +MD5 (tree-1.5.0.tgz) = e0d090c564e7ea5afa16bac80620c7e0 +SIZE (tree-1.5.0.tgz) = 26543 diff --git a/sysutils/tree/files/patch-Makefile b/sysutils/tree/files/patch-Makefile index a6d9012b020d..dbcdc74dbc0d 100644 --- a/sysutils/tree/files/patch-Makefile +++ b/sysutils/tree/files/patch-Makefile @@ -1,46 +1,33 @@ ---- Makefile.orig Mon Feb 15 11:54:06 1999 -+++ Makefile Wed Mar 13 23:41:36 2002 -@@ -6,15 +6,15 @@ +--- Makefile.orig Sat Aug 14 23:07:56 2004 ++++ Makefile Thu Oct 21 11:01:14 2004 +@@ -6,10 +6,6 @@ # warranties, including, without limitation, the implied warranties # of merchant-ability and fitness for a particular purpose. -CC=gcc --CFLAGS=-O2 -Wall -fomit-frame-pointer #-m486 +-#CFLAGS=-ggdb -Wall -DLINUX_BIGFILE +-CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX_BIGFILE -LDFLAGS=-s -+CC?= gcc -+CFLAGS?= -O2 -Wall -+LDFLAGS?= -+BINDIR= ${PREFIX}/bin -+MANDIR= ${PREFIX}/man/man1 - VERSION=1.3 - TREE_DEST=tree --BINDIR=/usr/local/bin - MAN=tree.1 --MANDIR=/usr/man/man1 - - all: tree - -@@ -28,17 +28,15 @@ - if [ -e tree.o ]; then rm *.o; fi + # Uncomment for FreeBSD: + #CC=gcc +@@ -51,13 +47,12 @@ + if [ -f tree.o ]; then rm *.o; fi rm -f *~ -install: -- install -d $(BINDIR) $(MANDIR) +- install -d $(BINDIR) +- install -d $(MANDIR) - if [ -e $(TREE_DEST) ]; then \ - install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ - fi - install $(MAN) $(MANDIR)/$(MAN) +install: $(TREE_DEST) $(MAN) -+ mkdir -p $(BINDIR) -+ mkdir -p $(MANDIR) ++ $(MKDIR) $(BINDIR) ++ $(MKDIR) $(MANDIR) + ${BSD_INSTALL_PROGRAM} $(TREE_DEST) $(BINDIR) + ${BSD_INSTALL_MAN} $(MAN) $(MANDIR) ++ distclean: - if [ -e tree.o ]; then rm *.o; fi - rm -f *~ -- - - dist: distclean - tar zcf ../tree-$(VERSION).tgz -C .. tree-$(VERSION)/ + if [ -f tree.o ]; then rm *.o; fi diff --git a/sysutils/tree/files/patch-tree.c b/sysutils/tree/files/patch-tree.c index 34b35288c2b4..f6076804e377 100644 --- a/sysutils/tree/files/patch-tree.c +++ b/sysutils/tree/files/patch-tree.c @@ -1,34 +1,10 @@ ---- tree.c.orig Mon May 12 16:44:19 2003 -+++ tree.c Mon May 12 16:44:24 2003 -@@ -22,10 +22,10 @@ - #include <grp.h> +--- tree.c.orig Mon Aug 16 02:07:21 2004 ++++ tree.c Thu Oct 21 11:51:36 2004 +@@ -189,7 +189,6 @@ + FILE *outfile; + int *dirs, maxdirs; - static char *version = "$Version: $ tree v1.3 (c) 1996 - 1999 by Steve Baker, Thomas Moore $"; --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: -+ ; - } - } +-extern size_t MB_CUR_MAX; + int main(int argc, char **argv) + { |