svn commit: r552431 - in head/lang/lua53: . files
Kyle Evans
kevans at FreeBSD.org
Thu Oct 15 17:28:24 UTC 2020
Author: kevans
Date: Thu Oct 15 17:28:22 2020
New Revision: 552431
URL: https://svnweb.freebsd.org/changeset/ports/552431
Log:
lang/lua53: update to 5.3.6
This release fixes all bugs listed here: https://www.lua.org/bugs.html#5.3.5
While we're here, do some cleanup work in preparation for an impending
lang/lua54 port:
- Various reordering to appease portclippy
- The patch to src/Makefile has been renamed to match the standard naming
convention since it was relatively close
- Use ${LUA_VER_STR} in place of again writing out the version string
- Use various LUA_* substitutions in the plist to reduce change on new
versions
The latter two have actually been backported from the submitted lua54 port
in D14709, rather than being included in the original submission, to make
the diff between lang/lua53 and lang/lua54 more obvious.
Submitted by: Russ Haley <russ haley gmail com>
Submitted with: Andrew Gierth <andrew_tao173 riddles org uk>
Differential Revision: https://reviews.freebsd.org/D25797
Added:
head/lang/lua53/files/patch-src_Makefile
- copied unchanged from r552430, head/lang/lua53/files/patch-src__Makefile
Deleted:
head/lang/lua53/files/patch-src__Makefile
Modified:
head/lang/lua53/Makefile
head/lang/lua53/distinfo
head/lang/lua53/pkg-plist
Modified: head/lang/lua53/Makefile
==============================================================================
--- head/lang/lua53/Makefile Thu Oct 15 17:22:42 2020 (r552430)
+++ head/lang/lua53/Makefile Thu Oct 15 17:28:22 2020 (r552431)
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= lua
-DISTVERSION= 5.3.5
-PORTREVISION= 3
+DISTVERSION= 5.3.6
CATEGORIES= lang
MASTER_SITES= https://www.lua.org/ftp/
-PKGNAMESUFFIX= 53
+PKGNAMESUFFIX= ${LUA_VER_STR}
MAINTAINER= russ.haley at gmail.com
COMMENT= Powerful, efficient, lightweight, embeddable scripting language
@@ -24,8 +23,38 @@ USE_LDCONFIG= yes
# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
MAKE_ARGS= __MAKE_CONF=${NONEXISTENT}
-BUILD_WRKSRC= ${WRKSRC}/src
+# using the "bsd" target rather than "freebsd" saves patching out the
+# assumption of using base libedit in order to make it configurable. "bsd"
+# is "generic" plus the POSIX and DLOPEN options, plus -Wl,-E at link time;
+# it doesn't set CC either, which makes it easier for us to control that too.
+ALL_TARGET=bsd
+LUA_LIB_STATIC= liblua-${LUA_VER}.a
+LUA_LIB_SHARED= liblua-${LUA_VER}.so
+LUA_PC_FILE= lua-${LUA_VER}.pc
+
+CFLAGS+= -fPIC
+# 2019-01-25: -pthread in LIBS is a work around for the following bug:
+# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=235211
+LIBS+= -pthread
+
+WITHOUT_NO_STRICT_ALIASING=yes
+
+MAKE_ARGS+= CC="${CC}" \
+ MYCFLAGS="${CPPFLAGS} ${CFLAGS}" \
+ MYLDFLAGS="${LDFLAGS}" \
+ MYLIBS="${LIBS}" \
+ LUA_T=${LUA_CMD} \
+ LUAC_T=${LUAC_CMD} \
+ LUA_A=${LUA_LIB_STATIC} \
+ LUA_SO=${LUA_LIB_SHARED} \
+ LUA_SONAME=${LUA_LIB_SHARED} \
+ TO_BIN="${LUA_CMD} ${LUAC_CMD}" \
+ TO_LIB="${LUA_LIB_SHARED} ${LUA_LIB_STATIC}" \
+ INSTALL_TOP=${STAGEDIR}${PREFIX} \
+ INSTALL_INC=${STAGEDIR}${LUA_INCDIR} \
+ INSTALL_EXEC="${INSTALL_PROGRAM}"
+
# Source, destination, and filenames to copy for the DOCS option
# (automatically added to pkg-plist if DOCS is set)
# We override DOCSDIR to get a per-version subdir.
@@ -33,94 +62,63 @@ BUILD_WRKSRC= ${WRKSRC}/src
# so that ports for Lua modules can use the version subdir too without
# making a mess.
DOCSDIR= ${LUA_DOCSDIR}
-PORTDOCS= *
BUILD_WRKDOC= ${WRKSRC}/doc
-LUA_LIB_STATIC= liblua-${LUA_VER}.a
-LUA_LIB_SHARED= liblua-${LUA_VER}.so
-LUA_PC_FILE= lua-${LUA_VER}.pc
+SUB_FILES= ${LUA_PC_FILE}
+SUB_LIST= version=${PORTVERSION} \
+ includedir=${LUA_INCDIR} \
+ libdir=${LUA_LIBDIR} \
+ soname=lua-${LUA_VER}
-# using the "bsd" target rather than "freebsd" saves patching out the
-# assumption of using base libedit in order to make it configurable. "bsd"
-# is "generic" plus the POSIX and DLOPEN options, plus -Wl,-E at link time;
-# it doesn't set CC either, which makes it easier for us to control that too.
-ALL_TARGET=bsd
+BUILD_WRKSRC= ${WRKSRC}/src
+PORTDOCS= *
+
# Options
-OPTIONS_DEFAULT=LIBEDIT_DL
+OPTIONS_DEFAULT= LIBEDIT_DL
-OPTIONS_GROUP= DOCSGRP DEBUGGRP
-OPTIONS_SINGLE= EDITGRP
-
-OPTIONS_GROUP_DOCSGRP= DOCS
+OPTIONS_GROUP= DOCSGRP DEBUGGRP
OPTIONS_GROUP_DEBUGGRP= ASSERT APICHECK
+OPTIONS_GROUP_DOCSGRP= DOCS
+OPTIONS_SINGLE= EDITGRP
OPTIONS_SINGLE_EDITGRP= EDITNONE LIBEDIT_DL LIBEDIT READLINE
# Option descriptions
-DEBUGGRP_DESC= Debugging options
-ASSERT_DESC= Enable interpreter assertions
APICHECK_DESC= Enable API checks
+ASSERT_DESC= Enable interpreter assertions
+DEBUGGRP_DESC= Debugging options
DOCSGRP_DESC= Documentation options
DOCS_DESC= Install language and API reference (HTML, ~400kB)
EDITGRP_DESC= Interactive command-line editing
EDITNONE_DESC= No command-line editing
-LIBEDIT_DL_DESC=Use dynamically loaded libedit (recommended)
LIBEDIT_DESC= Use libedit (breaks lcurses)
+LIBEDIT_DL_DESC=Use dynamically loaded libedit (recommended)
READLINE_DESC= Use GNU Readline (breaks lcurses)
# Option implementations
+APICHECK_CPPFLAGS= -DLUA_USE_APICHECK
ASSERT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-assert
-APICHECK_CPPFLAGS= -DLUA_USE_APICHECK
-
# EDITNONE currently requires no settings
-LIBEDIT_DL_USES= libedit
-LIBEDIT_DL_CPPFLAGS= -DLUA_USE_READLINE_DL
-
LIBEDIT_USES= libedit
LIBEDIT_CPPFLAGS= -DLUA_USE_READLINE
LIBEDIT_LIBS= -ledit
+LIBEDIT_DL_USES= libedit
+LIBEDIT_DL_CPPFLAGS= -DLUA_USE_READLINE_DL
+
READLINE_USES= readline
READLINE_CPPFLAGS= -DLUA_USE_READLINE
READLINE_LIBS= -lreadline
# end of option vars
-
-CFLAGS+= -fPIC
-# 2019-01-25: -pthread in LIBS is a work around for the following bug:
-# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=235211
-LIBS+= -pthread
-
-WITHOUT_NO_STRICT_ALIASING=yes
-
-MAKE_ARGS+= CC="${CC}" \
- MYCFLAGS="${CPPFLAGS} ${CFLAGS}" \
- MYLDFLAGS="${LDFLAGS}" \
- MYLIBS="${LIBS}" \
- LUA_T=${LUA_CMD} \
- LUAC_T=${LUAC_CMD} \
- LUA_A=${LUA_LIB_STATIC} \
- LUA_SO=${LUA_LIB_SHARED} \
- LUA_SONAME=${LUA_LIB_SHARED} \
- TO_BIN="${LUA_CMD} ${LUAC_CMD}" \
- TO_LIB="${LUA_LIB_SHARED} ${LUA_LIB_STATIC}" \
- INSTALL_TOP=${STAGEDIR}${PREFIX} \
- INSTALL_INC=${STAGEDIR}${LUA_INCDIR} \
- INSTALL_EXEC="${INSTALL_PROGRAM}"
-
-SUB_FILES= ${LUA_PC_FILE}
-SUB_LIST= version=${PORTVERSION} \
- includedir=${LUA_INCDIR} \
- libdir=${LUA_LIBDIR} \
- soname=lua-${LUA_VER}
post-patch:
@${REINPLACE_CMD} -e "/LUA_ROOT/s,/usr/local,${LUA_PREFIX}," \
Modified: head/lang/lua53/distinfo
==============================================================================
--- head/lang/lua53/distinfo Thu Oct 15 17:22:42 2020 (r552430)
+++ head/lang/lua53/distinfo Thu Oct 15 17:28:22 2020 (r552431)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531618645
-SHA256 (lua-5.3.5.tar.gz) = 0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac
-SIZE (lua-5.3.5.tar.gz) = 303543
+TIMESTAMP = 1601041108
+SHA256 (lua-5.3.6.tar.gz) = fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60
+SIZE (lua-5.3.6.tar.gz) = 303770
Copied: head/lang/lua53/files/patch-src_Makefile (from r552430, head/lang/lua53/files/patch-src__Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/lua53/files/patch-src_Makefile Thu Oct 15 17:28:22 2020 (r552431, copy of r552430, head/lang/lua53/files/patch-src__Makefile)
@@ -0,0 +1,58 @@
+--- src/Makefile.orig 2018-06-25 17:46:36 UTC
++++ src/Makefile
+@@ -6,12 +6,13 @@
+ # Your platform. See PLATS for possible values.
+ PLAT= none
+
+-CC= gcc -std=gnu99
+-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
++CC?= gcc -std=gnu99
++CFLAGS= -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
+ LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
+ LIBS= -lm $(SYSLIBS) $(MYLIBS)
++SOLIBS= -lm
+
+-AR= ar rcu
++AR= ar
+ RANLIB= ranlib
+ RM= rm -f
+
+@@ -19,8 +20,8 @@ SYSCFLAGS=
+ SYSLDFLAGS=
+ SYSLIBS=
+
+-MYCFLAGS=
+-MYLDFLAGS=
++MYCFLAGS?=
++MYLDFLAGS?=
+ MYLIBS=
+ MYOBJS=
+
+@@ -38,12 +39,13 @@ BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
+
+ LUA_T= lua
+ LUA_O= lua.o
++LUA_SO= liblua.so
+
+ LUAC_T= luac
+ LUAC_O= luac.o
+
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
+ ALL_A= $(LUA_A)
+
+ # Targets start here.
+@@ -55,8 +57,11 @@ o: $(ALL_O)
+
+ a: $(ALL_A)
+
++$(LUA_SO): $(CORE_O) $(LIB_O)
++ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(MYLDFLAGS) -shared -Wl,-soname=$(LUA_SONAME) $? $(SOLIBS)
++
+ $(LUA_A): $(BASE_O)
+- $(AR) $@ $(BASE_O)
++ $(AR) $(ARFLAGS) $@ $(BASE_O)
+ $(RANLIB) $@
+
+ $(LUA_T): $(LUA_O) $(LUA_A)
Modified: head/lang/lua53/pkg-plist
==============================================================================
--- head/lang/lua53/pkg-plist Thu Oct 15 17:22:42 2020 (r552430)
+++ head/lang/lua53/pkg-plist Thu Oct 15 17:28:22 2020 (r552431)
@@ -1,14 +1,14 @@
-bin/lua53
-bin/luac53
-include/lua53/lauxlib.h
-include/lua53/lua.h
-include/lua53/lua.hpp
-include/lua53/luaconf.h
-include/lua53/lualib.h
-lib/liblua-5.3.a
-lib/liblua-5.3.so
-libdata/pkgconfig/lua-5.3.pc
-man/man1/lua53.1.gz
-man/man1/luac53.1.gz
- at dir lib/lua/5.3
- at dir %%DATADIR%%/5.3
+bin/lua%%LUA_VER_STR%%
+bin/luac%%LUA_VER_STR%%
+%%LUA_INCDIR%%/lauxlib.h
+%%LUA_INCDIR%%/lua.h
+%%LUA_INCDIR%%/lua.hpp
+%%LUA_INCDIR%%/luaconf.h
+%%LUA_INCDIR%%/lualib.h
+%%LUA_LIBDIR%%/liblua-%%LUA_VER%%.a
+%%LUA_LIBDIR%%/liblua-%%LUA_VER%%.so
+libdata/pkgconfig/lua-%%LUA_VER%%.pc
+man/man1/lua%%LUA_VER_STR%%.1.gz
+man/man1/luac%%LUA_VER_STR%%.1.gz
+ at dir %%LUA_MODLIBDIR%%
+ at dir %%LUA_MODSHAREDIR%%
More information about the svn-ports-all
mailing list