From owner-svn-ports-head@FreeBSD.ORG Thu Jul 10 15:21:56 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 797D3EBF; Thu, 10 Jul 2014 15:21:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4E1E525AF; Thu, 10 Jul 2014 15:21:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6AFLuM5046018; Thu, 10 Jul 2014 15:21:56 GMT (envelope-from vanilla@svn.freebsd.org) Received: (from vanilla@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6AFLtXA046016; Thu, 10 Jul 2014 15:21:55 GMT (envelope-from vanilla@svn.freebsd.org) Message-Id: <201407101521.s6AFLtXA046016@svn.freebsd.org> From: "Vanilla I. Shu" Date: Thu, 10 Jul 2014 15:21:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361463 - in head/devel/ocaml-camljava: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jul 2014 15:21:56 -0000 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 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 \