From owner-svn-ports-head@freebsd.org Mon Sep 9 08:57:56 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CD4DAF2882; Mon, 9 Sep 2019 08:57:56 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Rhrh530vz4fKh; Mon, 9 Sep 2019 08:57:56 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 909D1B07D; Mon, 9 Sep 2019 08:57:56 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x898vu83071679; Mon, 9 Sep 2019 08:57:56 GMT (envelope-from mm@FreeBSD.org) Received: (from mm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x898vs1E071669; Mon, 9 Sep 2019 08:57:54 GMT (envelope-from mm@FreeBSD.org) Message-Id: <201909090857.x898vs1E071669@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mm set sender to mm@FreeBSD.org using -f From: Martin Matuska Date: Mon, 9 Sep 2019 08:57:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511608 - in head/lang: . luajit-openresty luajit-openresty/files X-SVN-Group: ports-head X-SVN-Commit-Author: mm X-SVN-Commit-Paths: in head/lang: . luajit-openresty luajit-openresty/files X-SVN-Commit-Revision: 511608 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2019 08:57:56 -0000 Author: mm Date: Mon Sep 9 08:57:54 2019 New Revision: 511608 URL: https://svnweb.freebsd.org/changeset/ports/511608 Log: OpenResty's Branch of LuaJIT 2 WWW: https://github.com/openresty/luajit2 Added: head/lang/luajit-openresty/ head/lang/luajit-openresty/Makefile (contents, props changed) head/lang/luajit-openresty/distinfo (contents, props changed) head/lang/luajit-openresty/files/ head/lang/luajit-openresty/files/patch-Makefile (contents, props changed) head/lang/luajit-openresty/files/patch-etc_luajit.pc (contents, props changed) head/lang/luajit-openresty/files/patch-src_Makefile (contents, props changed) head/lang/luajit-openresty/pkg-descr (contents, props changed) head/lang/luajit-openresty/pkg-plist (contents, props changed) Modified: head/lang/Makefile Modified: head/lang/Makefile ============================================================================== --- head/lang/Makefile Mon Sep 9 07:46:37 2019 (r511607) +++ head/lang/Makefile Mon Sep 9 08:57:54 2019 (r511608) @@ -190,6 +190,7 @@ SUBDIR += lua52 SUBDIR += lua53 SUBDIR += luajit + SUBDIR += luajit-openresty SUBDIR += malbolge SUBDIR += maude SUBDIR += mawk Added: head/lang/luajit-openresty/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/luajit-openresty/Makefile Mon Sep 9 08:57:54 2019 (r511608) @@ -0,0 +1,41 @@ +# Created by: Martin Matuska +# $FreeBSD$ + +PORTNAME= luajit +DISTVERSION= 2.1.20190626 +CATEGORIES= lang +PKGNAMESUFFIX= -openresty + +MAINTAINER= mm@FreeBSD.org +COMMENT= Just-In-Time Compiler for Lua (OpenResty branch) + +LICENSE= MIT PD +LICENSE_COMB= multi +LICENSE_FILE= ${WRKSRC}/COPYRIGHT + +USES= gmake + +CONFLICTS_INSTALL= luajit + +USE_LDCONFIG= yes +MAKE_ARGS= CC=${CC} + +USE_GITHUB= yes +GH_ACCOUNT= openresty +GH_PROJECT= luajit2 +GH_TAGNAME= v2.1-20190626 + +PLIST_SUB+= VERSION=2.1.0-beta3 SOVERSION=2.1.0 + +.include + +.if ${ARCH:Mpowerpc*} || ${ARCH:Mmips*} || ${ARCH:Msparc*} +USE_GCC=yes +.endif + +post-install: + ${LN} -sf ${PORTNAME}-${DISTVERSION} \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_MAN} ${WRKSRC}/etc/luajit.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + +.include Added: head/lang/luajit-openresty/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/luajit-openresty/distinfo Mon Sep 9 08:57:54 2019 (r511608) @@ -0,0 +1,3 @@ +TIMESTAMP = 1567982328 +SHA256 (openresty-luajit2-2.1.20190626-v2.1-20190626_GH0.tar.gz) = 132cf463b1f3317cd8ac0ba91ddf48a8b730531de3ae7a3ed1bbbd8436cd3112 +SIZE (openresty-luajit2-2.1.20190626-v2.1-20190626_GH0.tar.gz) = 1049535 Added: head/lang/luajit-openresty/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/luajit-openresty/files/patch-Makefile Mon Sep 9 08:57:54 2019 (r511608) @@ -0,0 +1,59 @@ +--- Makefile.orig 2019-06-26 21:12:49 UTC ++++ Makefile +@@ -25,7 +25,7 @@ ABIVER= 5.1 + # Change the installation path as needed. This automatically adjusts + # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path! + # +-export PREFIX= /usr/local ++#export PREFIX= /usr/local + export MULTILIB= lib + ############################################################################## + +@@ -34,6 +34,7 @@ INSTALL_BIN= $(DPREFIX)/bin + INSTALL_LIB= $(DPREFIX)/$(MULTILIB) + INSTALL_SHARE= $(DPREFIX)/share + INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) ++INSTALL_LIBD= $(DPREFIX)/libdata + + INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) + INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit +@@ -41,8 +42,7 @@ INSTALL_LMODD= $(INSTALL_SHARE)/lua + INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) + INSTALL_CMODD= $(INSTALL_LIB)/lua + INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER) +-INSTALL_MAN= $(INSTALL_SHARE)/man/man1 +-INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig ++INSTALL_PKGCONFIG= $(INSTALL_LIBD)/pkgconfig + + INSTALL_TNAME= luajit-$(VERSION) + INSTALL_TSYMNAME= luajit +@@ -63,8 +63,8 @@ INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) + INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) + INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) + +-INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \ +- $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD) ++INSTALL_DIRS= $(INSTALL_INC) \ ++ $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) + UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \ + $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD) + +@@ -121,10 +121,8 @@ install: $(INSTALL_DEP) + $(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) + cd src && test -f $(FILE_SO) && \ + $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \ +- $(LDCONFIG) $(INSTALL_LIB) && \ + $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \ + $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : +- cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN) + cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \ + $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \ + $(RM) $(FILE_PC).tmp +@@ -143,7 +141,6 @@ uninstall: + for file in $(FILES_INC); do \ + $(UNINSTALL) $(INSTALL_INC)/$$file; \ + done +- $(LDCONFIG) $(INSTALL_LIB) + $(RMDIR) $(UNINSTALL_DIRS) || : + @echo "==== Successfully uninstalled LuaJIT $(VERSION) from $(PREFIX) ====" + Added: head/lang/luajit-openresty/files/patch-etc_luajit.pc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/luajit-openresty/files/patch-etc_luajit.pc Mon Sep 9 08:57:54 2019 (r511608) @@ -0,0 +1,9 @@ +--- etc/luajit.pc.orig 2019-06-26 21:12:49 UTC ++++ etc/luajit.pc +@@ -21,5 +21,5 @@ URL: http://luajit.org + Version: ${version} + Requires: + Libs: -L${libdir} -l${libname} +-Libs.private: -Wl,-E -lm -ldl ++Libs.private: -Wl,-E -lm + Cflags: -I${includedir} Added: head/lang/luajit-openresty/files/patch-src_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/luajit-openresty/files/patch-src_Makefile Mon Sep 9 08:57:54 2019 (r511608) @@ -0,0 +1,29 @@ +--- src/Makefile.orig 2019-06-26 21:12:49 UTC ++++ src/Makefile +@@ -24,7 +24,7 @@ NODOTABIVER= 51 + # removing the '#' in front of them. Make sure you force a full recompile + # with "make clean", followed by "make" if you change any options. + # +-DEFAULT_CC = gcc ++DEFAULT_CC = cc + # + # LuaJIT builds as a native 32 or 64 bit binary by default. + CC= $(DEFAULT_CC) +@@ -36,7 +36,7 @@ CC= $(DEFAULT_CC) + # to slow down the C part by not omitting it. Debugging, tracebacks and + # unwinding are not affected -- the assembler part has frame unwind + # information and GCC emits it where needed (x64) or with -g (see CCDEBUG). +-CCOPT= -O2 -fomit-frame-pointer ++#CCOPT= -O2 -fomit-frame-pointer + # Use this if you want to generate a smaller binary (but it's slower): + #CCOPT= -Os -fomit-frame-pointer + # Note: it's no longer recommended to use -O3 with GCC 4.x. +@@ -47,7 +47,7 @@ CCOPT= -O2 -fomit-frame-pointer + # x86/x64 only: For GCC 4.2 or higher and if you don't intend to distribute + # the binaries to a different machine you could also use: -march=native + # +-CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse ++#CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse + CCOPT_x64= + CCOPT_arm= + CCOPT_arm64= Added: head/lang/luajit-openresty/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/luajit-openresty/pkg-descr Mon Sep 9 08:57:54 2019 (r511608) @@ -0,0 +1,3 @@ +OpenResty's Branch of LuaJIT 2 + +WWW: https://github.com/openresty/luajit2 Added: head/lang/luajit-openresty/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/luajit-openresty/pkg-plist Mon Sep 9 08:57:54 2019 (r511608) @@ -0,0 +1,31 @@ +bin/luajit +bin/luajit-%%VERSION%% +include/luajit-2.1/lauxlib.h +include/luajit-2.1/lua.h +include/luajit-2.1/lua.hpp +include/luajit-2.1/luaconf.h +include/luajit-2.1/luajit.h +include/luajit-2.1/lualib.h +lib/libluajit-5.1.a +lib/libluajit-5.1.so +lib/libluajit-5.1.so.2 +lib/libluajit-5.1.so.%%SOVERSION%% +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_arm64.lua +share/luajit-%%VERSION%%/jit/dis_arm64be.lua +share/luajit-%%VERSION%%/jit/dis_mips.lua +share/luajit-%%VERSION%%/jit/dis_mips64.lua +share/luajit-%%VERSION%%/jit/dis_mips64el.lua +share/luajit-%%VERSION%%/jit/dis_mipsel.lua +share/luajit-%%VERSION%%/jit/dis_ppc.lua +share/luajit-%%VERSION%%/jit/dis_x64.lua +share/luajit-%%VERSION%%/jit/dis_x86.lua +share/luajit-%%VERSION%%/jit/dump.lua +share/luajit-%%VERSION%%/jit/p.lua +share/luajit-%%VERSION%%/jit/v.lua +share/luajit-%%VERSION%%/jit/vmdef.lua +share/luajit-%%VERSION%%/jit/zone.lua +man/man1/luajit.1.gz