Page MenuHomeFreeBSD
Files F141900923

D16274.id45403.diff
No OneTemporary
Actions

D16274.id45403.diff
View Options

Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -1,9 +1,11 @@
# $FreeBSD$
PORTNAME= luarocks
-PORTVERSION= 2.4.3
-DISTVERSIONPREFIX= v
+PORTVERSION= 3.0.0
+PORTREVISION= 0
+DISTVERSIONSUFFIX= beta2
CATEGORIES= devel
+MASTER_SITES= http://luarocks.github.io/luarocks/releases/
PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}
MAINTAINER= jbeich@FreeBSD.org
@@ -15,15 +17,11 @@
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} \
- --with-downloader=curl \
--versioned-rocks-dir
ALL_TARGET= build
@@ -39,13 +37,7 @@
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 = 1531627330
+SHA256 (luarocks-3.0.0beta2.tar.gz) = 48c5aef95cfced3229afee591f5d69f1b9fb1c554ae8171c1832bc651b3ff640
+SIZE (luarocks-3.0.0beta2.tar.gz) = 199469
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile
+++ files/patch-Makefile
@@ -0,0 +1,11 @@
+--- work/luarocks-3.0.0beta2/Makefile.orig 2018-07-15 12:57:40.238730000 -0700
++++ work/luarocks-3.0.0beta2/Makefile 2018-07-15 12:58:04.433672000 -0700
+@@ -1,7 +1,7 @@
+
+ -include config.unix
+
+-all: ./luarocks ./luarocks-admin
++all: ./luarocks luarocks-admin
+
+ # ----------------------------------------
+ # Base build
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

File Metadata

Mime Type
text/plain
Expires
Tue, Jan 13, 6:05 AM (18 h, 42 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27625181
Default Alt Text
D16274.id45403.diff (4 KB)

Event Timeline