summaryrefslogtreecommitdiff
path: root/devel/ocaml-findlib
diff options
context:
space:
mode:
authorjoerg <joerg>2009-02-16 16:29:18 +0000
committerjoerg <joerg>2009-02-16 16:29:18 +0000
commitc046e32bf699be533e6f7e55b2bb5ca96b19ba98 (patch)
treedb40f8c9618a9fd28a42802bcb11d9e1f8003ea8 /devel/ocaml-findlib
parent729438bffcfbe56de37c590ac70627bce7dc36f3 (diff)
downloadpkgsrc-c046e32bf699be533e6f7e55b2bb5ca96b19ba98.tar.gz
DESTDIR support. Don't leak WRKDIR. Bump revision.
Diffstat (limited to 'devel/ocaml-findlib')
-rw-r--r--devel/ocaml-findlib/Makefile18
-rw-r--r--devel/ocaml-findlib/distinfo3
-rw-r--r--devel/ocaml-findlib/patches/patch-aa13
3 files changed, 28 insertions, 6 deletions
diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index 9a6cad4ca4f..3fc89254ada 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -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 @@ MAINTAINER= pkgsrc-users@NetBSD.org
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+= -mandir ${PREFIX}/${PKGMANDIR}
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,@SH@,'${SH:Q}','
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 --git a/devel/ocaml-findlib/distinfo b/devel/ocaml-findlib/distinfo
index 8ad8cf7a388..49fe968c43a 100644
--- a/devel/ocaml-findlib/distinfo
+++ b/devel/ocaml-findlib/distinfo
@@ -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 --git a/devel/ocaml-findlib/patches/patch-aa b/devel/ocaml-findlib/patches/patch-aa
new file mode 100644
index 00000000000..6237c5500a5
--- /dev/null
+++ b/devel/ocaml-findlib/patches/patch-aa
@@ -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