svn commit: r367237 - in head/devel/ocaml-camljava: . files
Antoine Brodin
antoine at FreeBSD.org
Wed Sep 3 21:57:58 UTC 2014
Author: antoine
Date: Wed Sep 3 21:57:57 2014
New Revision: 367237
URL: http://svnweb.freebsd.org/changeset/ports/367237
QAT: https://qat.redports.org/buildarchive/r367237/
Log:
Allow patching as a regular user (and staging too)
Modified:
head/devel/ocaml-camljava/Makefile
head/devel/ocaml-camljava/files/patch-lib-Makefile
Modified: head/devel/ocaml-camljava/Makefile
==============================================================================
--- head/devel/ocaml-camljava/Makefile Wed Sep 3 21:07:17 2014 (r367236)
+++ head/devel/ocaml-camljava/Makefile Wed Sep 3 21:57:57 2014 (r367237)
@@ -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>
Modified: head/devel/ocaml-camljava/files/patch-lib-Makefile
==============================================================================
--- head/devel/ocaml-camljava/files/patch-lib-Makefile Wed Sep 3 21:07:17 2014 (r367236)
+++ head/devel/ocaml-camljava/files/patch-lib-Makefile Wed Sep 3 21:57:57 2014 (r367237)
@@ -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
More information about the svn-ports-head
mailing list