Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Jun 2015 17:12:33 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r390260 - in head/net/luasocket: . files
Message-ID:  <201506211712.t5LHCXNJ069338@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sun Jun 21 17:12:32 2015
New Revision: 390260
URL: https://svnweb.freebsd.org/changeset/ports/390260

Log:
  - Allow build with lua52 and lua53
  - Space/tab fix
  
  PR:		200407
  Submitted by:	sunpoet (myself)
  Approved by:	maintainer (timeout, 4 weeks)

Added:
  head/net/luasocket/files/patch-Makefile   (contents, props changed)
Modified:
  head/net/luasocket/Makefile

Modified: head/net/luasocket/Makefile
==============================================================================
--- head/net/luasocket/Makefile	Sun Jun 21 17:12:27 2015	(r390259)
+++ head/net/luasocket/Makefile	Sun Jun 21 17:12:32 2015	(r390260)
@@ -15,10 +15,11 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	diegonehab
 GH_TAGNAME=	v3.0-rc1
 
-USES=		lua:51 gmake pkgconfig
+MAKE_ARGS=	LUA_VER=${LUA_VER}
+USES=		lua gmake pkgconfig
 
-CFLAGS+=    `pkgconf --cflags lua-${LUA_VER}`
-LDFLAGS+=   -shared  `pkgconf --libs lua-${LUA_VER}`
+CFLAGS+=	`pkgconf --cflags lua-${LUA_VER}`
+LDFLAGS+=	-shared  `pkgconf --libs lua-${LUA_VER}`
 
 OPTIONS_DEFINE=	DOCS
 

Added: head/net/luasocket/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/luasocket/files/patch-Makefile	Sun Jun 21 17:12:32 2015	(r390260)
@@ -0,0 +1,30 @@
+--- Makefile.orig	2013-06-14 11:27:32 UTC
++++ Makefile
+@@ -23,21 +23,15 @@ print:
+ test:
+ 	lua test/hello.lua
+ 
+-install-both:
+-	$(MAKE) clean 
+-	@cd src; $(MAKE) $(PLAT) LUAV=5.1
+-	@cd src; $(MAKE) install LUAV=5.1
++install:
+ 	$(MAKE) clean 
+-	@cd src; $(MAKE) $(PLAT) LUAV=5.2
+-	@cd src; $(MAKE) install LUAV=5.2
++	@cd src; $(MAKE) $(PLAT) LUAV=$(LUA_VER)
++	@cd src; $(MAKE) install LUAV=$(LUA_VER)
+ 
+-install-both-unix:
+-	$(MAKE) clean 
+-	@cd src; $(MAKE) $(PLAT) LUAV=5.1
+-	@cd src; $(MAKE) install-unix LUAV=5.1
++install-unix:
+ 	$(MAKE) clean 
+-	@cd src; $(MAKE) $(PLAT) LUAV=5.2
+-	@cd src; $(MAKE) install-unix LUAV=5.2
++	@cd src; $(MAKE) $(PLAT) LUAV=$(LUA_VER)
++	@cd src; $(MAKE) install-unix LUAV=$(LUA_VER)
+ 
+ .PHONY: test
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506211712.t5LHCXNJ069338>