From owner-svn-ports-head@FreeBSD.ORG Wed Sep 3 21:57:58 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9172AF64; Wed, 3 Sep 2014 21:57:58 +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 62D861C08; Wed, 3 Sep 2014 21:57:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s83LvwF8089232; Wed, 3 Sep 2014 21:57:58 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s83LvwnZ089227; Wed, 3 Sep 2014 21:57:58 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201409032157.s83LvwnZ089227@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 3 Sep 2014 21:57:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367237 - 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-1 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: Wed, 03 Sep 2014 21:57:58 -0000 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 - -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 +.include 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