summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/lua-luarocks/Makefile29
-rw-r--r--devel/lua-luarocks/distinfo6
-rw-r--r--devel/lua-luarocks/files/patch-src_luarocks_cfg.lua64
-rw-r--r--devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua63
-rw-r--r--devel/lua-luarocks/pkg-plist76
5 files changed, 130 insertions, 108 deletions
diff --git a/devel/lua-luarocks/Makefile b/devel/lua-luarocks/Makefile
index 10e8aa1536bd..a9844e43207d 100644
--- a/devel/lua-luarocks/Makefile
+++ b/devel/lua-luarocks/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= luarocks
-PORTVERSION= 2.4.4
+DISTVERSION= 3.0.1
CATEGORIES= devel
MASTER_SITES= https://${PORTNAME}.github.io/${PORTNAME}/releases/
PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}
@@ -15,14 +15,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= zip:archivers/zip \
curl:ftp/curl
+USES= gmake uniquefiles
NO_ARCH= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
--with-lua-include=${LUA_INCDIR} \
- --lua-version=${LUA_VER} \
- --with-downloader=curl \
- --versioned-rocks-dir
-ALL_TARGET= build
+ --lua-version=${LUA_VER}
+UNIQUE_SUFFIX= -${LUA_VER}
+UNIQUE_SUFFIX_FILES= bin/${PORTNAME} bin/${PORTNAME}-admin
OPTIONS_DEFINE= LUAJIT
LUAJIT_DESC= Use LuaJIT instead of Lua
@@ -36,15 +36,16 @@ LUAJIT_VARS= LUA_INCDIR=${LOCALBASE}/include/luajit-2.0 \
LUAJIT_USES_OFF= lua
post-patch:
-# Don't install unprefixed binaries to avoid package conflict with
-# luarocks built against different lang/lua* versions
- @${REINPLACE_CMD} '/ln -/d' ${WRKSRC}/Makefile.install.inc
+# /usr/local is a mix of site-local data and packages installs.
+# 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}"\, ,' \
+ ${WRKSRC}/src/luarocks/core/cfg.lua
+.endif
+
+post-install:
# Let @sample manage default config
- @${REINPLACE_CMD} '/CONFIG_FILE = /s/$$/.sample/' ${WRKSRC}/Makefile
-
-post-build:
-# NO_ARCH requires https://bugs.archlinux.org/task/40388
- @${REINPLACE_CMD} -e '/LUAROCKS_UNAME_M/d' \
- ${WRKSRC}/src/luarocks/site_config.lua
+ ${MV} ${STAGEDIR}${ETCDIR}/config-${LUA_VER}.lua \
+ ${STAGEDIR}${ETCDIR}/config-${LUA_VER}.lua.sample
.include <bsd.port.mk>
diff --git a/devel/lua-luarocks/distinfo b/devel/lua-luarocks/distinfo
index 48d234396bea..3ede9cd9bbf1 100644
--- a/devel/lua-luarocks/distinfo
+++ b/devel/lua-luarocks/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1520899739
-SHA256 (luarocks-2.4.4.tar.gz) = 3938df33de33752ff2c526e604410af3dceb4b7ff06a770bc4a240de80a1f934
-SIZE (luarocks-2.4.4.tar.gz) = 140452
+TIMESTAMP = 1534264242
+SHA256 (luarocks-3.0.1.tar.gz) = b989c4b60d6c9edcd65169e5e42fcffbd39cdbebe6b138fa5aea45102f8d9ec0
+SIZE (luarocks-3.0.1.tar.gz) = 205787
diff --git a/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua b/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua
deleted file mode 100644
index 7962ac456d71..000000000000
--- a/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua
+++ /dev/null
@@ -1,64 +0,0 @@
-- Add DragonFly support
-- Respect CC/CFLAGS/LD/LDFLAGS
-- Prefer system compiler over GCC on BSDs/Solaris
-- OpenBSD uses Clang by default, so don't pass GCC RPATH
-
---- src/luarocks/cfg.lua.orig 2018-03-13 00:08:59 UTC
-+++ src/luarocks/cfg.lua
-@@ -87,7 +87,11 @@ elseif proc:match("Power Macintosh") then
- cfg.target_cpu = proc
- end
-
--if system == "FreeBSD" then
-+if system == "DragonFly" then
-+ cfg.platforms.unix = true
-+ cfg.platforms.dragonfly = true
-+ cfg.platforms.bsd = true
-+elseif system == "FreeBSD" then
- cfg.platforms.unix = true
- cfg.platforms.freebsd = true
- cfg.platforms.bsd = true
-@@ -517,16 +521,17 @@ if cfg.platforms.unix then
- defaults.lib_extension = "so"
- defaults.external_lib_extension = "so"
- defaults.obj_extension = "o"
-- defaults.external_deps_dirs = { "/usr/local", "/usr" }
-+ defaults.external_deps_dirs = { site_config.LUAROCKS_PREFIX, "/usr" }
- defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR or "/usr/local/bin"
- defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR or "/usr/local/include"
- defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR or "/usr/local/lib"
-- defaults.variables.CFLAGS = "-O2"
-+ defaults.variables.CFLAGS = os.getenv("CFLAGS") or "-O2"
- defaults.cmake_generator = "Unix Makefiles"
-- defaults.variables.CC = "gcc"
-- defaults.variables.LD = "gcc"
-+ -- Assume "cc" is a modern GCC-compatible compiler
-+ defaults.variables.CC = os.getenv("CC") or defaults.variables.CC
-+ 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.*" },
-@@ -607,15 +612,18 @@ if cfg.platforms.linux then
- defaults.arch = "linux-"..cfg.target_cpu
- end
-
-+if cfg.platforms.dragonfly then
-+ defaults.arch = "dragonfly-"..cfg.target_cpu
-+end
-+
- if cfg.platforms.freebsd then
- defaults.arch = "freebsd-"..cfg.target_cpu
- defaults.gcc_rpath = false
-- defaults.variables.CC = "cc"
-- defaults.variables.LD = "cc"
- end
-
- if cfg.platforms.openbsd then
- defaults.arch = "openbsd-"..cfg.target_cpu
-+ defaults.gcc_rpath = false
- end
-
- if cfg.platforms.netbsd then
diff --git a/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua b/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua
new file mode 100644
index 000000000000..a1e542cf6dd3
--- /dev/null
+++ b/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua
@@ -0,0 +1,63 @@
+- Add DragonFly support
+- Respect CC/CFLAGS/LD/LDFLAGS
+- 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
+@@ -35,6 +35,7 @@ local platform_order = {
+ "netbsd",
+ "openbsd",
+ "freebsd",
++ "dragonfly",
+ "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,
+ defaults.external_lib_extension = "so"
+ defaults.obj_extension = "o"
+ defaults.external_deps_dirs = { "/usr/local", "/usr", "/" }
+- defaults.variables.CFLAGS = "-O2"
++ defaults.variables.CFLAGS = os.getenv("CFLAGS") or "-O2"
+ defaults.cmake_generator = "Unix Makefiles"
+- defaults.variables.CC = "gcc"
+- defaults.variables.LD = "gcc"
++ -- Assume "cc" is a modern GCC-compatible compiler
++ defaults.variables.CC = os.getenv("CC") or defaults.variables.CC
++ 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
+
++ if platforms.dragonfly then
++ defaults.arch = "dragonfly-"..target_cpu
++ end
++
+ if platforms.freebsd then
+ defaults.arch = "freebsd-"..target_cpu
+ defaults.gcc_rpath = false
+- defaults.variables.CC = "cc"
+- defaults.variables.LD = "cc"
+ end
+
+ if platforms.openbsd then
+ defaults.arch = "openbsd-"..target_cpu
++ defaults.gcc_rpath = false
+ end
+
+ if platforms.netbsd then
diff --git a/devel/lua-luarocks/pkg-plist b/devel/lua-luarocks/pkg-plist
index 61bda7fd8b87..ab25857f1b6f 100644
--- a/devel/lua-luarocks/pkg-plist
+++ b/devel/lua-luarocks/pkg-plist
@@ -1,20 +1,49 @@
-bin/luarocks-%%LUA_VER%%
-bin/luarocks-admin-%%LUA_VER%%
+bin/luarocks
+bin/luarocks-admin
@sample %%ETCDIR%%/config-%%LUA_VER%%.lua.sample
-%%LUA_MODSHAREDIR%%/luarocks/add.lua
-%%LUA_MODSHAREDIR%%/luarocks/admin_remove.lua
+%%LUA_MODSHAREDIR%%/luarocks/admin/cache.lua
+%%LUA_MODSHAREDIR%%/luarocks/admin/cmd/add.lua
+%%LUA_MODSHAREDIR%%/luarocks/admin/cmd/make_manifest.lua
+%%LUA_MODSHAREDIR%%/luarocks/admin/cmd/refresh_cache.lua
+%%LUA_MODSHAREDIR%%/luarocks/admin/cmd/remove.lua
+%%LUA_MODSHAREDIR%%/luarocks/admin/index.lua
%%LUA_MODSHAREDIR%%/luarocks/build.lua
%%LUA_MODSHAREDIR%%/luarocks/build/builtin.lua
%%LUA_MODSHAREDIR%%/luarocks/build/cmake.lua
%%LUA_MODSHAREDIR%%/luarocks/build/command.lua
%%LUA_MODSHAREDIR%%/luarocks/build/make.lua
-%%LUA_MODSHAREDIR%%/luarocks/cache.lua
-%%LUA_MODSHAREDIR%%/luarocks/cfg.lua
-%%LUA_MODSHAREDIR%%/luarocks/command_line.lua
-%%LUA_MODSHAREDIR%%/luarocks/config_cmd.lua
+%%LUA_MODSHAREDIR%%/luarocks/cmd.lua
+%%LUA_MODSHAREDIR%%/luarocks/cmd/build.lua
+%%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
+%%LUA_MODSHAREDIR%%/luarocks/cmd/list.lua
+%%LUA_MODSHAREDIR%%/luarocks/cmd/make.lua
+%%LUA_MODSHAREDIR%%/luarocks/cmd/new_version.lua
+%%LUA_MODSHAREDIR%%/luarocks/cmd/pack.lua
+%%LUA_MODSHAREDIR%%/luarocks/cmd/path.lua
+%%LUA_MODSHAREDIR%%/luarocks/cmd/purge.lua
+%%LUA_MODSHAREDIR%%/luarocks/cmd/remove.lua
+%%LUA_MODSHAREDIR%%/luarocks/cmd/search.lua
+%%LUA_MODSHAREDIR%%/luarocks/cmd/show.lua
+%%LUA_MODSHAREDIR%%/luarocks/cmd/test.lua
+%%LUA_MODSHAREDIR%%/luarocks/cmd/unpack.lua
+%%LUA_MODSHAREDIR%%/luarocks/cmd/upload.lua
+%%LUA_MODSHAREDIR%%/luarocks/cmd/which.lua
+%%LUA_MODSHAREDIR%%/luarocks/cmd/write_rockspec.lua
+%%LUA_MODSHAREDIR%%/luarocks/core/cfg.lua
+%%LUA_MODSHAREDIR%%/luarocks/core/dir.lua
+%%LUA_MODSHAREDIR%%/luarocks/core/manif.lua
+%%LUA_MODSHAREDIR%%/luarocks/core/path.lua
+%%LUA_MODSHAREDIR%%/luarocks/core/persist.lua
+%%LUA_MODSHAREDIR%%/luarocks/core/util.lua
+%%LUA_MODSHAREDIR%%/luarocks/core/vers.lua
%%LUA_MODSHAREDIR%%/luarocks/deps.lua
%%LUA_MODSHAREDIR%%/luarocks/dir.lua
-%%LUA_MODSHAREDIR%%/luarocks/doc.lua
%%LUA_MODSHAREDIR%%/luarocks/download.lua
%%LUA_MODSHAREDIR%%/luarocks/fetch.lua
%%LUA_MODSHAREDIR%%/luarocks/fetch/cvs.lua
@@ -35,38 +64,31 @@ bin/luarocks-admin-%%LUA_VER%%
%%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/help.lua
-%%LUA_MODSHAREDIR%%/luarocks/index.lua
-%%LUA_MODSHAREDIR%%/luarocks/install.lua
-%%LUA_MODSHAREDIR%%/luarocks/lint.lua
-%%LUA_MODSHAREDIR%%/luarocks/list.lua
+%%LUA_MODSHAREDIR%%/luarocks/fun.lua
%%LUA_MODSHAREDIR%%/luarocks/loader.lua
-%%LUA_MODSHAREDIR%%/luarocks/make.lua
-%%LUA_MODSHAREDIR%%/luarocks/make_manifest.lua
%%LUA_MODSHAREDIR%%/luarocks/manif.lua
-%%LUA_MODSHAREDIR%%/luarocks/manif_core.lua
-%%LUA_MODSHAREDIR%%/luarocks/new_version.lua
+%%LUA_MODSHAREDIR%%/luarocks/manif/writer.lua
%%LUA_MODSHAREDIR%%/luarocks/pack.lua
%%LUA_MODSHAREDIR%%/luarocks/path.lua
-%%LUA_MODSHAREDIR%%/luarocks/path_cmd.lua
%%LUA_MODSHAREDIR%%/luarocks/persist.lua
-%%LUA_MODSHAREDIR%%/luarocks/purge.lua
-%%LUA_MODSHAREDIR%%/luarocks/refresh_cache.lua
+%%LUA_MODSHAREDIR%%/luarocks/queries.lua
%%LUA_MODSHAREDIR%%/luarocks/remove.lua
%%LUA_MODSHAREDIR%%/luarocks/repos.lua
%%LUA_MODSHAREDIR%%/luarocks/require.lua
+%%LUA_MODSHAREDIR%%/luarocks/results.lua
+%%LUA_MODSHAREDIR%%/luarocks/rockspecs.lua
%%LUA_MODSHAREDIR%%/luarocks/search.lua
-%%LUA_MODSHAREDIR%%/luarocks/show.lua
-%%LUA_MODSHAREDIR%%/luarocks/site_config.lua
+%%LUA_MODSHAREDIR%%/luarocks/test.lua
+%%LUA_MODSHAREDIR%%/luarocks/test/busted.lua
+%%LUA_MODSHAREDIR%%/luarocks/test/command.lua
%%LUA_MODSHAREDIR%%/luarocks/tools/patch.lua
%%LUA_MODSHAREDIR%%/luarocks/tools/tar.lua
%%LUA_MODSHAREDIR%%/luarocks/tools/zip.lua
+%%LUA_MODSHAREDIR%%/luarocks/type/manifest.lua
+%%LUA_MODSHAREDIR%%/luarocks/type/rockspec.lua
%%LUA_MODSHAREDIR%%/luarocks/type_check.lua
-%%LUA_MODSHAREDIR%%/luarocks/unpack.lua
-%%LUA_MODSHAREDIR%%/luarocks/upload.lua
%%LUA_MODSHAREDIR%%/luarocks/upload/api.lua
%%LUA_MODSHAREDIR%%/luarocks/upload/multipart.lua
%%LUA_MODSHAREDIR%%/luarocks/util.lua
-%%LUA_MODSHAREDIR%%/luarocks/validate.lua
-%%LUA_MODSHAREDIR%%/luarocks/write_rockspec.lua
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-06 14:27:02 +0000