3 files changed, 25 insertions, 13 deletions

diff --git a/devel/luajava/Makefile b/devel/luajava/Makefile
index 0c0d9cd28880..197ae3cba712 100644
--- a/devel/luajava/Makefile
+++ b/devel/luajava/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://luaforge.net/frs/download.php/2105/
 MAINTAINER=	sunghyuk@gmail.com
 COMMENT=	Lua scripting tool for Java
 
-USE_GMAKE=	yes
+USES=		gmake dos2unix
 USE_LUA=	5.1
 LUA_COMPS=	lua
 .if ${USE_LUA} == 5.0
@@ -21,10 +21,8 @@ USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 ALL_TARGET=	run
-USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=	.*\.*
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LUA_DIR%%|${PREFIX}|' ${WRKSRC}/config
 	@${REINPLACE_CMD} -e 's|%%LUA_LIBDIR%%|${LUA_LIBDIR}|' ${WRKSRC}/config
@@ -33,13 +31,15 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|linux|freebsd|' ${WRKSRC}/config
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/libluajava-1.1.so ${LUA_MODLIBDIR}
-	${INSTALL_DATA} ${WRKSRC}/luajava-1.1.jar ${JAVAJARDIR}
+	${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/libluajava-1.1.so ${STAGEDIR}${LUA_MODLIBDIR}
+	${MKDIR} ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/luajava-1.1.jar ${STAGEDIR}${JAVAJARDIR}
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/luajava/files/patch-config b/devel/luajava/files/patch-config
index a9693959c577..7de3bf9bc6d4 100644
--- a/devel/luajava/files/patch-config
+++ b/devel/luajava/files/patch-config
@@ -1,5 +1,5 @@
---- config.orig	2007-12-10 16:42:38.000000000 +0900
-+++ config	2007-12-10 16:42:28.000000000 +0900
+--- config.orig	2014-05-24 01:20:21.775436051 +0800
++++ config	2014-05-24 01:21:11.668434549 +0800
 @@ -1,9 +1,9 @@
  #############################################################
  #Linux/BSD/Mac
@@ -14,7 +14,7 @@
  # For Mac OS, comment the above line and uncomment this one
  #JDK=/Library/Java/Home
  
-@@ -23,7 +23,7 @@
+@@ -23,13 +23,13 @@ LIB_OPTION= -shared
  #LIB_OPTION= -dynamiclib -all_load
  
  ## On FreeBSD and Mac OS systems, the following line should be commented
@@ -22,4 +22,12 @@
 +#DLLIB= -ldl
  
  WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings
- INCS= -I$(JDK)/include -I$(JDK)/include/linux -I$(LUA_INCLUDES)
+-INCS= -I$(JDK)/include -I$(JDK)/include/linux -I$(LUA_INCLUDES)
++INCS= -I$(JDK)/include -I$(JDK)/include/freebsd -I$(LUA_INCLUDES)
+ CFLAGS= $(WARN) $(INCS)
+ 
+-CC= gcc
++#CC= gcc
+ 
+ 
+ #########################################################
diff --git a/devel/luajava/pkg-plist b/devel/luajava/pkg-plist
index fcce17b4665d..7fe0ab9acfa0 100644
--- a/devel/luajava/pkg-plist
+++ b/devel/luajava/pkg-plist
@@ -1,3 +1,4 @@
+%%LUA_MODLIBDIR%%/libluajava-1.1.so
 %%PORTDOCS%%%%DOCSDIR%%/br/examples.html
 %%PORTDOCS%%%%DOCSDIR%%/br/history.html
 %%PORTDOCS%%%%DOCSDIR%%/br/index.html
@@ -23,7 +24,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/us/API/org/keplerproject/luajava/package-tree.html
 %%PORTDOCS%%%%DOCSDIR%%/us/API/overview-tree.html
 %%PORTDOCS%%%%DOCSDIR%%/us/API/package-list
+%%PORTDOCS%%%%DOCSDIR%%/us/API/resources/background.gif
 %%PORTDOCS%%%%DOCSDIR%%/us/API/resources/inherit.gif
+%%PORTDOCS%%%%DOCSDIR%%/us/API/resources/tab.gif
+%%PORTDOCS%%%%DOCSDIR%%/us/API/resources/titlebar.gif
+%%PORTDOCS%%%%DOCSDIR%%/us/API/resources/titlebar_end.gif
 %%PORTDOCS%%%%DOCSDIR%%/us/API/serialized-form.html
 %%PORTDOCS%%%%DOCSDIR%%/us/API/stylesheet.css
 %%PORTDOCS%%%%DOCSDIR%%/us/examples.html
@@ -33,12 +38,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/us/luajava_128.png
 %%PORTDOCS%%%%DOCSDIR%%/us/manual.html
 %%JAVAJARDIR%%/luajava-1.1.jar
-%%LUA_MODLIBDIR%%/libluajava-1.1.so
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/br
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/us/API/resources
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/us/API/org/keplerproject/luajava
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/us/API/org/keplerproject
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/us/API/org
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/us/API/resources
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/us/API
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/us
 %%PORTDOCS%%@dirrm %%DOCSDIR%%