Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -1,51 +1,42 @@
 # $FreeBSD$
 
-PORTNAME=	luarocks
-PORTVERSION=	2.4.3
-DISTVERSIONPREFIX=	v
-CATEGORIES=	devel
-PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
+PORTNAME=			luarocks
+PORTREVISION=			0
+DISTVERSION=			3.0.0
+CATEGORIES=			devel
+MASTER_SITES=			http://luarocks.github.io/luarocks/releases/
+PKGNAMEPREFIX=			${LUA_PKGNAMEPREFIX}
 
-MAINTAINER=	jbeich@FreeBSD.org
-COMMENT=	Package manager for Lua modules
+MAINTAINER=			jbeich@FreeBSD.org
+COMMENT=			Package manager for Lua modules
 
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=			MIT
+LICENSE_FILE=			${WRKSRC}/COPYING
 
-RUN_DEPENDS=	zip:archivers/zip \
-		curl:ftp/curl
+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} \
+				--versioned-rocks-dir
+ALL_TARGET=			build
 
-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
+OPTIONS_DEFINE=			LUAJIT
+LUAJIT_DESC=			Use LuaJIT instead of Lua
+LUAJIT_BUILD_DEPENDS=		luajit:lang/luajit
+LUAJIT_RUN_DEPENDS=		luajit:lang/luajit
+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 \
+				LUA_VER=5.1 LUA_PKGNAMEPREFIX=lua51-
+LUAJIT_USES_OFF=		lua
 
-OPTIONS_DEFINE=	LUAJIT
-LUAJIT_DESC=		Use LuaJIT instead of Lua
-LUAJIT_BUILD_DEPENDS=	luajit:lang/luajit
-LUAJIT_RUN_DEPENDS=	luajit:lang/luajit
-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 \
-			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-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 = 1505261317
-SHA256 (keplerproject-luarocks-v2.4.3_GH0.tar.gz) = ea1881d6954f2a98c34f93674571c8f0cbdbc28dedb3fa3cb56b6a91886d1a99
-SIZE (keplerproject-luarocks-v2.4.3_GH0.tar.gz) = 4029537
+TIMESTAMP = 1532400813
+SHA256 (luarocks-3.0.0.tar.gz) = a43fffb997100f11cccb529a3db5456ce8dab18171a5cb3645f948147b6f64a1
+SIZE (luarocks-3.0.0.tar.gz) = 203129
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