svn commit: r356855 - in head/devel/luajava: . files

[Antoine Brodin]

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