Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	luarocks
-PORTVERSION=	2.4.4
-DISTVERSIONPREFIX=	v
+DISTVERSION=	3.0.1
 CATEGORIES=	devel
+MASTER_SITES=	https://luarocks.github.io/luarocks/releases/
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -15,16 +15,13 @@
 RUN_DEPENDS=	zip:archivers/zip \
 		curl:ftp/curl
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	keplerproject
+USES=		gmake
 
 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
+		--lua-version=${LUA_VER}
 ALL_TARGET=	build
 
 OPTIONS_DEFINE=	LUAJIT
@@ -38,14 +35,12 @@
 			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
+MAKE_ARGS+=	INSTALL_DATA="${INSTALL_DATA}" \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		MKDIR_P="${MKDIR}"
 
-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:
+	${MV} ${STAGEDIR}${ETCDIR}/config-${LUA_VER}.lua \
+		${STAGEDIR}${ETCDIR}/config-${LUA_VER}.lua.sample
 
 .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 = 1534294245
+SHA256 (luarocks-3.0.1.tar.gz) = b989c4b60d6c9edcd65169e5e42fcffbd39cdbebe6b138fa5aea45102f8d9ec0
+SIZE (luarocks-3.0.1.tar.gz) = 205787
Index: files/patch-GNUmakefile
===================================================================
--- files/patch-GNUmakefile
+++ files/patch-GNUmakefile
@@ -0,0 +1,28 @@
+--- GNUmakefile.orig	2018-08-14 16:30:42 UTC
++++ GNUmakefile
+@@ -110,19 +110,19 @@ install: $(INSTALL_FILES)
+ install-config: $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua
+ 
+ $(DESTDIR)$(bindir)/luarocks: $(builddir)/luarocks
+-	mkdir -p "$(@D)"
+-	$(INSTALL) "$<" "$@"
++	$(MKDIR_P) "$(@D)"
++	$(INSTALL_SCRIPT) "$<" "$@"
+ 
+ $(DESTDIR)$(bindir)/luarocks-admin: $(builddir)/luarocks-admin
+-	mkdir -p "$(@D)"
+-	$(INSTALL) "$<" "$@"
++	$(MKDIR_P) "$(@D)"
++	$(INSTALL_SCRIPT) "$<" "$@"
+ 
+ $(DESTDIR)$(luadir)/luarocks/%.lua: src/luarocks/%.lua
+-	mkdir -p "$(@D)"
++	$(MKDIR_P) "$(@D)"
+ 	$(INSTALL_DATA) "$<" "$@"
+ 
+ $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua: $(builddir)/config-$(LUA_VERSION).lua
+-	mkdir -p "$(@D)"
++	$(MKDIR_P) "$(@D)"
+ 	$(INSTALL_DATA) "$<" "$@"
+ 
+ uninstall:
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: 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