Page MenuHomeFreeBSD
Files F144604873

D16274.1775704045.diff
No OneTemporary
Actions

Size
11 KB
Referenced Files
None
Subscribers
None

D16274.1775704045.diff
View Options

Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
PORTNAME= luarocks
-PORTVERSION= 2.4.4
-DISTVERSIONPREFIX= v
+DISTVERSION= 3.0.0
CATEGORIES= devel
+MASTER_SITES= http://luarocks.github.io/luarocks/releases/
PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}
MAINTAINER= jbeich@FreeBSD.org
@@ -15,18 +15,16 @@
RUN_DEPENDS= zip:archivers/zip \
curl:ftp/curl
-USE_GITHUB= yes
-GH_ACCOUNT= keplerproject
-
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
+USES+= gmake
+
OPTIONS_DEFINE= LUAJIT
LUAJIT_DESC= Use LuaJIT instead of Lua
LUAJIT_BUILD_DEPENDS= luajit:lang/luajit
@@ -38,14 +36,8 @@
LUA_VER=5.1 LUA_PKGNAMEPREFIX=lua51-
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
+post-install:
+ ${MV} ${STAGEDIR}${ETCDIR}/config-${LUA_VER}.lua \
+ ${STAGEDIR}${ETCDIR}/config-${LUA_VER}.lua.sample
-post-build:
-# NO_ARCH requires https://bugs.archlinux.org/task/40388
- @${REINPLACE_CMD} -e '/LUAROCKS_UNAME_M/d' \
- ${WRKSRC}/src/luarocks/site_config.lua
-
.include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo
+++ distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1520899739
-SHA256 (keplerproject-luarocks-v2.4.4_GH0.tar.gz) = 9eb3d0738fd02ad8bf39bcedccac4e83e9b5fff2bcca247c3584b925b2075d9c
-SIZE (keplerproject-luarocks-v2.4.4_GH0.tar.gz) = 5820519
+TIMESTAMP = 1532400813
+SHA256 (luarocks-3.0.0.tar.gz) = a43fffb997100f11cccb529a3db5456ce8dab18171a5cb3645f948147b6f64a1
+SIZE (luarocks-3.0.0.tar.gz) = 203129
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile
+++ files/patch-Makefile
@@ -0,0 +1,42 @@
+--- Makefile.orig 2018-07-19 20:42:18 UTC
++++ Makefile
+@@ -36,29 +36,29 @@ luarocks-admin: config.unix
+ # Regular install
+ # ----------------------------------------
+
+-install: all $(PREFIX)/bin/luarocks $(PREFIX)/bin/luarocks-admin $(SYSCONFDIR)/config-$(LUA_VERSION).lua
+- mkdir -p "$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks"
+- cp -a src/luarocks/* "$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks"
++install: all $(DESTDIR)$(PREFIX)/bin/luarocks $(DESTDIR)$(PREFIX)/bin/luarocks-admin $(DESTDIR)$(SYSCONFDIR)/config-$(LUA_VERSION).lua
++ mkdir -p "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks"
++ cp -a src/luarocks/* "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks"
+
+-$(PREFIX)/bin/luarocks: src/bin/luarocks config.unix
+- mkdir -p "$(PREFIX)/bin"
++$(DESTDIR)$(PREFIX)/bin/luarocks: src/bin/luarocks config.unix
++ mkdir -p "$(DESTDIR)$(PREFIX)/bin"
+ echo "#!$(LUA_BINDIR)/$(LUA_INTERPRETER)" > $@
+ echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(SYSCONFDIR)]] }" >> $@
+ echo "package.path=[[$(PREFIX)/share/lua/$(LUA_VERSION)/?.lua;]] .. package.path" >> $@
+ tail -n +2 src/bin/luarocks >> $@
+ chmod +rx $@
+
+-$(PREFIX)/bin/luarocks-admin: src/bin/luarocks-admin config.unix
+- mkdir -p "$(PREFIX)/bin"
++$(DESTDIR)$(PREFIX)/bin/luarocks-admin: src/bin/luarocks-admin config.unix
++ mkdir -p "$(DESTDIR)$(PREFIX)/bin"
+ echo "#!$(LUA_BINDIR)/$(LUA_INTERPRETER)" > $@
+ echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(SYSCONFDIR)]] }" >> $@
+ echo "package.path=[[$(PREFIX)/share/lua/$(LUA_VERSION)/?.lua;]] .. package.path" >> $@
+ tail -n +2 src/bin/luarocks-admin >> $@
+ chmod +rx $@
+
+-$(SYSCONFDIR)/config-$(LUA_VERSION).lua: config-$(LUA_VERSION).lua.in
+- mkdir -p "$(SYSCONFDIR)"
+- cp config-$(LUA_VERSION).lua.in "$(SYSCONFDIR)/config-$(LUA_VERSION).lua"
++$(DESTDIR)$(SYSCONFDIR)/config-$(LUA_VERSION).lua: config-$(LUA_VERSION).lua.in
++ mkdir -p "$(DESTDIR)$(SYSCONFDIR)"
++ cp config-$(LUA_VERSION).lua.in "$(DESTDIR)$(SYSCONFDIR)/config-$(LUA_VERSION).lua"
+
+ # ----------------------------------------
+ # Binary build
Index: files/patch-src_luarocks_cfg.lua
===================================================================
--- files/patch-src_luarocks_cfg.lua
+++ files/patch-src_luarocks_cfg.lua
@@ -1,63 +0,0 @@
---- src/luarocks/cfg.lua.orig 2015-12-29 15:50:11 UTC
-+++ src/luarocks/cfg.lua
-@@ -88,7 +88,15 @@ elseif proc:match("Power Macintosh") the
- cfg.target_cpu = proc
- end
-
--if system == "FreeBSD" then
-+if system == "Bitrig" then
-+ cfg.platforms.unix = true
-+ cfg.platforms.bitrig = true
-+ cfg.platforms.bsd = true
-+elseif 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
-@@ -477,16 +485,18 @@ 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"
-+ defaults.variables.MAKE = os.getenv("MAKE") or defaults.variables.MAKE
-+ -- 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.*" },
-@@ -548,11 +558,17 @@ if cfg.platforms.linux then
- defaults.arch = "linux-"..cfg.target_cpu
- end
-
-+if cfg.platforms.bitrig then
-+ defaults.arch = "bitrig-"..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
Index: files/patch-src_luarocks_fs_lua.lua
===================================================================
--- files/patch-src_luarocks_fs_lua.lua
+++ files/patch-src_luarocks_fs_lua.lua
@@ -0,0 +1,11 @@
+--- src/luarocks/fs/lua.lua.orig 2018-07-24 18:13:31 UTC
++++ src/luarocks/fs/lua.lua
+@@ -885,7 +885,7 @@ function fs_lua._unix_rwx_to_number(rwx)
+ local num = 0
+ for i = 1, 9 do
+ if rwx:sub(10 - i, 10 - i) == "-" then
+- num = num + 2^i
++ num = num + 2^(i-1)
+ end
+ end
+ return num
Index: pkg-plist
===================================================================
--- pkg-plist
+++ pkg-plist
@@ -1,20 +1,49 @@
-bin/luarocks-%%LUA_VER%%
-bin/luarocks-admin-%%LUA_VER%%
-%%ETCDIR%%/config-%%LUA_VER%%.lua
-%%LUA_MODSHAREDIR%%/luarocks/add.lua
-%%LUA_MODSHAREDIR%%/luarocks/admin_remove.lua
+bin/luarocks
+bin/luarocks-admin
+@sample %%ETCDIR%%/config-%%LUA_VER%%.lua.sample
+%%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 @@
%%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

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 9, 3:07 AM (6 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28305904
Default Alt Text
D16274.1775704045.diff (11 KB)

Event Timeline