diff options
-rw-r--r-- | sysutils/tree/Makefile | 30 | ||||
-rw-r--r-- | sysutils/tree/distinfo | 13 | ||||
-rw-r--r-- | sysutils/tree/patches/patch-Makefile | 45 | ||||
-rw-r--r-- | sysutils/tree/patches/patch-tree.c | 15 |
4 files changed, 27 insertions, 76 deletions
diff --git a/sysutils/tree/Makefile b/sysutils/tree/Makefile index bea71aadb08..56e433c873c 100644 --- a/sysutils/tree/Makefile +++ b/sysutils/tree/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2014/04/29 07:07:26 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2020/05/18 10:20:13 nia Exp $ -DISTNAME= tree-1.7.0 +DISTNAME= tree-1.8.0 CATEGORIES= sysutils -MASTER_SITES= ftp://mama.indstate.edu/linux/tree/ +MASTER_SITES= http://mama.indstate.edu/users/ice/tree/src/ EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org @@ -13,16 +13,18 @@ LICENSE= gnu-gpl-v2 USE_TOOLS+= gmake NO_CONFIGURE= yes -CFLAGS+= -Wall -fomit-frame-pointer -CFLAGS.linux+= -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - -MAKE_FLAGS+= prefix=${PREFIX:Q} -MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} -MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} -MAKE_FLAGS+= MANSUBDIR=${PKGMANDIR:Q} -MAKE_FLAGS+= INSTALL_PROGRAM_DIR=${INSTALL_PROGRAM_DIR:Q} -MAKE_FLAGS+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} -MAKE_FLAGS+= INSTALL_MAN_DIR=${INSTALL_MAN_DIR:Q} -MAKE_FLAGS+= INSTALL_MAN=${INSTALL_MAN:Q} +CFLAGS.Linux+= -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + +MAKE_FLAGS+= prefix=${PREFIX} +MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} +MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} +MAKE_FLAGS+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + +INSTALLATION_DIRS+= bin +INSTALLATION_DIRS+= ${PKGMANDIR}/man1 + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/tree ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/doc/tree.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/tree/distinfo b/sysutils/tree/distinfo index 912c05ab9be..9c6a280bc6f 100644 --- a/sysutils/tree/distinfo +++ b/sysutils/tree/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.13 2015/11/04 01:32:34 agc Exp $ +$NetBSD: distinfo,v 1.14 2020/05/18 10:20:13 nia Exp $ -SHA1 (tree-1.7.0.tgz) = 35bd212606e6c5d60f4d5062f4a59bb7b7b25949 -RMD160 (tree-1.7.0.tgz) = 238a8d89b3a993679dad68fef871b3d7d0011354 -SHA512 (tree-1.7.0.tgz) = b234fb1428ba75da72d7e4aeb24bf961e123332342593e441b29a0baa2270d12bb187d889c179d6463c940c8dce9fe9dffeb4ad3f06cf11f057b83234d7b4b4a -Size (tree-1.7.0.tgz) = 47082 bytes -SHA1 (patch-Makefile) = b2b3fd1538b524989ea7e1938091977df8b518b8 -SHA1 (patch-tree.c) = 4c33a0105c8ab08edf5da7ea62ed9332d3f97725 +SHA1 (tree-1.8.0.tgz) = 06934bf1f6a92af4eaec6bc61e568cec5e068ba1 +RMD160 (tree-1.8.0.tgz) = 7a8e488213e41729a21b1f455bafd09a1e2d0eea +SHA512 (tree-1.8.0.tgz) = 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695 +Size (tree-1.8.0.tgz) = 50286 bytes +SHA1 (patch-Makefile) = e2fd10a3bb843dfd9795a9b97fdacff8800d7300 diff --git a/sysutils/tree/patches/patch-Makefile b/sysutils/tree/patches/patch-Makefile index 6022dccc708..499b4945492 100644 --- a/sysutils/tree/patches/patch-Makefile +++ b/sysutils/tree/patches/patch-Makefile @@ -1,50 +1,15 @@ -$NetBSD: patch-Makefile,v 1.5 2015/11/03 10:48:55 jperkin Exp $ +$NetBSD: patch-Makefile,v 1.6 2020/05/18 10:20:13 nia Exp $ * Fix build on systems lacking strverscmp. -* Use CFLAGS that were passed in -* Fix DESTDIR. -* Fix PKGMANDIR. ---- Makefile.orig 2014-04-18 17:35:39.000000000 +0000 +--- Makefile.orig 2018-01-18 20:02:20.000000000 +0000 +++ Makefile -@@ -24,20 +24,20 @@ VERSION=1.7.0 - TREE_DEST=tree - BINDIR=${prefix}/bin - MAN=tree.1 --MANDIR=${prefix}/man/man1 -+MANDIR=${prefix}/${MANSUBDIR}/man1 - OBJS=tree.o unix.o html.o xml.o json.o hash.o color.o - - # Uncomment options below for your particular OS: - - # Linux defaults: --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 - +@@ -37,7 +37,7 @@ CFLAGS=-ggdb -pedantic -Wall -DLINUX -D_ # Uncomment for FreeBSD: #CFLAGS=-O2 -Wall -fomit-frame-pointer #LDFLAGS=-s -#OBJS+=strverscmp.o +OBJS+=strverscmp.o - # Uncomment for Solaris: - #CC=cc -@@ -95,12 +95,12 @@ clean: - rm -f *~ - - install: tree -- install -d $(BINDIR) -- install -d $(MANDIR) -+ install -d $(DESTDIR)$(BINDIR) -+ install -d $(DESTDIR)$(MANDIR) - if [ -e $(TREE_DEST) ]; then \ -- 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) - - distclean: - if [ -f tree.o ]; then rm *.o; fi + # Uncomment for OpenBSD: + #TREE_DEST=colortree diff --git a/sysutils/tree/patches/patch-tree.c b/sysutils/tree/patches/patch-tree.c deleted file mode 100644 index a89db1e862d..00000000000 --- a/sysutils/tree/patches/patch-tree.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-tree.c,v 1.3 2014/04/29 07:07:26 wiz Exp $ - -Check for the symbol we're using. - ---- tree.c.orig 2014-04-23 21:38:24.000000000 +0000 -+++ tree.c -@@ -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; |