svn commit: r525059 - in head/devel/lua-luarocks: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Mon Feb 3 19:45:35 UTC 2020
Author: sunpoet
Date: Mon Feb 3 19:45:33 2020
New Revision: 525059
URL: https://svnweb.freebsd.org/changeset/ports/525059
Log:
Update to 3.3.0
- Update UNIQUE_SUFFIX: use LUA_VER_STR as USES=lua does
- Take maintainership
Changes: https://github.com/luarocks/luarocks/blob/master/CHANGELOG.md
Modified:
head/devel/lua-luarocks/Makefile
head/devel/lua-luarocks/distinfo
head/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua
head/devel/lua-luarocks/pkg-plist
Modified: head/devel/lua-luarocks/Makefile
==============================================================================
--- head/devel/lua-luarocks/Makefile Mon Feb 3 19:45:27 2020 (r525058)
+++ head/devel/lua-luarocks/Makefile Mon Feb 3 19:45:33 2020 (r525059)
@@ -1,45 +1,48 @@
# $FreeBSD$
PORTNAME= luarocks
-DISTVERSION= 3.0.1
+DISTVERSION= 3.3.0
CATEGORIES= devel
-MASTER_SITES= https://${PORTNAME}.github.io/${PORTNAME}/releases/
+MASTER_SITES= https://luarocks.org/releases/
PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= sunpoet at FreeBSD.org
COMMENT= Package manager for Lua modules
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= zip:archivers/zip \
- curl:ftp/curl
+RUN_DEPENDS= curl:ftp/curl \
+ zip:archivers/zip
USES= gmake uniquefiles
-NO_ARCH= yes
+
+CONFIGURE_ARGS= --lua-version=${LUA_VER} \
+ --prefix=${PREFIX} \
+ --with-lua-include=${LUA_INCDIR}
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --prefix=${PREFIX} \
- --with-lua-include=${LUA_INCDIR} \
- --lua-version=${LUA_VER}
-UNIQUE_SUFFIX= -${LUA_VER}
-UNIQUE_SUFFIX_FILES= bin/${PORTNAME} bin/${PORTNAME}-admin
+NO_ARCH= yes
+UNIQUE_SUFFIX= ${LUA_VER_STR}
+UNIQUE_SUFFIX_FILES= bin/luarocks bin/luarocks-admin
OPTIONS_DEFINE= LUAJIT
-LUAJIT_DESC= Use LuaJIT instead of Lua
+LUAJIT_DESC= Use LuaJIT instead of Lua
+
LUAJIT_BUILD_DEPENDS= luajit:lang/luajit
LUAJIT_RUN_DEPENDS= luajit:lang/luajit
LUAJIT_CONFIGURE_ON= --lua-suffix=jit
LUAJIT_PLIST_SUB= LUA_VER=${LUA_VER} \
LUA_MODSHAREDIR=share/lua/${LUA_VER}
LUAJIT_VARS= LUA_INCDIR=${LOCALBASE}/include/luajit-2.0 \
- LUA_VER=5.1 LUA_PKGNAMEPREFIX=lua51-
+ LUA_PKGNAMEPREFIX=lua51- \
+ LUA_VER=5.1
LUAJIT_USES_OFF= lua
post-patch:
# /usr/local is a mix of site-local data and packages installs.
-# If PREFIX/LOCALBASE changes look for dependencies there as well.
+# If PREFIX/LOCALBASE changes, look for dependencies there as well.
.if defined(PREFIX) && ${PREFIX} != "/usr/local" && ${PREFIX} != "/usr"
- @${REINPLACE_CMD} '/external_deps_dirs/s,{ ,&"${PREFIX}"\, ,' \
+ @${REINPLACE_CMD} '/external_deps_dirs/ s|{ |&"${PREFIX}", |' \
${WRKSRC}/src/luarocks/core/cfg.lua
.endif
Modified: head/devel/lua-luarocks/distinfo
==============================================================================
--- head/devel/lua-luarocks/distinfo Mon Feb 3 19:45:27 2020 (r525058)
+++ head/devel/lua-luarocks/distinfo Mon Feb 3 19:45:33 2020 (r525059)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534264242
-SHA256 (luarocks-3.0.1.tar.gz) = b989c4b60d6c9edcd65169e5e42fcffbd39cdbebe6b138fa5aea45102f8d9ec0
-SIZE (luarocks-3.0.1.tar.gz) = 205787
+TIMESTAMP = 1580746227
+SHA256 (luarocks-3.3.0.tar.gz) = 8de54eb851f5245ed3708d94d8872e825b9704049d3ad4febe8e219f419b427d
+SIZE (luarocks-3.3.0.tar.gz) = 241339
Modified: head/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua
==============================================================================
--- head/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua Mon Feb 3 19:45:27 2020 (r525058)
+++ head/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua Mon Feb 3 19:45:33 2020 (r525059)
@@ -3,9 +3,9 @@
- Prefer system compiler over GCC on BSDs/Solaris
- OpenBSD uses Clang by default, so don't pass GCC RPATH
---- src/luarocks/core/cfg.lua.orig 2018-08-14 16:30:42 UTC
+--- src/luarocks/core/cfg.lua.orig 2020-01-28 15:54:42 UTC
+++ src/luarocks/core/cfg.lua
-@@ -35,6 +35,7 @@ local platform_order = {
+@@ -36,6 +36,7 @@ local platform_order = {
"netbsd",
"openbsd",
"freebsd",
@@ -13,15 +13,15 @@
"linux",
"macosx",
"cygwin",
-@@ -154,6 +155,7 @@ end
- local function make_platforms(system)
- if system then
- if system == "Linux" then return { unix = true, linux = true }
-+ elseif system == "DragonFly" then return { unix = true, bsd = true, dragonfly = true }
- elseif system == "FreeBSD" then return { unix = true, bsd = true, freebsd = true }
- elseif system == "OpenBSD" then return { unix = true, bsd = true, openbsd = true }
- elseif system == "NetBSD" then return { unix = true, bsd = true, netbsd = true }
-@@ -357,13 +359,13 @@ local function make_defaults(lua_version, target_cpu,
+@@ -157,6 +158,7 @@ end
+
+ local platform_sets = {
+ freebsd = { unix = true, bsd = true, freebsd = true },
++ dragonfly = { unix = true, bsd = true, dragonfly = true },
+ openbsd = { unix = true, bsd = true, openbsd = true },
+ solaris = { unix = true, solaris = true },
+ windows = { windows = true, win32 = true },
+@@ -365,12 +367,13 @@ local function make_defaults(lua_version, target_cpu,
defaults.external_lib_extension = "so"
defaults.obj_extension = "o"
defaults.external_deps_dirs = { "/usr/local", "/usr", "/" }
@@ -35,19 +35,11 @@
+ defaults.variables.LD = os.getenv("CC") or defaults.variables.CC
defaults.gcc_rpath = true
- defaults.variables.LIBFLAG = "-shared"
--
+ defaults.variables.LIBFLAG = (os.getenv("LDFLAGS") or "").." -shared"
- defaults.external_deps_patterns = {
- bin = { "?" },
- lib = { "lib?.a", "lib?.so", "lib?.so.*" },
-@@ -449,15 +451,18 @@ local function make_defaults(lua_version, target_cpu,
- end
- end
+ defaults.variables.TEST = "test"
-+ if platforms.dragonfly then
-+ defaults.arch = "dragonfly-"..target_cpu
-+ end
-+
+ defaults.external_deps_patterns = {
+@@ -457,12 +460,15 @@ local function make_defaults(lua_version, target_cpu,
if platforms.freebsd then
defaults.arch = "freebsd-"..target_cpu
defaults.gcc_rpath = false
@@ -55,6 +47,10 @@
- defaults.variables.LD = "cc"
end
++ if platforms.dragonfly then
++ defaults.arch = "dragonfly-"..target_cpu
++ end
++
if platforms.openbsd then
defaults.arch = "openbsd-"..target_cpu
+ defaults.gcc_rpath = false
Modified: head/devel/lua-luarocks/pkg-plist
==============================================================================
--- head/devel/lua-luarocks/pkg-plist Mon Feb 3 19:45:27 2020 (r525058)
+++ head/devel/lua-luarocks/pkg-plist Mon Feb 3 19:45:33 2020 (r525059)
@@ -7,6 +7,7 @@ bin/luarocks-admin
%%LUA_MODSHAREDIR%%/luarocks/admin/cmd/refresh_cache.lua
%%LUA_MODSHAREDIR%%/luarocks/admin/cmd/remove.lua
%%LUA_MODSHAREDIR%%/luarocks/admin/index.lua
+%%LUA_MODSHAREDIR%%/luarocks/argparse.lua
%%LUA_MODSHAREDIR%%/luarocks/build.lua
%%LUA_MODSHAREDIR%%/luarocks/build/builtin.lua
%%LUA_MODSHAREDIR%%/luarocks/build/cmake.lua
@@ -17,7 +18,6 @@ bin/luarocks-admin
%%LUA_MODSHAREDIR%%/luarocks/cmd/config.lua
%%LUA_MODSHAREDIR%%/luarocks/cmd/doc.lua
%%LUA_MODSHAREDIR%%/luarocks/cmd/download.lua
-%%LUA_MODSHAREDIR%%/luarocks/cmd/help.lua
%%LUA_MODSHAREDIR%%/luarocks/cmd/init.lua
%%LUA_MODSHAREDIR%%/luarocks/cmd/install.lua
%%LUA_MODSHAREDIR%%/luarocks/cmd/lint.lua
@@ -40,8 +40,10 @@ bin/luarocks-admin
%%LUA_MODSHAREDIR%%/luarocks/core/manif.lua
%%LUA_MODSHAREDIR%%/luarocks/core/path.lua
%%LUA_MODSHAREDIR%%/luarocks/core/persist.lua
+%%LUA_MODSHAREDIR%%/luarocks/core/sysdetect.lua
%%LUA_MODSHAREDIR%%/luarocks/core/util.lua
%%LUA_MODSHAREDIR%%/luarocks/core/vers.lua
+%%LUA_MODSHAREDIR%%/luarocks/deplocks.lua
%%LUA_MODSHAREDIR%%/luarocks/deps.lua
%%LUA_MODSHAREDIR%%/luarocks/dir.lua
%%LUA_MODSHAREDIR%%/luarocks/download.lua
@@ -59,12 +61,14 @@ bin/luarocks-admin
%%LUA_MODSHAREDIR%%/luarocks/fetch/sscm.lua
%%LUA_MODSHAREDIR%%/luarocks/fetch/svn.lua
%%LUA_MODSHAREDIR%%/luarocks/fs.lua
+%%LUA_MODSHAREDIR%%/luarocks/fs/freebsd.lua
+%%LUA_MODSHAREDIR%%/luarocks/fs/linux.lua
%%LUA_MODSHAREDIR%%/luarocks/fs/lua.lua
+%%LUA_MODSHAREDIR%%/luarocks/fs/macosx.lua
%%LUA_MODSHAREDIR%%/luarocks/fs/tools.lua
%%LUA_MODSHAREDIR%%/luarocks/fs/unix.lua
%%LUA_MODSHAREDIR%%/luarocks/fs/unix/tools.lua
%%LUA_MODSHAREDIR%%/luarocks/fs/win32.lua
-%%LUA_MODSHAREDIR%%/luarocks/fs/win32/pe-parser.lua
%%LUA_MODSHAREDIR%%/luarocks/fs/win32/tools.lua
%%LUA_MODSHAREDIR%%/luarocks/fun.lua
%%LUA_MODSHAREDIR%%/luarocks/loader.lua
@@ -80,6 +84,7 @@ bin/luarocks-admin
%%LUA_MODSHAREDIR%%/luarocks/results.lua
%%LUA_MODSHAREDIR%%/luarocks/rockspecs.lua
%%LUA_MODSHAREDIR%%/luarocks/search.lua
+%%LUA_MODSHAREDIR%%/luarocks/signing.lua
%%LUA_MODSHAREDIR%%/luarocks/test.lua
%%LUA_MODSHAREDIR%%/luarocks/test/busted.lua
%%LUA_MODSHAREDIR%%/luarocks/test/command.lua
More information about the svn-ports-head
mailing list