[pkgsrc/trunk]: pkgsrc/sysutils/tree Added support for installation to DESTDI...

[heinz <heinz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/293fa8efa4d0
branches:  trunk
changeset: 534513:293fa8efa4d0
user:      heinz <heinz%pkgsrc.org@localhost>
date:      Thu Oct 25 08:51:30 2007 +0000

description:
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:

 sysutils/tree/Makefile         |  11 ++++++++++-
 sysutils/tree/distinfo         |   4 ++--
 sysutils/tree/patches/patch-ab |  38 ++++++++++++++++++++++++++++++++++----
 3 files changed, 46 insertions(+), 7 deletions(-)

diffs (87 lines):

diff -r 8fec524652df -r 293fa8efa4d0 sysutils/tree/Makefile
--- a/sysutils/tree/Makefile    Thu Oct 25 00:02:44 2007 +0000
+++ b/sysutils/tree/Makefile    Thu Oct 25 08:51:30 2007 +0000
@@ -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 @@
 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 -r 8fec524652df -r 293fa8efa4d0 sysutils/tree/distinfo
--- a/sysutils/tree/distinfo    Thu Oct 25 00:02:44 2007 +0000
+++ b/sysutils/tree/distinfo    Thu Oct 25 08:51:30 2007 +0000
@@ -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 -r 8fec524652df -r 293fa8efa4d0 sysutils/tree/patches/patch-ab
--- a/sysutils/tree/patches/patch-ab    Thu Oct 25 00:02:44 2007 +0000
+++ b/sysutils/tree/patches/patch-ab    Thu Oct 25 08:51:30 2007 +0000
@@ -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