Date: Sat, 18 Jan 2014 22:54:38 -0500 From: Jim Ohlstein <jim@selenium.jlkhosting.com> To: FreeBSD-gnats-submit@freebsd.org Cc: osa@FreeBSD.org Subject: ports/185874: [PATCH] lang/luajit: add staging, clean up Makefile Message-ID: <E1W4jT4-0006xE-S0@selenium.jlkhosting.com> Resent-Message-ID: <201401190400.s0J401mU036404@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185874 >Category: ports >Synopsis: [PATCH] lang/luajit: add staging, clean up Makefile >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jan 19 04:00:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Jim Ohlstein >Release: FreeBSD 10.0-PRERELEASE amd64 >Organization: JLK Hosting >Environment: System: FreeBSD selenium.jlkhosting.com 10.0-PRERELEASE FreeBSD 10.0-PRERELEASE #0 r260431: Tue Jan 7 21:59:51 >Description: Several changes to bring port up to date: -Add license -Fix USE_GMAKE -> USES=gmake -Add staging Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- luajit-2.0.2.patch begins here --- diff -ruN /usr/ports/lang/luajit/Makefile ./Makefile --- /usr/ports/lang/luajit/Makefile 2014-01-18 11:01:07.094745788 -0500 +++ ./Makefile 2014-01-18 19:00:51.447726222 -0500 @@ -7,35 +7,42 @@ MASTER_SITES= http://luajit.org/download/ DISTNAME= LuaJIT-${DISTVERSION} +MAINTAINER= osa@FreeBSD.org +COMMENT= A Just-In-Time Compiler for Lua + +LICENSE= MIT + #PATCH_SITES= ${MASTER_SITES} #PATCHFILES= v${PORTVERSION}_hotfix1.patch #PATCH_DIST_STRIP= -p1 -MAINTAINER= osa@FreeBSD.org -COMMENT= A Just-In-Time Compiler for Lua - WRKSRC= ${WRKDIR}/LuaJIT-${DISTVERSION} -USE_GMAKE= yes +USES= gmake USE_LDCONFIG= yes PLIST_SUB+= VERSION=${DISTVERSION} -.if !defined(NO_INSTALL_MANPAGES) -MAN1= luajit.1 -.endif - -NO_STAGE= yes -post-install: - ${LN} -sf ${PREFIX}/bin/${PORTNAME}-${DISTVERSION} \ - ${PREFIX}/bin/${PORTNAME} -.if !defined(NO_INSTALL_MANPAGES) - @${INSTALL_MAN} ${WRKSRC}/etc/luajit.1 ${MAN1PREFIX}/man/man1 -.endif - .include <bsd.port.pre.mk> .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" BROKEN= Does not compile on ia64, powerpc, or sparc64 .endif -.include <bsd.port.post.mk> +do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/share/${PORTNAME}-${DISTVERSION}/jit + ${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}-2.0 + ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-${DISTVERSION} +.for i in lua.h luaconf.h luajit.h lualib.h lauxlib.h lua.hpp + ${INSTALL_DATA} ${WRKSRC}/src/${i} ${STAGEDIR}${PREFIX}/include/${PORTNAME}-2.0 +.endfor + ${INSTALL_PROGRAM} ${WRKSRC}/src/libluajit.so ${STAGEDIR}${PREFIX}/lib/libluajit.so.${DISTVERSION} + ${INSTALL_PROGRAM} ${WRKSRC}/src/libluajit.a ${STAGEDIR}${PREFIX}/lib/libluajit-5.1.a + ${INSTALL_DATA} ${WRKSRC}/etc/luajit.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig +.for i in *lua + ${INSTALL_DATA} ${WRKSRC}/src/jit/${i} ${STAGEDIR}${PREFIX}/share/${PORTNAME}-${DISTVERSION}/jit +.endfor + +post-install: + @${INSTALL_MAN} ${WRKSRC}/etc/luajit.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + +.include <bsd.port.mk> diff -ruN /usr/ports/lang/luajit/pkg-plist ./pkg-plist --- /usr/ports/lang/luajit/pkg-plist 2013-12-17 22:26:15.388128839 -0500 +++ ./pkg-plist 2014-01-18 19:02:34.024538830 -0500 @@ -1,27 +1,31 @@ -bin/luajit bin/luajit-%%VERSION%% +include/luajit-2.0/lauxlib.h include/luajit-2.0/lua.h +include/luajit-2.0/lua.hpp include/luajit-2.0/luaconf.h include/luajit-2.0/luajit.h include/luajit-2.0/lualib.h -include/luajit-2.0/lauxlib.h -include/luajit-2.0/lua.hpp lib/libluajit-5.1.a -lib/libluajit-5.1.so -lib/libluajit-5.1.so.2 -lib/libluajit-5.1.so.%%VERSION%% +lib/libluajit.so.%%VERSION%% libdata/pkgconfig/luajit.pc -share/luajit-%%VERSION%%/jit/bc.lua -share/luajit-%%VERSION%%/jit/bcsave.lua -share/luajit-%%VERSION%%/jit/dis_arm.lua -share/luajit-%%VERSION%%/jit/dis_mips.lua -share/luajit-%%VERSION%%/jit/dis_mipsel.lua -share/luajit-%%VERSION%%/jit/dis_x64.lua -share/luajit-%%VERSION%%/jit/dis_x86.lua -share/luajit-%%VERSION%%/jit/dis_ppc.lua -share/luajit-%%VERSION%%/jit/dump.lua -share/luajit-%%VERSION%%/jit/v.lua -share/luajit-%%VERSION%%/jit/vmdef.lua -@dirrm share/luajit-%%VERSION%%/jit -@dirrm share/luajit-%%VERSION%% -@dirrm include/luajit-2.0 +man/man1/luajit.1.gz +%%DATADIR%%-%%VERSION%%/jit/bc.lua +%%DATADIR%%-%%VERSION%%/jit/bcsave.lua +%%DATADIR%%-%%VERSION%%/jit/dis_arm.lua +%%DATADIR%%-%%VERSION%%/jit/dis_mips.lua +%%DATADIR%%-%%VERSION%%/jit/dis_mipsel.lua +%%DATADIR%%-%%VERSION%%/jit/dis_ppc.lua +%%DATADIR%%-%%VERSION%%/jit/dis_x64.lua +%%DATADIR%%-%%VERSION%%/jit/dis_x86.lua +%%DATADIR%%-%%VERSION%%/jit/dump.lua +%%DATADIR%%-%%VERSION%%/jit/v.lua +%%DATADIR%%-%%VERSION%%/jit/vmdef.lua +@exec ln -sf %D/lib/libluajit.so.%%VERSION%% %D/lib/libluajit-5.1.so +@exec ln -sf %D/lib/libluajit.so.%%VERSION%% %D/lib/libluajit-5.1.so.2 +@exec ln -sf %D/bin/luajit-%%VERSION%% %D/bin/luajit +@unexec rm %D/lib/libluajit-5.1.so 2>&1 >/dev/null || true +@unexec rm %D/lib/libluajit-5.1.so.2 2>&1 >/dev/null || true +@unexec rm %D/bin/luajit 2>&1 >/dev/null || true +@dirrmtry %%DATADIR%%-%%VERSION%%/jit +@dirrmtry %%DATADIR%%-%%VERSION%% +@dirrmtry include/luajit-2.0 --- luajit-2.0.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1W4jT4-0006xE-S0>