[pkgsrc/trunk]: pkgsrc/devel/ocaml-findlib DESTDIR support. Don't leak WRKDIR...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1a2fe7aa963d
branches:  trunk
changeset: 554585:1a2fe7aa963d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Feb 16 16:29:18 2009 +0000

description:
DESTDIR support. Don't leak WRKDIR. Bump revision.

diffstat:

 devel/ocaml-findlib/Makefile         |  18 +++++++++++++-----
 devel/ocaml-findlib/distinfo         |   3 ++-
 devel/ocaml-findlib/patches/patch-aa |  13 +++++++++++++
 3 files changed, 28 insertions(+), 6 deletions(-)

diffs (82 lines):

diff -r c913b0a9ab44 -r 1a2fe7aa963d devel/ocaml-findlib/Makefile
--- a/devel/ocaml-findlib/Makefile      Mon Feb 16 16:25:38 2009 +0000
+++ b/devel/ocaml-findlib/Makefile      Mon Feb 16 16:29:18 2009 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2008/03/04 11:02:24 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2009/02/16 16:29:18 joerg Exp $
 #
 
 DISTNAME=              findlib-1.1.2pl1
 PKGNAME=               ocaml-${DISTNAME}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            devel
 MASTER_SITES=          http://www.ocaml-programming.de/packages/
 
@@ -11,6 +11,8 @@
 HOMEPAGE=              http://www.ocaml-programming.de/packages/
 COMMENT=               Library finder for OCaml
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=            gmake m4
 USE_PKGLOCALEDIR=      yes
 HAS_CONFIGURE=         yes
@@ -19,8 +21,9 @@
 CONFIGURE_ARGS+=       -config ${PKG_SYSCONFDIR}/ocamlfind.conf
 
 EGDIR=                 ${PREFIX}/share/examples/ocaml-findlib
-INSTALL_MAKE_FLAGS+=   OCAMLFIND_CONF=${EGDIR}/ocamlfind.conf
-INSTALLATION_DIRS=     libexec
+INSTALL_MAKE_FLAGS+=   OCAMLFIND_CONF=${EGDIR}/ocamlfind.conf \
+                       prefix=${DESTDIR}
+INSTALLATION_DIRS=     libexec bin
 
 CONF_FILES=            ${EGDIR}/ocamlfind.conf ${PKG_SYSCONFDIR}/ocamlfind.conf
 
@@ -32,11 +35,16 @@
 SUBST_SED.ofr+=                -e 's,@PREFIX@,${PREFIX},'
 SUBST_SED.ofr+=                -e 's,@FGREP@,'${FGREP:Q}','
 
+SUBST_CLASSES+=                pathes
+SUBST_STAGE.pathes=    post-install
+SUBST_FILES.pathes=    ${DESTDIR}${PREFIX}/lib/ocaml/site-lib/findlib/Makefile.config
+SUBST_SED.pathes=      -e 's,^\(OCAML_CORE_BIN=\).*,\1'${PREFIX:Q}/bin','
+
 post-extract:
        ${CP} ${FILESDIR}/ocaml-findlib-register.sh ${WRKSRC}
 
 post-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/ocaml-findlib-register.sh ${PREFIX}/libexec/ocaml-findlib-register
+       ${INSTALL_SCRIPT} ${WRKSRC}/ocaml-findlib-register.sh ${DESTDIR}${PREFIX}/libexec/ocaml-findlib-register
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c913b0a9ab44 -r 1a2fe7aa963d devel/ocaml-findlib/distinfo
--- a/devel/ocaml-findlib/distinfo      Mon Feb 16 16:25:38 2009 +0000
+++ b/devel/ocaml-findlib/distinfo      Mon Feb 16 16:29:18 2009 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/20 10:19:35 rillig Exp $
+$NetBSD: distinfo,v 1.2 2009/02/16 16:29:18 joerg Exp $
 
 SHA1 (findlib-1.1.2pl1.tar.gz) = ccd8b9d6249b5a4097040d32b90048b11054f461
 RMD160 (findlib-1.1.2pl1.tar.gz) = 1bd97ac60eb6ba9b3711814d38f7682a5f874cd3
 Size (findlib-1.1.2pl1.tar.gz) = 153542 bytes
+SHA1 (patch-aa) = deb6a80bb41d1328cbf27d44d7a194a53088a9ec
diff -r c913b0a9ab44 -r 1a2fe7aa963d devel/ocaml-findlib/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ocaml-findlib/patches/patch-aa      Mon Feb 16 16:29:18 2009 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2009/02/16 16:29:18 joerg Exp $
+
+--- Makefile.orig      2009-02-16 17:09:51.000000000 +0100
++++ Makefile
+@@ -22,7 +22,7 @@ install:
+       $(MAKE) install-meta
+       cd src/findlib; $(MAKE) install-num-top
+       $(MAKE) install-config
+-      cp tools/safe_camlp4 $(OCAMLFIND_BIN)
++      cp tools/safe_camlp4 ${DESTDIR}$(OCAMLFIND_BIN)
+ 
+ uninstall:
+       $(MAKE) uninstall-doc