diff --git a/devel/lua-luarocks/Makefile b/devel/lua-luarocks/Makefile
index 8f58788aeaf1..3958c6b14bf0 100644
--- a/devel/lua-luarocks/Makefile
+++ b/devel/lua-luarocks/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	luarocks
-DISTVERSION=	3.0.1
+DISTVERSION=	3.2.1
 CATEGORIES=	devel
 MASTER_SITES=	https://${PORTNAME}.github.io/${PORTNAME}/releases/
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
@@ -26,12 +26,19 @@ UNIQUE_SUFFIX_FILES=	bin/${PORTNAME} bin/${PORTNAME}-admin
 
 OPTIONS_DEFINE=	LUAJIT
 LUAJIT_DESC=		Use LuaJIT instead of Lua
+.if exists(${LOCALBASE}/include/luajit-2.0/lua.h)
+LUAJIT_VER=		2.0
 LUAJIT_BUILD_DEPENDS=	luajit:lang/luajit
 LUAJIT_RUN_DEPENDS=	luajit:lang/luajit
+.else
+LUAJIT_VER=		2.1
+LUAJIT_BUILD_DEPENDS=	luajit:lang/luajit-openresty
+LUAJIT_RUN_DEPENDS=	luajit:lang/luajit-openresty
+.endif
 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 \
+LUAJIT_VARS=		LUA_INCDIR=${LOCALBASE}/include/luajit-${LUAJIT_VER} \
 			LUA_VER=5.1 LUA_PKGNAMEPREFIX=lua51-
 LUAJIT_USES_OFF=	lua
 
diff --git a/devel/lua-luarocks/distinfo b/devel/lua-luarocks/distinfo
index 3ede9cd9bbf1..89803868edfc 100644
--- a/devel/lua-luarocks/distinfo
+++ b/devel/lua-luarocks/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534264242
-SHA256 (luarocks-3.0.1.tar.gz) = b989c4b60d6c9edcd65169e5e42fcffbd39cdbebe6b138fa5aea45102f8d9ec0
-SIZE (luarocks-3.0.1.tar.gz) = 205787
+TIMESTAMP = 1570896541
+SHA256 (luarocks-3.2.1.tar.gz) = f27e20c9cdb3ffb991ccdb85796c36a0690566676f8e1a59b0d0ee6598907d04
+SIZE (luarocks-3.2.1.tar.gz) = 232149
diff --git a/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua b/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua
index a1e542cf6dd3..c9db6443af57 100644
--- a/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua
+++ b/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua
@@ -1,11 +1,11 @@
-- 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
+* 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 = {
+--- src/luarocks/core/cfg.lua.orig	2019-09-05 15:23:34.000000000 -0400
++++ src/luarocks/core/cfg.lua	2019-09-05 15:23:34.000000000 -0400
+@@ -36,6 +36,7 @@
     "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, 
+@@ -156,6 +157,7 @@
+ end
+ 
+ local platform_sets = {
++   dragonfly = { unix = true, bsd = true, dragonfly = true },
+    freebsd = { unix = true, bsd = true, freebsd = true },
+    openbsd = { unix = true, bsd = true, openbsd = true },
+    solaris = { unix = true, solaris = true },
+@@ -365,12 +367,13 @@
        defaults.external_lib_extension = "so"
        defaults.obj_extension = "o"
        defaults.external_deps_dirs = { "/usr/local", "/usr", "/" }
@@ -35,12 +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.variables.TEST = "test"
+ 
        defaults.external_deps_patterns = {
-          bin = { "?" },
-          lib = { "lib?.a", "lib?.so", "lib?.so.*" },
-@@ -449,15 +451,18 @@ local function make_defaults(lua_version, target_cpu, 
+@@ -454,15 +457,18 @@
        end
     end
  
diff --git a/devel/lua-luarocks/pkg-plist b/devel/lua-luarocks/pkg-plist
index ab25857f1b6f..3409d98586e0 100644
--- a/devel/lua-luarocks/pkg-plist
+++ b/devel/lua-luarocks/pkg-plist
@@ -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,6 +40,7 @@ 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/deps.lua
@@ -59,12 +60,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,15 +83,16 @@ 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
 %%LUA_MODSHAREDIR%%/luarocks/tools/patch.lua
 %%LUA_MODSHAREDIR%%/luarocks/tools/tar.lua
 %%LUA_MODSHAREDIR%%/luarocks/tools/zip.lua
+%%LUA_MODSHAREDIR%%/luarocks/type_check.lua
 %%LUA_MODSHAREDIR%%/luarocks/type/manifest.lua
 %%LUA_MODSHAREDIR%%/luarocks/type/rockspec.lua
-%%LUA_MODSHAREDIR%%/luarocks/type_check.lua
 %%LUA_MODSHAREDIR%%/luarocks/upload/api.lua
 %%LUA_MODSHAREDIR%%/luarocks/upload/multipart.lua
 %%LUA_MODSHAREDIR%%/luarocks/util.lua