svn commit: r361463 - in head/devel/ocaml-camljava: . files

[Vanilla I. Shu]

Author: vanilla
Date: Thu Jul 10 15:21:55 2014
New Revision: 361463
URL: http://svnweb.freebsd.org/changeset/ports/361463
QAT: https://qat.redports.org/buildarchive/r361463/

Log:
  Stagify.

Added:
  head/devel/ocaml-camljava/files/
  head/devel/ocaml-camljava/files/patch-lib-Makefile   (contents, props changed)
Modified:
  head/devel/ocaml-camljava/Makefile

Modified: head/devel/ocaml-camljava/Makefile
==============================================================================
--- head/devel/ocaml-camljava/Makefile	Thu Jul 10 15:18:22 2014	(r361462)
+++ head/devel/ocaml-camljava/Makefile	Thu Jul 10 15:21:55 2014	(r361463)
@@ -15,7 +15,6 @@ USE_OCAML=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 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

Added: head/devel/ocaml-camljava/files/patch-lib-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ocaml-camljava/files/patch-lib-Makefile	Thu Jul 10 15:21:55 2014	(r361463)
@@ -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 \