Date: Thu, 16 Aug 2018 16:53:49 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477367 - in head/devel/lua-luarocks: . files Message-ID: <201808161653.w7GGrnwa093635@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Aug 16 16:53:49 2018 New Revision: 477367 URL: https://svnweb.freebsd.org/changeset/ports/477367 Log: devel/lua-luarocks: update to 3.0.1 Changes: https://github.com/luarocks/luarocks/compare/v2.4.4...v3.0.2 Submitted by: Russell Haley, Andrew Gierth (based on) Reviewed by: mat, kevans Differential Revision: https://reviews.freebsd.org/D16274 Added: head/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua (contents, props changed) Deleted: head/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua Modified: head/devel/lua-luarocks/Makefile (contents, props changed) head/devel/lua-luarocks/distinfo (contents, props changed) head/devel/lua-luarocks/pkg-plist (contents, props changed) Modified: head/devel/lua-luarocks/Makefile ============================================================================== --- head/devel/lua-luarocks/Makefile Thu Aug 16 16:53:38 2018 (r477366) +++ head/devel/lua-luarocks/Makefile Thu Aug 16 16:53:49 2018 (r477367) @@ -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 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 -# Let @sample manage default config - @${REINPLACE_CMD} '/CONFIG_FILE = /s/$$/.sample/' ${WRKSRC}/Makefile +# /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-build: -# NO_ARCH requires https://bugs.archlinux.org/task/40388 - @${REINPLACE_CMD} -e '/LUAROCKS_UNAME_M/d' \ - ${WRKSRC}/src/luarocks/site_config.lua +post-install: +# Let @sample manage default config + ${MV} ${STAGEDIR}${ETCDIR}/config-${LUA_VER}.lua \ + ${STAGEDIR}${ETCDIR}/config-${LUA_VER}.lua.sample .include <bsd.port.mk> Modified: head/devel/lua-luarocks/distinfo ============================================================================== --- head/devel/lua-luarocks/distinfo Thu Aug 16 16:53:38 2018 (r477366) +++ head/devel/lua-luarocks/distinfo Thu Aug 16 16:53:49 2018 (r477367) @@ -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 Added: head/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua Thu Aug 16 16:53:49 2018 (r477367) @@ -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 Modified: head/devel/lua-luarocks/pkg-plist ============================================================================== --- head/devel/lua-luarocks/pkg-plist Thu Aug 16 16:53:38 2018 (r477366) +++ head/devel/lua-luarocks/pkg-plist Thu Aug 16 16:53:49 2018 (r477367) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808161653.w7GGrnwa093635>