Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1475785735148170"
MIME-Version: 1.0
Date: Thu, 6 Oct 2016 20:28:55 +0000
From: "Alexander Nasonov" <alnsn@netbsd.org>
Subject: CVS commit: pkgsrc/devel/lua-rocks
To: pkgsrc-changes@NetBSD.org
Reply-To: alnsn@netbsd.org
Message-Id: <20161006202855.24CF4FBD2@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1475785735148170
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	alnsn
Date:		Thu Oct  6 20:28:55 UTC 2016

Modified Files:
	pkgsrc/devel/lua-rocks: Makefile PLIST distinfo
	pkgsrc/devel/lua-rocks/patches: patch-Makefile
	    patch-Makefile.install.inc

Log Message:
Update devel/lua-rocks to 2.4.1.

What's new since 2.3.0:

* New test suite based on Busted; runs on Linux, OSX and Windows. This
test suite was developed by Robert Karasek as his Google Summer of
Code project for LabLua. You can check out the combined coverage of
all platforms at CodeCov:
https://codecov.io/gh/keplerproject/luarocks/
* git+ssh:// fetch protocol
* Improved behavior preserving permissions
* Improved listing of dependencies on installation
* Improved behavior of argument handling in `pack`
* MSYS and Haiku platform detection
* Feature-based detection of internal bit32 and utf8 modules
* Internal reorganization of luarocks.fs code
* `remove` option --force=fast renamed to --force-fast
* Plus assorted bugfixes and cleanups

What's new since 2.4.0:

* Avoid coroutine use inside luarocks.loader, that apparently affected
OpenResty's require()
* Fix upgrade issues for old versions (e.g. when upgrading from LuaRocks 2.1.0)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/devel/lua-rocks/Makefile \
    pkgsrc/devel/lua-rocks/PLIST pkgsrc/devel/lua-rocks/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/devel/lua-rocks/patches/patch-Makefile \
    pkgsrc/devel/lua-rocks/patches/patch-Makefile.install.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1475785735148170
Content-Disposition: inline
Content-Length: 5773
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/lua-rocks/Makefile
diff -u pkgsrc/devel/lua-rocks/Makefile:1.1.1.1 pkgsrc/devel/lua-rocks/Makefile:1.2
--- pkgsrc/devel/lua-rocks/Makefile:1.1.1.1	Mon Jun  6 21:31:52 2016
+++ pkgsrc/devel/lua-rocks/Makefile	Thu Oct  6 20:28:54 2016
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/06 21:31:52 alnsn Exp $
+# $NetBSD: Makefile,v 1.2 2016/10/06 20:28:54 alnsn Exp $
 
-DISTNAME=	luarocks-2.3.0
+DISTNAME=	luarocks-2.4.1
 PKGNAME=	${DISTNAME:S/luarocks/${LUA_PKGPREFIX}-rocks/}
 CATEGORIES=	devel
 MASTER_SITES=	http://luarocks.org/releases/
@@ -18,8 +18,6 @@ USE_TOOLS+=	openssl:run # md5-checker (o
 HAS_CONFIGURE=	yes
 USE_LANGUAGES=	# none
 
-REPLACE_LUA+=		src/bin/luarocks src/bin/luarocks-admin
-
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--rocks-tree=${PREFIX}/luarocks
 CONFIGURE_ARGS+=	--with-lua=${PREFIX}
Index: pkgsrc/devel/lua-rocks/PLIST
diff -u pkgsrc/devel/lua-rocks/PLIST:1.1.1.1 pkgsrc/devel/lua-rocks/PLIST:1.2
--- pkgsrc/devel/lua-rocks/PLIST:1.1.1.1	Mon Jun  6 21:31:52 2016
+++ pkgsrc/devel/lua-rocks/PLIST	Thu Oct  6 20:28:54 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2016/06/06 21:31:52 alnsn Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/10/06 20:28:54 alnsn Exp $
 bin/luarocks-${LUADOTVER}
 bin/luarocks-admin-${LUADOTVER}
 ${LUA_EXAMPLESDIR}/config-${LUADOTVER}.lua
@@ -23,6 +23,7 @@ ${LUA_LDIR}/luarocks/fetch/git.lua
 ${LUA_LDIR}/luarocks/fetch/git_file.lua
 ${LUA_LDIR}/luarocks/fetch/git_http.lua
 ${LUA_LDIR}/luarocks/fetch/git_https.lua
+${LUA_LDIR}/luarocks/fetch/git_ssh.lua
 ${LUA_LDIR}/luarocks/fetch/hg.lua
 ${LUA_LDIR}/luarocks/fetch/hg_http.lua
 ${LUA_LDIR}/luarocks/fetch/hg_https.lua
@@ -31,6 +32,7 @@ ${LUA_LDIR}/luarocks/fetch/sscm.lua
 ${LUA_LDIR}/luarocks/fetch/svn.lua
 ${LUA_LDIR}/luarocks/fs.lua
 ${LUA_LDIR}/luarocks/fs/lua.lua
+${LUA_LDIR}/luarocks/fs/tools.lua
 ${LUA_LDIR}/luarocks/fs/unix.lua
 ${LUA_LDIR}/luarocks/fs/unix/tools.lua
 ${LUA_LDIR}/luarocks/fs/win32.lua
Index: pkgsrc/devel/lua-rocks/distinfo
diff -u pkgsrc/devel/lua-rocks/distinfo:1.1.1.1 pkgsrc/devel/lua-rocks/distinfo:1.2
--- pkgsrc/devel/lua-rocks/distinfo:1.1.1.1	Mon Jun  6 21:31:52 2016
+++ pkgsrc/devel/lua-rocks/distinfo	Thu Oct  6 20:28:54 2016
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2016/06/06 21:31:52 alnsn Exp $
+$NetBSD: distinfo,v 1.2 2016/10/06 20:28:54 alnsn Exp $
 
-SHA1 (luarocks-2.3.0.tar.gz) = 5f1e1658ef8c7c9710fbc751cad79eb69ae2a891
-RMD160 (luarocks-2.3.0.tar.gz) = 883671495ba6399e3ab49f5a57506ecd6717f735
-SHA512 (luarocks-2.3.0.tar.gz) = 99f99ec59f663b3db22350946eb3357928c0e462ddcc7c3e5e0923e422c7ad6acffb0d2c95d1ec53526b08c33f2ae628276138e2daa7da077fd8de4b0b18eb15
-Size (luarocks-2.3.0.tar.gz) = 123787 bytes
-SHA1 (patch-Makefile) = 98e2844ac32d138eb3de371c89679a19effa9fcf
-SHA1 (patch-Makefile.install.inc) = 8f0208358ba720e67e331fce89d846084702af22
+SHA1 (luarocks-2.4.1.tar.gz) = 5f236aa3a5b84808469e763041fcb86bbaf75c08
+RMD160 (luarocks-2.4.1.tar.gz) = 940bac9868436e7de977d4331bc7201b276173d5
+SHA512 (luarocks-2.4.1.tar.gz) = d7ee476618b83fafade0259b1a279e39f4b6a5a3f21eec0dd4f97b4e4fd1259e481635a0ecbe5b23594554e79cee6c055798de3e83f350888888664ac7cdc3e7
+Size (luarocks-2.4.1.tar.gz) = 135200 bytes
+SHA1 (patch-Makefile) = c94a4daf6670a0a96f3d5ce7898d8e06aa422e0e
+SHA1 (patch-Makefile.install.inc) = f12fd0b89c32c9741a2af2b0b4a0e34d8fdfa6f0

Index: pkgsrc/devel/lua-rocks/patches/patch-Makefile
diff -u pkgsrc/devel/lua-rocks/patches/patch-Makefile:1.1.1.1 pkgsrc/devel/lua-rocks/patches/patch-Makefile:1.2
--- pkgsrc/devel/lua-rocks/patches/patch-Makefile:1.1.1.1	Mon Jun  6 21:31:52 2016
+++ pkgsrc/devel/lua-rocks/patches/patch-Makefile	Thu Oct  6 20:28:54 2016
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.1.1.1 2016/06/06 21:31:52 alnsn Exp $
+$NetBSD: patch-Makefile,v 1.2 2016/10/06 20:28:54 alnsn Exp $
 
-Install config-5.x.lua to LUA_EXAMPLESDIR. Do not undo REPLACE_LUA changes.
+Install config-5.x.lua to LUA_EXAMPLESDIR.
 
---- Makefile.orig	2015-12-29 15:50:56.000000000 +0000
+--- Makefile.orig	2016-10-06 19:01:55.000000000 +0000
 +++ Makefile
-@@ -9,7 +9,7 @@ SYSCONFDIR ?= $(PREFIX)/etc/luarocks
+@@ -10,7 +10,7 @@ SYSCONFDIR ?= $(PREFIX)/etc/luarocks
  LUA_DIR ?= /usr/local
  LUA_BINDIR ?= $(LUA_DIR)/bin
  
@@ -13,12 +13,3 @@ Install config-5.x.lua to LUA_EXAMPLESDI
  
  SAFEPWD=`echo "$$PWD" | sed -e 's/\([][]\)\1/]]..'\''\1\1'\''..[[/g'`
  
-@@ -116,7 +116,7 @@ cleanup_bins:
- 	for f in $(BIN_FILES) ;\
- 	do \
- 	   mv src/bin/$$f src/bin/$$f.bak ;\
--	   sed "s,^#!.*lua.*,#!/usr/bin/env lua,;/^package.path/d" < src/bin/$$f.bak > src/bin/$$f ;\
-+	   sed "/^package.path/d" < src/bin/$$f.bak > src/bin/$$f ;\
- 	   chmod +x src/bin/$$f ;\
- 	   rm -f src/bin/$$f.bak ;\
- 	done
Index: pkgsrc/devel/lua-rocks/patches/patch-Makefile.install.inc
diff -u pkgsrc/devel/lua-rocks/patches/patch-Makefile.install.inc:1.1.1.1 pkgsrc/devel/lua-rocks/patches/patch-Makefile.install.inc:1.2
--- pkgsrc/devel/lua-rocks/patches/patch-Makefile.install.inc:1.1.1.1	Mon Jun  6 21:31:52 2016
+++ pkgsrc/devel/lua-rocks/patches/patch-Makefile.install.inc	Thu Oct  6 20:28:54 2016
@@ -1,13 +1,13 @@
-$NetBSD: patch-Makefile.install.inc,v 1.1.1.1 2016/06/06 21:31:52 alnsn Exp $
+$NetBSD: patch-Makefile.install.inc,v 1.2 2016/10/06 20:28:54 alnsn Exp $
 
 Be pkg_alternatives(8) friendly.
 
---- Makefile.install.inc.orig	2015-12-29 15:50:56.000000000 +0000
+--- Makefile.install.inc.orig	2016-10-06 19:01:55.000000000 +0000
 +++ Makefile.install.inc
-@@ -8,7 +8,6 @@ install_bins:
- 	for f in $(BIN_FILES); \
+@@ -9,7 +9,6 @@ install_bins:
  	do \
  	   cp "$$f" "$(DESTDIR)$(BINDIR)/$$f-$$luaver"; \
+ 	   chmod +rx "$(DESTDIR)$(BINDIR)/$$f-$$luaver"; \
 -	   ln -nfs "$$f-$$luaver" "$(DESTDIR)$(BINDIR)/$$f"; \
  	done
  

--_----------=_1475785735148170--