diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2014-09-03 21:57:57 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2014-09-03 21:57:57 +0000 |
| commit | 708012835518304ca1175852cd05c5d0972d16f4 (patch) | |
| tree | 717fce3755fa31ffe7d46465ce54a1b6daba0aeb /devel/ocaml-camljava | |
| parent | 0090808295dbe0366733c7871468f154c19d17e8 (diff) | |
| download | ports-708012835518304ca1175852cd05c5d0972d16f4.tar.gz ports-708012835518304ca1175852cd05c5d0972d16f4.zip | |
Notes
Diffstat (limited to 'devel/ocaml-camljava')
| -rw-r--r-- | devel/ocaml-camljava/Makefile | 11 | ||||
| -rw-r--r-- | devel/ocaml-camljava/files/patch-lib-Makefile | 17 |
2 files changed, 14 insertions, 14 deletions
diff --git a/devel/ocaml-camljava/Makefile b/devel/ocaml-camljava/Makefile index c64d13b49d48..fa73b17c913d 100644 --- a/devel/ocaml-camljava/Makefile +++ b/devel/ocaml-camljava/Makefile @@ -15,9 +15,7 @@ USE_OCAML= yes USE_JAVA= yes JAVA_VERSION= 1.6+ -.include <bsd.port.pre.mk> - -post-extract: +post-patch: @${REINPLACE_CMD} -e "s,^\(JAVAC=\).*,\1${JAVAC},g" \ -e "s,^\(JDKHOME=\).*,\1${JAVA_HOME},g" \ -e "s,include/linux,include/freebsd,g" \ @@ -26,13 +24,8 @@ post-extract: -e "s,i386,${ARCH},g" \ ${WRKSRC}/Makefile.config - ${REINPLACE_CMD} \ - -e "s,^\(OCAMLLIB=\).*,\1${PREFIX}/lib/ocaml,g" \ - -e "/^install/,/^$$/s,\([ \t]*\)cp,\1${INSTALL_DATA},g" \ - ${WRKSRC}/lib/Makefile - test: @${ECHO_CMD} "Testing IDL library" cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${MAKE} all -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/ocaml-camljava/files/patch-lib-Makefile b/devel/ocaml-camljava/files/patch-lib-Makefile index 6cc9d7b7ca4d..74be488a4651 100644 --- a/devel/ocaml-camljava/files/patch-lib-Makefile +++ b/devel/ocaml-camljava/files/patch-lib-Makefile @@ -1,14 +1,21 @@ ---- 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 +--- lib/Makefile.orig 2001-06-21 11:46:05 UTC ++++ lib/Makefile +@@ -3,15 +3,15 @@ + OCAMLC=ocamlc -g + OCAMLOPT=ocamlopt + OCAMLDEP=ocamldep +-OCAMLLIB=`ocamlc -where` ++OCAMLLIB=$(PREFIX)/lib/ocaml + 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) +- cp 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) ++ $(BSD_INSTALL_DATA) 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 |