From owner-svn-ports-all@FreeBSD.ORG Fri May 23 17:26:37 2014 Return-Path: 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 AFF0A1AF; Fri, 23 May 2014 17:26:37 +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 90BE923FE; Fri, 23 May 2014 17:26:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4NHQbun053274; Fri, 23 May 2014 17:26:37 GMT (envelope-from vanilla@svn.freebsd.org) Received: (from vanilla@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4NHQbqY053264; Fri, 23 May 2014 17:26:37 GMT (envelope-from vanilla@svn.freebsd.org) Message-Id: <201405231726.s4NHQbqY053264@svn.freebsd.org> From: "Vanilla I. Shu" Date: Fri, 23 May 2014 17:26:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354952 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 May 2014 17:26:37 -0000 Author: vanilla Date: Fri May 23 17:26:36 2014 New Revision: 354952 URL: http://svnweb.freebsd.org/changeset/ports/354952 QAT: https://qat.redports.org/buildarchive/r354952/ Log: 1: Stageify. 2: change to USES. Approved by: portmgr@ Modified: head/devel/luajava/Makefile head/devel/luajava/files/patch-config head/devel/luajava/pkg-plist Modified: head/devel/luajava/Makefile ============================================================================== --- head/devel/luajava/Makefile Fri May 23 17:23:01 2014 (r354951) +++ head/devel/luajava/Makefile Fri May 23 17:26:36 2014 (r354952) @@ -10,7 +10,7 @@ MASTER_SITES= http://luaforge.net/frs/do 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 Modified: head/devel/luajava/files/patch-config ============================================================================== --- head/devel/luajava/files/patch-config Fri May 23 17:23:01 2014 (r354951) +++ head/devel/luajava/files/patch-config Fri May 23 17:26:36 2014 (r354952) @@ -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 + + + ######################################################### Modified: head/devel/luajava/pkg-plist ============================================================================== --- head/devel/luajava/pkg-plist Fri May 23 17:23:01 2014 (r354951) +++ head/devel/luajava/pkg-plist Fri May 23 17:26:36 2014 (r354952) @@ -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%%