Index: head/devel/lua-luarocks/Makefile
===================================================================
--- head/devel/lua-luarocks/Makefile	(revision 397535)
+++ head/devel/lua-luarocks/Makefile	(revision 397536)
@@ -1,71 +1,73 @@
 # $FreeBSD$
 
 PORTNAME=	luarocks
 PORTVERSION=	2.2.2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Package manager for Lua modules
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		curl:${PORTSDIR}/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
 
 OPTIONS_DEFINE=	LUAJIT
 
 OPTIONS_GROUP=		BUILD FETCH
 BUILD_DESC=		Build backends
 OPTIONS_GROUP_BUILD=	CMAKE GMAKE
 FETCH_DESC=		Fetch from repositories
 OPTIONS_GROUP_FETCH=	CVS GIT HG SVN
 
 CMAKE_DESC=		CMake support
 CMAKE_RUN_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
 GMAKE_DESC=		GNU Make support
 GMAKE_RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
 
 CVS_DESC=		CVS support
 CVS_RUN_DEPENDS=	cvs:${PORTSDIR}/devel/cvs-devel
 GIT_DESC=		Git support
 GIT_RUN_DEPENDS=	git:${PORTSDIR}/devel/git
 HG_DESC=		Mercurial support
 HG_RUN_DEPENDS=		hg:${PORTSDIR}/devel/mercurial
 SVN_DESC=		Subversion support
 SVN_RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
 
 LUAJIT_DESC=		Use LuaJIT instead of Lua
-LUAJIT_LIB_DEPENDS=	libluajit-${LUA_VER}.so:${PORTSDIR}/lang/luajit
+LUAJIT_BUILD_DEPENDS=	luajit:${PORTSDIR}/lang/luajit
+LUAJIT_RUN_DEPENDS=	luajit:${PORTSDIR}/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: head/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua
===================================================================
--- head/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua	(nonexistent)
+++ head/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua	(revision 397536)
@@ -0,0 +1,67 @@
+--- src/luarocks/cfg.lua.orig	2015-04-24 18:28:33 UTC
++++ src/luarocks/cfg.lua
+@@ -88,7 +88,15 @@ elseif proc:match("Power Macintosh") the
+    proc = "powerpc"
+ end
+ 
+-if system == "FreeBSD" then
++if system == "Bitrig" then
++   detected.unix = true
++   detected.bitrig = true
++   detected.bsd = true
++elseif system == "DragonFly" then
++   detected.unix = true
++   detected.dragonfly = true
++   detected.bsd = true
++elseif system == "FreeBSD" then
+    detected.unix = true
+    detected.freebsd = true
+    detected.bsd = true
+@@ -397,17 +405,19 @@ if detected.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.platforms = { "unix" }
+-   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.*" },
+@@ -472,12 +482,20 @@ if detected.linux then
+    defaults.platforms = {"unix", "linux"}
+ end
+ 
++if detected.bitrig then
++   defaults.arch = "bitrig-"..proc
++   defaults.platforms = {"unix", "bsd", "bitrig"}
++end
++
++if detected.dragonfly then
++   defaults.arch = "dragonfly-"..proc
++   defaults.platforms = {"unix", "bsd", "dragonfly"}
++end
++
+ if detected.freebsd then
+    defaults.arch = "freebsd-"..proc
+    defaults.platforms = {"unix", "bsd", "freebsd"}
+    defaults.gcc_rpath = false
+-   defaults.variables.CC = "cc"
+-   defaults.variables.LD = "cc"
+ end
+ 
+ if detected.openbsd then

Property changes on: head/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property