From owner-svn-ports-all@FreeBSD.ORG  Fri Jun  6 21:39:24 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 664A7333;
 Fri,  6 Jun 2014 21:39:24 +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 3923321FC;
 Fri,  6 Jun 2014 21:39:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s56LdOH5069781;
 Fri, 6 Jun 2014 21:39:24 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s56LdN4d069778;
 Fri, 6 Jun 2014 21:39:23 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201406062139.s56LdN4d069778@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Fri, 6 Jun 2014 21:39:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r356855 - in head/devel/luajava: . 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-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Jun 2014 21:39:24 -0000

Author: antoine
Date: Fri Jun  6 21:39:23 2014
New Revision: 356855
URL: http://svnweb.freebsd.org/changeset/ports/356855
QAT: https://qat.redports.org/buildarchive/r356855/

Log:
  Unbreak a bit
  
  Reported by:	pkg-fallout

Modified:
  head/devel/luajava/Makefile
  head/devel/luajava/files/patch-config

Modified: head/devel/luajava/Makefile
==============================================================================
--- head/devel/luajava/Makefile	Fri Jun  6 21:35:21 2014	(r356854)
+++ head/devel/luajava/Makefile	Fri Jun  6 21:39:23 2014	(r356855)
@@ -31,6 +31,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%LUA_DIR%%|${PREFIX}|' ${WRKSRC}/config
 	@${REINPLACE_CMD} -e 's|%%LUA_LIBDIR%%|${LUA_LIBDIR}|' ${WRKSRC}/config
 	@${REINPLACE_CMD} -e 's|%%LUA_INCDIR%%|${LUA_INCDIR}|' ${WRKSRC}/config
+	@${REINPLACE_CMD} -e 's|%%LUA_VER%%|${LUA_VER}|' ${WRKSRC}/config
 	@${REINPLACE_CMD} -e 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/config
 	@${REINPLACE_CMD} -e 's|linux|freebsd|' ${WRKSRC}/config
 

Modified: head/devel/luajava/files/patch-config
==============================================================================
--- head/devel/luajava/files/patch-config	Fri Jun  6 21:35:21 2014	(r356854)
+++ head/devel/luajava/files/patch-config	Fri Jun  6 21:39:23 2014	(r356855)
@@ -1,6 +1,6 @@
---- config.orig	2014-05-24 01:20:21.775436051 +0800
-+++ config	2014-05-24 01:21:11.668434549 +0800
-@@ -1,9 +1,9 @@
+--- ./config.orig	2014-06-06 21:17:17.000000000 +0000
++++ ./config	2014-06-06 21:17:45.000000000 +0000
+@@ -1,14 +1,14 @@
  #############################################################
  #Linux/BSD/Mac
 -LUA_DIR= /usr/local/share/lua/5.1.1
@@ -14,7 +14,13 @@
  # For Mac OS, comment the above line and uncomment this one
  #JDK=/Library/Java/Home
  
-@@ -23,13 +23,13 @@ LIB_OPTION= -shared
+ # Full path to Lua static library
+-LIB_LUA=$(LUA_LIBDIR)/liblua.a
++LIB_LUA=$(LUA_LIBDIR)/liblua-%%LUA_VER%%.a
+ 
+ #Linux/BSD
+ LIB_EXT= .so
+@@ -23,13 +23,13 @@
  #LIB_OPTION= -dynamiclib -all_load
  
  ## On FreeBSD and Mac OS systems, the following line should be commented