aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authormandree <mandree@FreeBSD.org>2012-04-07 01:39:12 +0800
committermandree <mandree@FreeBSD.org>2012-04-07 01:39:12 +0800
commite5da67dcccd9a9d27f0d08216bf425fb49717ffa (patch)
tree74e7742e65e15c456c00c4fadf4673c23d4dd483 /lang
parentb2d3a014e0ca78c3fd5a326db81a4b72c1d756be (diff)
downloadfreebsd-ports-graphics-e5da67dcccd9a9d27f0d08216bf425fb49717ffa.tar.gz
freebsd-ports-graphics-e5da67dcccd9a9d27f0d08216bf425fb49717ffa.tar.zst
freebsd-ports-graphics-e5da67dcccd9a9d27f0d08216bf425fb49717ffa.zip
Update to bug-fix release 5.1.5.
Submitted by: ohauer Feature safe: yes PR: ports/166540
Diffstat (limited to 'lang')
-rw-r--r--lang/lua/Makefile6
-rw-r--r--lang/lua/distinfo6
-rw-r--r--lang/lua/files/patch-src-Makefile2
-rw-r--r--lang/lua/pkg-plist10
4 files changed, 9 insertions, 15 deletions
diff --git a/lang/lua/Makefile b/lang/lua/Makefile
index 9ea2e7cf66d..50e861c8a8a 100644
--- a/lang/lua/Makefile
+++ b/lang/lua/Makefile
@@ -6,16 +6,12 @@
#
PORTNAME= lua
-PORTVERSION= 5.1.4
-PORTREVISION= 6
+PORTVERSION= 5.1.5
CATEGORIES= lang
MASTER_SITES= http://www.lua.org/ftp/ \
ftp://ftp.ntua.gr/pub/lang/lua/ \
ftp://ftp.gwdg.de/pub/languages/lua/
-PATCH_SITES= http://www.lua.org/ftp/
-PATCHFILES= patch-lua-5.1.4-3
-
MAINTAINER= lua@FreeBSD.org
COMMENT= Small, compilable scripting language providing easy access to C code
diff --git a/lang/lua/distinfo b/lang/lua/distinfo
index 1a135067de3..702e643a2cf 100644
--- a/lang/lua/distinfo
+++ b/lang/lua/distinfo
@@ -1,4 +1,2 @@
-SHA256 (lua-5.1.4.tar.gz) = b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a
-SIZE (lua-5.1.4.tar.gz) = 216679
-SHA256 (patch-lua-5.1.4-3) = 260fcbdb558001f0a8a8e49bdcb83bf9bdcf9065bb82b661f458ee061f5ff44c
-SIZE (patch-lua-5.1.4-3) = 5004
+SHA256 (lua-5.1.5.tar.gz) = 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333
+SIZE (lua-5.1.5.tar.gz) = 221213
diff --git a/lang/lua/files/patch-src-Makefile b/lang/lua/files/patch-src-Makefile
index 83de3a7ac42..58691571d48 100644
--- a/lang/lua/files/patch-src-Makefile
+++ b/lang/lua/files/patch-src-Makefile
@@ -33,7 +33,7 @@
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(MYLDFLAGS) -shared -Wl,-soname=$(LUA_SONAME) $?
+
$(LUA_A): $(CORE_O) $(LIB_O)
-- $(AR) $@ $?
+- $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
+ $(AR) $(ARFLAGS) $@ $?
$(RANLIB) $@
diff --git a/lang/lua/pkg-plist b/lang/lua/pkg-plist
index 0559b965a70..eb7308f0533 100644
--- a/lang/lua/pkg-plist
+++ b/lang/lua/pkg-plist
@@ -1,5 +1,3 @@
-@exec mkdir -p %D/share/lua/%%LUA_VER%%
-@exec mkdir -p %D/lib/lua/%%LUA_VER%%
bin/lua-%%LUA_VER%%
%%LUA_BINDIR%%/lua
%%LUA_BINDIR%%/luac
@@ -11,14 +9,16 @@ bin/luac-%%LUA_VER%%
%%LUA_INCDIR%%/lualib.h
lib/liblua-%%LUA_VER%%.so
lib/liblua-%%LUA_VER%%.so.%%LUA_VER_SH%%
+%%LUA_LIBDIR%%/liblua-%%LUA_VER%%.so.%%LUA_VER_SH%%
%%LUA_LIBDIR%%/liblua.a
%%LUA_LIBDIR%%/liblua.so
-%%LUA_LIBDIR%%/liblua-%%LUA_VER%%.so.%%LUA_VER_SH%%
libdata/pkgconfig/lua-%%LUA_VER%%.pc
-@dirrm share/lua/%%LUA_VER%%
-@dirrmtry share/lua
+@dirrm %%DATADIR%%/%%LUA_VER%%
+@dirrmtry %%DATADIR%%
@dirrm %%LUA_LIBDIR%%
@dirrm lib/lua/%%LUA_VER%%
@dirrmtry lib/lua
@dirrm %%LUA_INCDIR%%
@dirrm %%LUA_BINDIR%%
+@exec mkdir -p %D/%%DATADIR%%/%%LUA_VER%%
+@exec mkdir -p %D/lib/lua/%%LUA_VER%%