diff options
| -rw-r--r-- | sysutils/tree/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/tree/distinfo | 12 | ||||
| -rw-r--r-- | sysutils/tree/patches/patch-Makefile | 24 | ||||
| -rw-r--r-- | sysutils/tree/patches/patch-tree.c | 27 |
4 files changed, 33 insertions, 36 deletions
diff --git a/sysutils/tree/Makefile b/sysutils/tree/Makefile index 65c29925ac2..bea71aadb08 100644 --- a/sysutils/tree/Makefile +++ b/sysutils/tree/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2013/08/15 12:40:06 richard Exp $ -# +# $NetBSD: Makefile,v 1.11 2014/04/29 07:07:26 wiz Exp $ -DISTNAME= tree-1.6.0 -PKGREVISION= 1 +DISTNAME= tree-1.7.0 CATEGORIES= sysutils MASTER_SITES= ftp://mama.indstate.edu/linux/tree/ EXTRACT_SUFX= .tgz diff --git a/sysutils/tree/distinfo b/sysutils/tree/distinfo index 809645068f8..931ada44f46 100644 --- a/sysutils/tree/distinfo +++ b/sysutils/tree/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.9 2013/08/25 14:29:52 richard Exp $ +$NetBSD: distinfo,v 1.10 2014/04/29 07:07:26 wiz Exp $ -SHA1 (tree-1.6.0.tgz) = 350f851f68859a011668362dd0e7ee81fd1b713a -RMD160 (tree-1.6.0.tgz) = d0e89f49fa902c7a72056d1a4ef826ddfee6be15 -Size (tree-1.6.0.tgz) = 42706 bytes -SHA1 (patch-Makefile) = 3772e7bbe55d10bd94c900435f890c906ccfdb6c -SHA1 (patch-tree.c) = 99ba64ef211650bb67644cc2b46d4181c03d0193 +SHA1 (tree-1.7.0.tgz) = 35bd212606e6c5d60f4d5062f4a59bb7b7b25949 +RMD160 (tree-1.7.0.tgz) = 238a8d89b3a993679dad68fef871b3d7d0011354 +Size (tree-1.7.0.tgz) = 47082 bytes +SHA1 (patch-Makefile) = fa796fe0bf6cc364ea4741250a2ae81b91b6afab +SHA1 (patch-tree.c) = 4c33a0105c8ab08edf5da7ea62ed9332d3f97725 SHA1 (patch-tree.h) = 74d250ba1db35502071ef78537b9e6081a0e07cb diff --git a/sysutils/tree/patches/patch-Makefile b/sysutils/tree/patches/patch-Makefile index d5f8cc6da40..016b4b1887f 100644 --- a/sysutils/tree/patches/patch-Makefile +++ b/sysutils/tree/patches/patch-Makefile @@ -1,19 +1,19 @@ -$NetBSD: patch-Makefile,v 1.3 2013/08/25 14:29:52 richard Exp $ +$NetBSD: patch-Makefile,v 1.4 2014/04/29 07:07:26 wiz Exp $ * Fix build on systems lacking strverscmp. -* Remove CFLAGS/LDFLAGS passed in as MAKE_FLAGS +* Use CFLAGS that were passed in * Fix DESTDIR. ---- Makefile.orig 2011-06-24 14:25:27.000000000 +0000 +--- Makefile.orig 2014-04-18 17:35:39.000000000 +0000 +++ Makefile -@@ -31,13 +31,13 @@ OBJS=tree.o unix.o html.o xml.o hash.o c +@@ -30,14 +30,14 @@ OBJS=tree.o unix.o html.o xml.o json.o h + # Uncomment options below for your particular OS: # Linux defaults: - #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --CFLAGS=-O4 -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --LDFLAGS=-s -+#CFLAGS=-DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -+#LDFLAGS=-s +-CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++#CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + #CFLAGS=-O4 -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + #LDFLAGS=-s # Uncomment for FreeBSD: #CFLAGS=-O2 -Wall -fomit-frame-pointer @@ -23,7 +23,7 @@ $NetBSD: patch-Makefile,v 1.3 2013/08/25 14:29:52 richard Exp $ # Uncomment for Solaris: #CC=cc -@@ -94,12 +94,12 @@ clean: +@@ -95,12 +95,12 @@ clean: rm -f *~ install: tree @@ -32,8 +32,8 @@ $NetBSD: patch-Makefile,v 1.3 2013/08/25 14:29:52 richard Exp $ + install -d $(DESTDIR)$(BINDIR) + install -d $(DESTDIR)$(MANDIR) if [ -e $(TREE_DEST) ]; then \ -- install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ -+ install -s $(TREE_DEST) $(DESTDIR)$(BINDIR)/$(TREE_DEST); \ +- install $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ ++ install $(TREE_DEST) $(DESTDIR)$(BINDIR)/$(TREE_DEST); \ fi - install doc/$(MAN) $(MANDIR)/$(MAN) + install doc/$(MAN) $(DESTDIR)$(MANDIR)/$(MAN) diff --git a/sysutils/tree/patches/patch-tree.c b/sysutils/tree/patches/patch-tree.c index 76c7ff92e4b..a89db1e862d 100644 --- a/sysutils/tree/patches/patch-tree.c +++ b/sysutils/tree/patches/patch-tree.c @@ -1,16 +1,15 @@ -$NetBSD: patch-tree.c,v 1.2 2013/08/25 14:29:52 richard Exp $ +$NetBSD: patch-tree.c,v 1.3 2014/04/29 07:07:26 wiz Exp $ -* ensure that both S_ISPORT and S_ISDOOR are defined prior to ifmt -* declaration. -* ---- tree.c.orig 2011-06-24 14:26:30.000000000 +0000 +Check for the symbol we're using. + +--- tree.c.orig 2014-04-23 21:38:24.000000000 +0000 +++ tree.c -@@ -45,7 +45,7 @@ int mb_cur_max; - #ifdef __EMX__ - const u_short ifmt[]={ FILE_ARCHIVED, FILE_DIRECTORY, FILE_SYSTEM, FILE_HIDDEN, FILE_READONLY, 0}; - #else -- #ifdef S_ISPORT -+ #if defined(S_ISPORT) && defined(S_ISDOOR) - const u_int ifmt[] = {S_IFREG, S_IFDIR, S_IFLNK, S_IFCHR, S_IFBLK, S_IFSOCK, S_IFIFO, S_ISDOOR, S_ISPORT, 0}; - const char fmt[] = "-dlcbspDP?"; - const char *ftype[] = {"file", "directory", "link", "char", "block", "socket", "fifo", "door", "port", "unknown", NULL}; +@@ -1258,7 +1258,7 @@ char Ftype(mode_t mode) + else if (m == S_IFIFO) return '|'; + else if (m == S_IFLNK) return '@'; /* Here, but never actually used though. */ + #ifdef S_IFDOOR +- else if (m == S_ISDOOR) return '>'; ++ else if (m == S_IFDOOR) return '>'; + #endif + else if ((m == S_IFREG) && (mode & (S_IXUSR | S_IXGRP | S_IXOTH))) return '*'; + return 0; |