Attachment #208314 for bug #241228




# $FreeBSD$

PORTNAME=	luarocks
DISTVERSION=	3.2.1
CATEGORIES=	devel
MASTER_SITES=	https://${PORTNAME}.github.io/${PORTNAME}/releases/
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}

UNIQUE_SUFFIX=	-${LUA_VER}
UNIQUE_SUFFIX_FILES=	bin/${PORTNAME} bin/${PORTNAME}-admin

OPTIONS_SINGLE=	LUA_VERSION
OPTIONS_SINGLE_LUA_VERSION=	LUA51 LUA52 LUA53
OPTIONS_DEFAULT=LUA51
LUA51_DESC=	Build for Lua 5.1 and LuaJIT
LUA51_USES=	lua:51
LUA52_DESC=	Build for Lua 5.2
LUA52_USES=	lua:52
LUA53_DESC=	Build for Lua 5.3
LUA53_USES=	lua:53
LUAJIT_USES_OFF=	lua

post-patch:
# /usr/local is a mix of site-local data and packages installs.

Lines 1-3 Link Here

(-)b/devel/lua-luarocks/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1534264242	1	TIMESTAMP = 1570896541
2	SHA256 (luarocks-3.0.1.tar.gz) = b989c4b60d6c9edcd65169e5e42fcffbd39cdbebe6b138fa5aea45102f8d9ec0	2	SHA256 (luarocks-3.2.1.tar.gz) = f27e20c9cdb3ffb991ccdb85796c36a0690566676f8e1a59b0d0ee6598907d04
3	SIZE (luarocks-3.0.1.tar.gz) = 205787	3	SIZE (luarocks-3.2.1.tar.gz) = 232149




* 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	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",

    "linux",
    "macosx",
    "cygwin",
@@ -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", "/" }

+      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 = {
@@ -454,15 +457,18 @@
          lib = { "lib?.a", "lib?.so", "lib?.so.*" },
@@ -449,15 +451,18 @@ local function make_defaults(lua_version, target_cpu, 
       end
    end
 




%%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

%%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/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

%%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

%%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

Return to bug 241228

Lines 1-7 Link Here

(-)b/devel/lua-luarocks/Makefile (-11 / +10 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= luarocks	3	PORTNAME= luarocks
4	DISTVERSION= 3.0.1	4	DISTVERSION= 3.2.1
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= https://${PORTNAME}.github.io/${PORTNAME}/releases/	6	MASTER_SITES= https://${PORTNAME}.github.io/${PORTNAME}/releases/
7	PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}
Lines 24-39 CONFIGURE_ARGS= --prefix=${PREFIX} \ Link Here
24	UNIQUE_SUFFIX= -${LUA_VER}	24	UNIQUE_SUFFIX= -${LUA_VER}
25	UNIQUE_SUFFIX_FILES= bin/${PORTNAME} bin/${PORTNAME}-admin	25	UNIQUE_SUFFIX_FILES= bin/${PORTNAME} bin/${PORTNAME}-admin
26		26
27	OPTIONS_DEFINE= LUAJIT	27	OPTIONS_SINGLE= LUA_VERSION
28	LUAJIT_DESC= Use LuaJIT instead of Lua	28	OPTIONS_SINGLE_LUA_VERSION= LUA51 LUA52 LUA53
29	LUAJIT_BUILD_DEPENDS= luajit:lang/luajit	29	OPTIONS_DEFAULT=LUA51
30	LUAJIT_RUN_DEPENDS= luajit:lang/luajit	30	LUA51_DESC= Build for Lua 5.1 and LuaJIT
31	LUAJIT_CONFIGURE_ON= --lua-suffix=jit	31	LUA51_USES= lua:51
32	LUAJIT_PLIST_SUB= LUA_VER=${LUA_VER} \	32	LUA52_DESC= Build for Lua 5.2
33	LUA_MODSHAREDIR=share/lua/${LUA_VER}	33	LUA52_USES= lua:52
34	LUAJIT_VARS= LUA_INCDIR=${LOCALBASE}/include/luajit-2.0 \	34	LUA53_DESC= Build for Lua 5.3
35	LUA_VER=5.1 LUA_PKGNAMEPREFIX=lua51-	35	LUA53_USES= lua:53
36	LUAJIT_USES_OFF= lua
37		36
38	post-patch:	37	post-patch:
39	# /usr/local is a mix of site-local data and packages installs.	38	# /usr/local is a mix of site-local data and packages installs.

Lines 1-11 Link Here

(-)b/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua (-20 / +19 lines)
1	- Add DragonFly support	1	* Add DragonFly support
2	- Respect CC/CFLAGS/LD/LDFLAGS	2	* Respect CC/CFLAGS/LD/LDFLAGS
3	- Prefer system compiler over GCC on BSDs/Solaris	3	* Prefer system compiler over GCC on BSDs/Solaris
4	- OpenBSD uses Clang by default, so don't pass GCC RPATH	4	* OpenBSD uses Clang by default, so don't pass GCC RPATH
5		5
6	--- src/luarocks/core/cfg.lua.orig 2018-08-14 16:30:42 UTC	6	--- src/luarocks/core/cfg.lua.orig 2019-09-05 15:23:34.000000000 -0400
7	+++ src/luarocks/core/cfg.lua	7	+++ src/luarocks/core/cfg.lua 2019-09-05 15:23:34.000000000 -0400
8	@@ -35,6 +35,7 @@ local platform_order = {	8	@@ -36,6 +36,7 @@
9	"netbsd",	9	"netbsd",
10	"openbsd",	10	"openbsd",
11	"freebsd",	11	"freebsd",
Lines 13-27 Link Here
13	"linux",	13	"linux",
14	"macosx",	14	"macosx",
15	"cygwin",	15	"cygwin",
16	@@ -154,6 +155,7 @@ end	16	@@ -156,6 +157,7 @@
17	local function make_platforms(system)	17	end
18	if system then	18
19	if system == "Linux" then return { unix = true, linux = true }	19	local platform_sets = {
20	+ elseif system == "DragonFly" then return { unix = true, bsd = true, dragonfly = true }	20	+ dragonfly = { unix = true, bsd = true, dragonfly = true },
21	elseif system == "FreeBSD" then return { unix = true, bsd = true, freebsd = true }	21	freebsd = { unix = true, bsd = true, freebsd = true },
22	elseif system == "OpenBSD" then return { unix = true, bsd = true, openbsd = true }	22	openbsd = { unix = true, bsd = true, openbsd = true },
23	elseif system == "NetBSD" then return { unix = true, bsd = true, netbsd = true }	23	solaris = { unix = true, solaris = true },
24	@@ -357,13 +359,13 @@ local function make_defaults(lua_version, target_cpu,	24	@@ -365,12 +367,13 @@
25	defaults.external_lib_extension = "so"	25	defaults.external_lib_extension = "so"
26	defaults.obj_extension = "o"	26	defaults.obj_extension = "o"
27	defaults.external_deps_dirs = { "/usr/local", "/usr", "/" }	27	defaults.external_deps_dirs = { "/usr/local", "/usr", "/" }
Lines 35-46 Link Here
35	+ defaults.variables.LD = os.getenv("CC") or defaults.variables.CC	35	+ defaults.variables.LD = os.getenv("CC") or defaults.variables.CC
36	defaults.gcc_rpath = true	36	defaults.gcc_rpath = true
37	- defaults.variables.LIBFLAG = "-shared"	37	- defaults.variables.LIBFLAG = "-shared"
38	-
39	+ defaults.variables.LIBFLAG = (os.getenv("LDFLAGS") or "").." -shared"	38	+ defaults.variables.LIBFLAG = (os.getenv("LDFLAGS") or "").." -shared"
		39	defaults.variables.TEST = "test"
		40
40	defaults.external_deps_patterns = {	41	defaults.external_deps_patterns = {
41	bin = { "?" },	42	@@ -454,15 +457,18 @@
42	lib = { "lib?.a", "lib?.so", "lib?.so.*" },
43	@@ -449,15 +451,18 @@ local function make_defaults(lua_version, target_cpu,
44	end	43	end
45	end	44	end
46		45

Lines 7-12 bin/luarocks-admin Link Here

(-)b/devel/lua-luarocks/pkg-plist (-3 / +7 lines)
7	%%LUA_MODSHAREDIR%%/luarocks/admin/cmd/refresh_cache.lua	7	%%LUA_MODSHAREDIR%%/luarocks/admin/cmd/refresh_cache.lua
8	%%LUA_MODSHAREDIR%%/luarocks/admin/cmd/remove.lua	8	%%LUA_MODSHAREDIR%%/luarocks/admin/cmd/remove.lua
9	%%LUA_MODSHAREDIR%%/luarocks/admin/index.lua	9	%%LUA_MODSHAREDIR%%/luarocks/admin/index.lua
		10	%%LUA_MODSHAREDIR%%/luarocks/argparse.lua
10	%%LUA_MODSHAREDIR%%/luarocks/build.lua	11	%%LUA_MODSHAREDIR%%/luarocks/build.lua
11	%%LUA_MODSHAREDIR%%/luarocks/build/builtin.lua	12	%%LUA_MODSHAREDIR%%/luarocks/build/builtin.lua
12	%%LUA_MODSHAREDIR%%/luarocks/build/cmake.lua	13	%%LUA_MODSHAREDIR%%/luarocks/build/cmake.lua
Lines 17-23 bin/luarocks-admin Link Here
17	%%LUA_MODSHAREDIR%%/luarocks/cmd/config.lua	18	%%LUA_MODSHAREDIR%%/luarocks/cmd/config.lua
18	%%LUA_MODSHAREDIR%%/luarocks/cmd/doc.lua	19	%%LUA_MODSHAREDIR%%/luarocks/cmd/doc.lua
19	%%LUA_MODSHAREDIR%%/luarocks/cmd/download.lua	20	%%LUA_MODSHAREDIR%%/luarocks/cmd/download.lua
20	%%LUA_MODSHAREDIR%%/luarocks/cmd/help.lua
21	%%LUA_MODSHAREDIR%%/luarocks/cmd/init.lua	21	%%LUA_MODSHAREDIR%%/luarocks/cmd/init.lua
22	%%LUA_MODSHAREDIR%%/luarocks/cmd/install.lua	22	%%LUA_MODSHAREDIR%%/luarocks/cmd/install.lua
23	%%LUA_MODSHAREDIR%%/luarocks/cmd/lint.lua	23	%%LUA_MODSHAREDIR%%/luarocks/cmd/lint.lua
Lines 40-45 bin/luarocks-admin Link Here
40	%%LUA_MODSHAREDIR%%/luarocks/core/manif.lua	40	%%LUA_MODSHAREDIR%%/luarocks/core/manif.lua
41	%%LUA_MODSHAREDIR%%/luarocks/core/path.lua	41	%%LUA_MODSHAREDIR%%/luarocks/core/path.lua
42	%%LUA_MODSHAREDIR%%/luarocks/core/persist.lua	42	%%LUA_MODSHAREDIR%%/luarocks/core/persist.lua
		43	%%LUA_MODSHAREDIR%%/luarocks/core/sysdetect.lua
43	%%LUA_MODSHAREDIR%%/luarocks/core/util.lua	44	%%LUA_MODSHAREDIR%%/luarocks/core/util.lua
44	%%LUA_MODSHAREDIR%%/luarocks/core/vers.lua	45	%%LUA_MODSHAREDIR%%/luarocks/core/vers.lua
45	%%LUA_MODSHAREDIR%%/luarocks/deps.lua	46	%%LUA_MODSHAREDIR%%/luarocks/deps.lua
Lines 59-70 bin/luarocks-admin Link Here
59	%%LUA_MODSHAREDIR%%/luarocks/fetch/sscm.lua	60	%%LUA_MODSHAREDIR%%/luarocks/fetch/sscm.lua
60	%%LUA_MODSHAREDIR%%/luarocks/fetch/svn.lua	61	%%LUA_MODSHAREDIR%%/luarocks/fetch/svn.lua
61	%%LUA_MODSHAREDIR%%/luarocks/fs.lua	62	%%LUA_MODSHAREDIR%%/luarocks/fs.lua
		63	%%LUA_MODSHAREDIR%%/luarocks/fs/freebsd.lua
		64	%%LUA_MODSHAREDIR%%/luarocks/fs/linux.lua
62	%%LUA_MODSHAREDIR%%/luarocks/fs/lua.lua	65	%%LUA_MODSHAREDIR%%/luarocks/fs/lua.lua
		66	%%LUA_MODSHAREDIR%%/luarocks/fs/macosx.lua
63	%%LUA_MODSHAREDIR%%/luarocks/fs/tools.lua	67	%%LUA_MODSHAREDIR%%/luarocks/fs/tools.lua
64	%%LUA_MODSHAREDIR%%/luarocks/fs/unix.lua	68	%%LUA_MODSHAREDIR%%/luarocks/fs/unix.lua
65	%%LUA_MODSHAREDIR%%/luarocks/fs/unix/tools.lua	69	%%LUA_MODSHAREDIR%%/luarocks/fs/unix/tools.lua
66	%%LUA_MODSHAREDIR%%/luarocks/fs/win32.lua	70	%%LUA_MODSHAREDIR%%/luarocks/fs/win32.lua
67	%%LUA_MODSHAREDIR%%/luarocks/fs/win32/pe-parser.lua
68	%%LUA_MODSHAREDIR%%/luarocks/fs/win32/tools.lua	71	%%LUA_MODSHAREDIR%%/luarocks/fs/win32/tools.lua
69	%%LUA_MODSHAREDIR%%/luarocks/fun.lua	72	%%LUA_MODSHAREDIR%%/luarocks/fun.lua
70	%%LUA_MODSHAREDIR%%/luarocks/loader.lua	73	%%LUA_MODSHAREDIR%%/luarocks/loader.lua
Lines 80-94 bin/luarocks-admin Link Here
80	%%LUA_MODSHAREDIR%%/luarocks/results.lua	83	%%LUA_MODSHAREDIR%%/luarocks/results.lua
81	%%LUA_MODSHAREDIR%%/luarocks/rockspecs.lua	84	%%LUA_MODSHAREDIR%%/luarocks/rockspecs.lua
82	%%LUA_MODSHAREDIR%%/luarocks/search.lua	85	%%LUA_MODSHAREDIR%%/luarocks/search.lua
		86	%%LUA_MODSHAREDIR%%/luarocks/signing.lua
83	%%LUA_MODSHAREDIR%%/luarocks/test.lua	87	%%LUA_MODSHAREDIR%%/luarocks/test.lua
84	%%LUA_MODSHAREDIR%%/luarocks/test/busted.lua	88	%%LUA_MODSHAREDIR%%/luarocks/test/busted.lua
85	%%LUA_MODSHAREDIR%%/luarocks/test/command.lua	89	%%LUA_MODSHAREDIR%%/luarocks/test/command.lua
86	%%LUA_MODSHAREDIR%%/luarocks/tools/patch.lua	90	%%LUA_MODSHAREDIR%%/luarocks/tools/patch.lua
87	%%LUA_MODSHAREDIR%%/luarocks/tools/tar.lua	91	%%LUA_MODSHAREDIR%%/luarocks/tools/tar.lua
88	%%LUA_MODSHAREDIR%%/luarocks/tools/zip.lua	92	%%LUA_MODSHAREDIR%%/luarocks/tools/zip.lua
		93	%%LUA_MODSHAREDIR%%/luarocks/type_check.lua
89	%%LUA_MODSHAREDIR%%/luarocks/type/manifest.lua	94	%%LUA_MODSHAREDIR%%/luarocks/type/manifest.lua
90	%%LUA_MODSHAREDIR%%/luarocks/type/rockspec.lua	95	%%LUA_MODSHAREDIR%%/luarocks/type/rockspec.lua
91	%%LUA_MODSHAREDIR%%/luarocks/type_check.lua
92	%%LUA_MODSHAREDIR%%/luarocks/upload/api.lua	96	%%LUA_MODSHAREDIR%%/luarocks/upload/api.lua
93	%%LUA_MODSHAREDIR%%/luarocks/upload/multipart.lua	97	%%LUA_MODSHAREDIR%%/luarocks/upload/multipart.lua
94	%%LUA_MODSHAREDIR%%/luarocks/util.lua	98	%%LUA_MODSHAREDIR%%/luarocks/util.lua