From 15e98bb3c203b87cae7c29dff00ffcc0f58fe52c Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Thu, 10 Jul 2014 15:21:55 +0000 Subject: [PATCH] Stagify. --- devel/ocaml-camljava/Makefile | 7 ------- devel/ocaml-camljava/files/patch-lib-Makefile | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 devel/ocaml-camljava/files/patch-lib-Makefile diff --git a/devel/ocaml-camljava/Makefile b/devel/ocaml-camljava/Makefile index f6f3b05ddb44..c64d13b49d48 100644 --- a/devel/ocaml-camljava/Makefile +++ b/devel/ocaml-camljava/Makefile @@ -15,7 +15,6 @@ USE_OCAML= yes USE_JAVA= yes JAVA_VERSION= 1.6+ -NO_STAGE= yes .include post-extract: @@ -32,12 +31,6 @@ post-extract: -e "/^install/,/^$$/s,\([ \t]*\)cp,\1${INSTALL_DATA},g" \ ${WRKSRC}/lib/Makefile -pre-install: -.if !exists(${PREFIX}/lib/ocaml) - ${MKDIR} ${PREFIX}/lib/ocaml - @${ECHO_CMD} "@dirrm lib/ocaml" >> ${TMPPLIST} -.endif - test: @${ECHO_CMD} "Testing IDL library" cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${MAKE} all diff --git a/devel/ocaml-camljava/files/patch-lib-Makefile b/devel/ocaml-camljava/files/patch-lib-Makefile new file mode 100644 index 000000000000..6cc9d7b7ca4d --- /dev/null +++ b/devel/ocaml-camljava/files/patch-lib-Makefile @@ -0,0 +1,15 @@ +--- lib/Makefile.orig 2014-07-10 23:17:16.801237680 +0800 ++++ lib/Makefile 2014-07-10 23:17:43.641231560 +0800 +@@ -9,9 +9,9 @@ CAMLJAVALIB=$(OCAMLLIB)/camljava + all: jni.cma jni.cmxa javaclasses + + install: +- mkdir -p $(CAMLJAVALIB) +- install -o root -g wheel -m 444 jni.cma jni.cmi jni.cmxa jni.a libcamljni.a jni.mli $(CAMLJAVALIB) +- jar cf $(CAMLJAVALIB)/camljava.jar fr/inria/caml/camljava/*.class ++ mkdir -p $(DESTDIR)$(CAMLJAVALIB) ++ install -o root -g wheel -m 444 jni.cma jni.cmi jni.cmxa jni.a libcamljni.a jni.mli $(DESTDIR)$(CAMLJAVALIB) ++ jar cf $(DESTDIR)$(CAMLJAVALIB)/camljava.jar fr/inria/caml/camljava/*.class + + jni.cma: jni.cmo libcamljni.a + $(OCAMLC) -linkall -a -o jni.cma -custom jni.cmo \