diff options
| author | heinz <heinz@pkgsrc.org> | 2007-10-25 08:51:30 +0000 |
|---|---|---|
| committer | heinz <heinz@pkgsrc.org> | 2007-10-25 08:51:30 +0000 |
| commit | fa11c5863f37292ae45cdfb249f57d50a4425b84 (patch) | |
| tree | 0743a2d6c82e59c4ec1cd0415b5739e898aff952 /sysutils | |
| parent | f7c2e94b494887d938a15c31b505b54b3071207e (diff) | |
| download | pkgsrc-fa11c5863f37292ae45cdfb249f57d50a4425b84.tar.gz | |
Added support for installation to DESTDIR and for PKGMANDIR.
Changed patch-ab (and pkgsrc Makefile) such that it should be acceptable for
inclusion upstream.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/tree/Makefile | 11 | ||||
| -rw-r--r-- | sysutils/tree/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/tree/patches/patch-ab | 38 |
3 files changed, 46 insertions, 7 deletions
diff --git a/sysutils/tree/Makefile b/sysutils/tree/Makefile index f3c58a1b8b1..9d005b31a5a 100644 --- a/sysutils/tree/Makefile +++ b/sysutils/tree/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/10/24 23:25:11 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2007/10/25 08:51:30 heinz Exp $ # DISTNAME= tree-1.5.1.1 @@ -11,4 +11,13 @@ MAINTAINER= cjs@NetBSD.org HOMEPAGE= http://mama.indstate.edu/users/ice/tree/ COMMENT= Print a text or HTML tree diagram of a directory structure +PKG_DESTDIR_SUPPORT= user-destdir + +MAKE_FLAGS+= PREFIX=${PREFIX: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} + .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/tree/distinfo b/sysutils/tree/distinfo index a5b3e7dc7ac..f97814bfc21 100644 --- a/sysutils/tree/distinfo +++ b/sysutils/tree/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2007/10/24 23:25:12 wiz Exp $ +$NetBSD: distinfo,v 1.3 2007/10/25 08:51:30 heinz Exp $ SHA1 (tree-1.5.1.1.tgz) = ca4145bf1d2957ff3f4e6af0f64ce92d102fd356 RMD160 (tree-1.5.1.1.tgz) = 7cc78b7a0103a7f81ec40c2c5e1ff2399fd7bb20 Size (tree-1.5.1.1.tgz) = 30792 bytes SHA1 (patch-aa) = 999de75f82c27034da470e28067c6b2956f3d231 -SHA1 (patch-ab) = 55196994ee4b225dfd45be78095cb51b0cb851f8 +SHA1 (patch-ab) = 7105d8effd9313a15886a85371f6870eb66b32c3 diff --git a/sysutils/tree/patches/patch-ab b/sysutils/tree/patches/patch-ab index 29825bd7fca..527bc108f74 100644 --- a/sysutils/tree/patches/patch-ab +++ b/sysutils/tree/patches/patch-ab @@ -1,13 +1,43 @@ -$NetBSD: patch-ab,v 1.1 2007/10/24 23:25:12 wiz Exp $ +$NetBSD: patch-ab,v 1.2 2007/10/25 08:51:30 heinz Exp $ ---- Makefile.orig 2007-06-11 13:22:47.000000000 +0000 +--- Makefile.orig 2007-06-11 15:22:47.000000000 +0200 +++ Makefile -@@ -38,7 +38,7 @@ LDFLAGS=-s +@@ -38,13 +38,18 @@ LDFLAGS=-s #CFLAGS=-02 -Wall -fomit-frame-pointer -Zomf -Zsmall-conv #LDFLAGS=-s -Zomf -Zsmall-conv -prefix = /usr -+prefix = ${PREFIX} ++PREFIX = /usr VERSION=1.5.1.1 TREE_DEST=tree +-BINDIR=${prefix}/bin ++BINDIR=${PREFIX}/bin + MAN=tree.1 +-MANDIR=${prefix}/man/man1 ++MANSUBDIR=man ++MANDIR=${PREFIX}/${MANSUBDIR}/man1 ++INSTALL_PROGRAM_DIR=install -d ++INSTALL_PROGRAM=install -s ++INSTALL_MAN_DIR=install -d ++INSTALL_MAN=install + + all: tree + +@@ -59,12 +64,12 @@ clean: + rm -f *~ + + install: +- install -d $(BINDIR) +- install -d $(MANDIR) ++ $(INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR) ++ $(INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR) + if [ -e $(TREE_DEST) ]; then \ +- install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ ++ $(INSTALL_PROGRAM) $(TREE_DEST) $(DESTDIR)$(BINDIR)/$(TREE_DEST); \ + fi +- install man/$(MAN) $(MANDIR)/$(MAN) ++ $(INSTALL_MAN) man/$(MAN) $(DESTDIR)$(MANDIR)/$(MAN) + + distclean: + if [ -f tree.o ]; then rm *.o; fi |