[pkgsrc/trunk]: pkgsrc/devel/generate PKG_DESTDIR_SUPPORT=no is not a support...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e85648c9f546
branches:  trunk
changeset: 400432:e85648c9f546
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Oct 19 18:30:31 2009 +0000

description:
PKG_DESTDIR_SUPPORT=no is not a supported value. Provide actually
working DESTDIR support.

diffstat:

 devel/generate/Makefile         |   6 ++++--
 devel/generate/distinfo         |   4 ++--
 devel/generate/patches/patch-aa |  17 +++++++++++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diffs (61 lines):

diff -r 5f16a5643d0a -r e85648c9f546 devel/generate/Makefile
--- a/devel/generate/Makefile   Mon Oct 19 17:04:37 2009 +0000
+++ b/devel/generate/Makefile   Mon Oct 19 18:30:31 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/10/08 12:59:48 darcy Exp $
+# $NetBSD: Makefile,v 1.19 2009/10/19 18:30:31 joerg Exp $
 #
 
 DISTNAME=      generate-2.6
@@ -11,7 +11,9 @@
 HOMEPAGE=      http://www.druid.net/darcy/readme-generate.html
 COMMENT=       Simple text pre-processor
 
-PKG_DESTDIR_SUPPORT=   no
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 MAKE_ENV+=     ${BSD_MAKE_ENV} LIBS=${LIBS:Q}
 USE_TOOLS+=    gmake
diff -r 5f16a5643d0a -r e85648c9f546 devel/generate/distinfo
--- a/devel/generate/distinfo   Mon Oct 19 17:04:37 2009 +0000
+++ b/devel/generate/distinfo   Mon Oct 19 18:30:31 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2008/12/19 12:12:53 darcy Exp $
+$NetBSD: distinfo,v 1.16 2009/10/19 18:30:31 joerg Exp $
 
 SHA1 (generate-2.6.tgz) = ab97858005c03531d8d8cc57328ffcf4b8e42aec
 RMD160 (generate-2.6.tgz) = e996dd4dbf553ed3467d01907686d2cc09936db2
 Size (generate-2.6.tgz) = 29045 bytes
-SHA1 (patch-aa) = eeee7e0c0ed02728ccebc295869a82139da183a4
+SHA1 (patch-aa) = 8dc109772d4685f6a33f4fddf79fc6c5da273e92
diff -r 5f16a5643d0a -r e85648c9f546 devel/generate/patches/patch-aa
--- a/devel/generate/patches/patch-aa   Mon Oct 19 17:04:37 2009 +0000
+++ b/devel/generate/patches/patch-aa   Mon Oct 19 18:30:31 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.9 2008/12/19 12:12:53 darcy Exp $
+$NetBSD: patch-aa,v 1.10 2009/10/19 18:30:32 joerg Exp $
 
---- Makefile.orig      2008-11-17 16:12:39.000000000 -0500
+--- Makefile.orig      2008-11-17 22:12:39.000000000 +0100
 +++ Makefile
 @@ -9,7 +9,7 @@ VERSION_MAJOR =        2
  VERSION_MINOR = 6
@@ -11,3 +11,16 @@
                        -Wwrite-strings -Wstrict-prototypes \
                        -Wformat -Wmissing-prototypes -funsigned-char \
                        -I/usr/local/include -L/usr/local/lib \
+@@ -48,10 +48,8 @@ clean:
+       rm -rf build
+ 
+ install:      all
+-      chmod 644 generate.1
+-      cp generate.1 /${MANDIR}/man1
+-      chmod 755 ${BINS}
+-      cp ${BINS} ${BINDIR}
++      ${BSD_INSTALL_MAN} generate.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
++      ${BSD_INSTALL_PROGRAM} ${BINS} ${DESTDIR}${PREFIX}/bin
+ 
+ python:
+       gmake clean