diff options
Diffstat (limited to 'devel')
23 files changed, 53 insertions, 74 deletions
diff --git a/devel/Makefile b/devel/Makefile index 71b357fd4c05..5f7ed938dcdb 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1460,6 +1460,7 @@ SUBDIR += lua-cjson SUBDIR += lua-gettext SUBDIR += lua-lgi + SUBDIR += lua-libevent SUBDIR += lua-lpeg SUBDIR += lua-luacheck SUBDIR += lua-luarocks @@ -1472,12 +1473,8 @@ SUBDIR += lua-stdlib-debug SUBDIR += lua-stdlib-normalize SUBDIR += lua-sysctl - SUBDIR += lua51-bitop - SUBDIR += lua51-cjson - SUBDIR += lua51-libevent SUBDIR += luabind SUBDIR += luafilesystem - SUBDIR += luafilesystem-51 SUBDIR += luajava SUBDIR += lutok SUBDIR += luv diff --git a/devel/lua-MessagePack/Makefile b/devel/lua-MessagePack/Makefile index 429452d2ad9d..0600d463dc71 100644 --- a/devel/lua-MessagePack/Makefile +++ b/devel/lua-MessagePack/Makefile @@ -2,6 +2,7 @@ PORTNAME= MessagePack PORTVERSION= 0.3.5 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} @@ -15,7 +16,7 @@ EXPIRATION_DATE= 2020-05-05 LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYRIGHT -USES= lua +USES= lua:module NO_BUILD= yes NO_ARCH= yes diff --git a/devel/lua-bitlib/Makefile b/devel/lua-bitlib/Makefile index 5008b9b91ea2..b4fd46f08827 100644 --- a/devel/lua-bitlib/Makefile +++ b/devel/lua-bitlib/Makefile @@ -3,6 +3,7 @@ PORTNAME= bitlib PORTVERSION= 24 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://luaforge.net/frs/download.php/2715/ PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} @@ -10,7 +11,7 @@ PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Tiny library for bitwise operations -USES= lua +USES= lua:module PLIST_FILES= %%LUA_MODLIBDIR%%/bit.so diff --git a/devel/lua-bitop/Makefile b/devel/lua-bitop/Makefile index 547e82a7d932..5a5911f4f3ce 100644 --- a/devel/lua-bitop/Makefile +++ b/devel/lua-bitop/Makefile @@ -3,7 +3,7 @@ PORTNAME= bitop PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://bitop.luajit.org/download/ \ LOCAL/sunpoet @@ -18,7 +18,7 @@ LICENSE= MIT CFLAGS+= -I${LUA_INCDIR} MAKE_ARGS= CC=${CC} LUA=${LUA_CMD} TEST_TARGET= test -USES?= gmake lua +USES= gmake lua:module PLIST_FILES= ${LUA_MODLIBDIR}/bit.so diff --git a/devel/lua-cjson/Makefile b/devel/lua-cjson/Makefile index 4558c554b616..5a475e0187e9 100644 --- a/devel/lua-cjson/Makefile +++ b/devel/lua-cjson/Makefile @@ -3,18 +3,19 @@ PORTNAME= cjson PORTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.kyne.com.au/~mark/software/download/ PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} DISTNAME= lua-cjson-${PORTVERSION} MAINTAINER= osa@FreeBSD.org -COMMENT?= Fast JSON parsing and encoding support for Lua +COMMENT= Fast JSON parsing and encoding support for Lua LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES?= lua +USES= lua:module MAKE_ARGS= LUA_VERSION=${LUA_VER} diff --git a/devel/lua-gettext/Makefile b/devel/lua-gettext/Makefile index 4981a4cf9908..0a329e2f98a7 100644 --- a/devel/lua-gettext/Makefile +++ b/devel/lua-gettext/Makefile @@ -3,7 +3,7 @@ PORTNAME= gettext PORTVERSION= 1.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= https://raw.githubusercontent.com/nuclewall/bsdinstaller/${COMMIT}/src/lib/lua/gettext/ \ https://BSDforge.com/projects/source/devel/lua-gettext/ @@ -14,7 +14,7 @@ DIST_SUBDIR= lua-${PORTNAME}-${COMMIT} MAINTAINER= portmaster@BSDforge.com COMMENT= Gettext binding for Lua 5 -USES= gettext lua:51 +USES= gettext lua:51,module CVER= 1.15 LVER= ${PORTVERSION} diff --git a/devel/lua-lgi/Makefile b/devel/lua-lgi/Makefile index 60e8cc6b9ede..45f55a39f394 100644 --- a/devel/lua-lgi/Makefile +++ b/devel/lua-lgi/Makefile @@ -2,10 +2,11 @@ PORTNAME= lgi PORTVERSION= 0.9.2 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= andrew@tao11.riddles.org.uk COMMENT= Lua bindings to libraries using GObject-Introspection LICENSE= MIT @@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= pavouk -USES= gmake gnome lua pkgconfig +USES= gmake gnome lua:module pkgconfig USE_GNOME= introspection:build,run MAKE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" MAKE_ARGS= PREFIX="${PREFIX}" LUA_LIBDIR="${LUA_MODLIBDIR}" \ diff --git a/devel/lua51-libevent/Makefile b/devel/lua-libevent/Makefile index 52edd60dfb5f..279e98df6696 100644 --- a/devel/lua51-libevent/Makefile +++ b/devel/lua-libevent/Makefile @@ -1,12 +1,12 @@ # Created by: Sir l33tname <sirl33tname@gmail.com> # $FreeBSD$ -PORTNAME= lua51 +PORTNAME= libevent PORTVERSION= 0.4.6 DISTVERSIONPREFIX=v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel -PKGNAMESUFFIX= -libevent +PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} MAINTAINER= sirl33tname@gmail.com COMMENT= Lua libevent binding @@ -14,9 +14,9 @@ COMMENT= Lua libevent binding LICENSE= MIT LIB_DEPENDS= libevent.so:devel/libevent -RUN_DEPENDS= ${LUA_MODLIBDIR}/socket/core.so:net/luasocket-51 +RUN_DEPENDS= ${LUA_REFMODLIBDIR}/socket/core.so:net/luasocket@${LUA_FLAVOR} -USES= gmake pkgconfig lua:51 +USES= gmake pkgconfig lua:51,module USE_GITHUB= yes GH_ACCOUNT= harningt diff --git a/devel/lua51-libevent/distinfo b/devel/lua-libevent/distinfo index 7e93772d6e5a..7e93772d6e5a 100644 --- a/devel/lua51-libevent/distinfo +++ b/devel/lua-libevent/distinfo diff --git a/devel/lua51-libevent/pkg-descr b/devel/lua-libevent/pkg-descr index 894a8155a802..894a8155a802 100644 --- a/devel/lua51-libevent/pkg-descr +++ b/devel/lua-libevent/pkg-descr diff --git a/devel/lua-lpeg/Makefile b/devel/lua-lpeg/Makefile index 0499a3fdb8ca..c4aca9243f9b 100644 --- a/devel/lua-lpeg/Makefile +++ b/devel/lua-lpeg/Makefile @@ -2,6 +2,7 @@ PORTNAME= lpeg PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.inf.puc-rio.br/~roberto/lpeg/ \ LOCAL/sunpoet @@ -12,7 +13,7 @@ COMMENT= PEG-based pattern-matching library for Lua LICENSE= MIT -USES= lua +USES= lua:module ALL_TARGET= linux MAKE_ARGS= CC=${CC} LUADIR=${LUA_INCDIR} diff --git a/devel/lua-luacheck/Makefile b/devel/lua-luacheck/Makefile index 613bba308ad8..ba6b809e3ff7 100644 --- a/devel/lua-luacheck/Makefile +++ b/devel/lua-luacheck/Makefile @@ -11,7 +11,7 @@ COMMENT= Linter and static analyzer for lua files LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem +RUN_DEPENDS= ${LUA_REFMODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR} USES= lua NO_ARCH= yes diff --git a/devel/lua-posix/Makefile b/devel/lua-posix/Makefile index 9ef85e67ef5c..3c091a405549 100644 --- a/devel/lua-posix/Makefile +++ b/devel/lua-posix/Makefile @@ -4,6 +4,7 @@ PORTNAME= posix PORTVERSION= 34.1.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} @@ -13,9 +14,9 @@ COMMENT= Lua bindings for POSIX APIs LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}stdlib-normalize>=0:devel/lua-stdlib-normalize +RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}stdlib-normalize>=0:devel/lua-stdlib-normalize@${LUA_FLAVOR} -USES= lua shebangfix +USES= lua:module shebangfix SHEBANG_FILES= build-aux/luke USE_GITHUB= yes diff --git a/devel/lua-pty/Makefile b/devel/lua-pty/Makefile index c5fb2d58e6ee..ab3615a4057c 100644 --- a/devel/lua-pty/Makefile +++ b/devel/lua-pty/Makefile @@ -3,6 +3,7 @@ PORTNAME= pty PORTVERSION= 1.25 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://raw.githubusercontent.com/nuclewall/bsdinstaller/${COMMIT}/src/lib/lua/pty/ \ https://BSDforge.com/projects/source/devel/lua-pty/ @@ -13,7 +14,7 @@ DIST_SUBDIR= lua-${PORTNAME}-${COMMIT} MAINTAINER= portmaster@BSDforge.com COMMENT= Pty (pseudo-terminal) bindings for Lua 5 -USES= lua:51 +USES= lua:51,module COMMIT= 8323bb9 MAKEFILE= ${FILESDIR}/Makefile diff --git a/devel/lua-stdlib-debug/Makefile b/devel/lua-stdlib-debug/Makefile index 937ed51c0da2..378b1fe2a5f3 100644 --- a/devel/lua-stdlib-debug/Makefile +++ b/devel/lua-stdlib-debug/Makefile @@ -3,6 +3,7 @@ PORTNAME= stdlib-debug PORTVERSION= 1.0.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} @@ -13,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md NO_ARCH= yes -USES= lua +USES= lua:module USE_GITHUB= yes GH_ACCOUNT= lua-stdlib @@ -21,7 +22,7 @@ GH_PROJECT= _debug OPTIONS_DEFINE= DOCS -DOCSDIR= ${PREFIX}/share/doc/lua${LUA_VER_STR}/${PORTNAME} +DOCSDIR= ${LUA_DOCSDIR} do-install: @${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR}/std/_debug diff --git a/devel/lua-stdlib-normalize/Makefile b/devel/lua-stdlib-normalize/Makefile index bdf0cf422d3a..4a58b26e923d 100644 --- a/devel/lua-stdlib-normalize/Makefile +++ b/devel/lua-stdlib-normalize/Makefile @@ -3,6 +3,7 @@ PORTNAME= stdlib-normalize PORTVERSION= 2.0.2 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} @@ -12,10 +13,10 @@ COMMENT= Collection of normalized lua functions LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}stdlib-debug>=0:devel/lua-stdlib-debug +RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}stdlib-debug>=0:devel/lua-stdlib-debug@${LUA_FLAVOR} NO_ARCH= yes -USES= lua +USES= lua:module USE_GITHUB= yes GH_ACCOUNT= lua-stdlib @@ -23,7 +24,7 @@ GH_PROJECT= normalize OPTIONS_DEFINE= DOCS -DOCSDIR= ${PREFIX}/share/doc/lua${LUA_VER_STR}/${PORTNAME} +DOCSDIR= ${LUA_DOCSDIR} do-install: @${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR}/std/normalize diff --git a/devel/lua-stdlib/Makefile b/devel/lua-stdlib/Makefile index dc6111a2a20a..2ae611ec0de9 100644 --- a/devel/lua-stdlib/Makefile +++ b/devel/lua-stdlib/Makefile @@ -4,6 +4,7 @@ PORTNAME= stdlib PORTVERSION= 41.2.2 DISTVERSIONPREFIX= release-v +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} @@ -13,14 +14,14 @@ COMMENT= Standard Lua Libraries LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}stdlib-debug>=0:devel/lua-stdlib-debug \ - ${LUA_PKGNAMEPREFIX}stdlib-normalize>=2.0:devel/lua-stdlib-normalize +RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}stdlib-debug>=0:devel/lua-stdlib-debug@${LUA_FLAVOR} \ + ${LUA_PKGNAMEPREFIX}stdlib-normalize>=2.0:devel/lua-stdlib-normalize@${LUA_FLAVOR} OPTIONS_DEFINE= DOCS -USES= lua +USES= lua:module -CONFIGURE_ARGS= LUA=${LUA_CMD} +CONFIGURE_ARGS= --docdir=${DOCSDIR} LUA=${LUA_CMD} GNU_CONFIGURE= yes NO_ARCH= yes @@ -28,4 +29,6 @@ GH_ACCOUNT= lua-stdlib GH_PROJECT= lua-stdlib USE_GITHUB= yes +DOCSDIR= ${LUA_DOCSDIR} + .include <bsd.port.mk> diff --git a/devel/lua-sysctl/Makefile b/devel/lua-sysctl/Makefile index c264ccd95653..3c1b588fee77 100644 --- a/devel/lua-sysctl/Makefile +++ b/devel/lua-sysctl/Makefile @@ -3,6 +3,7 @@ PORTNAME= sysctl PORTVERSION= 2.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} @@ -11,18 +12,18 @@ COMMENT= Small sysctl(3) interface for lua LICENSE= BSD2CLAUSE -USES= lua pkgconfig +USES= lua:52+,module pkgconfig USE_GITHUB= yes GH_ACCOUNT= kAworu GH_PROJECT= lua-${PORTNAME} OPTIONS_DEFINE= DOCS EXAMPLES -DOCSDIR= ${PREFIX}/share/doc/lua${LUA_VER_STR}/${PORTNAME} -EXAMPLESDIR= ${PREFIX}/share/examples/lua${LUA_VER_STR}/${PORTNAME} +DOCSDIR= ${LUA_DOCSDIR} +EXAMPLESDIR= ${LUA_EXAMPLESDIR} post-patch: - @${REINPLACE_CMD} -e "s/5.1/${LUA_VER}/g" ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e "s/5.2/${LUA_VER}/g" ${WRKSRC}/Makefile do-install: @${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR} diff --git a/devel/lua51-bitop/Makefile b/devel/lua51-bitop/Makefile deleted file mode 100644 index 51a5321a1d61..000000000000 --- a/devel/lua51-bitop/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: lx -# $FreeBSD$ - -COMMENT= lua-bitop for Lua 5.1 - -USES= gmake lua:51 - -MASTERDIR= ${.CURDIR}/../lua-bitop - -PLIST= ${MASTERDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" diff --git a/devel/lua51-cjson/Makefile b/devel/lua51-cjson/Makefile deleted file mode 100644 index 4ddab5f192d5..000000000000 --- a/devel/lua51-cjson/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: osa -# $FreeBSD$ - -COMMENT= Fast JSON parsing and encoding support for Lua 5.1 - -MASTERDIR= ${.CURDIR}/../lua-cjson - -USES= lua:51 - -.include "${MASTERDIR}/Makefile" diff --git a/devel/luafilesystem-51/Makefile b/devel/luafilesystem-51/Makefile deleted file mode 100644 index dc60e7ed7c81..000000000000 --- a/devel/luafilesystem-51/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# Created by: Nikolai Lifanov -# $FreeBSD$ - -COMMENT= LuaFileSystem for Lua 5.1 - -SLAVE_PORT= luafilesystem - -USES= lua:51 - -MASTERDIR= ${.CURDIR}/../luafilesystem -PLIST= ${MASTERDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" diff --git a/devel/luafilesystem/Makefile b/devel/luafilesystem/Makefile index 2306f3d22d74..2e6e5babec81 100644 --- a/devel/luafilesystem/Makefile +++ b/devel/luafilesystem/Makefile @@ -4,6 +4,7 @@ PORTNAME= luafilesystem DISTVERSIONPREFIX= v DISTVERSION= 1_7_0 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} @@ -12,7 +13,7 @@ COMMENT= Library to access directory structure and file attributes LICENSE= MIT -USES?= lua +USES= lua:module USE_GITHUB= yes GH_ACCOUNT= keplerproject @@ -26,6 +27,8 @@ MAKE_ARGS+= INCS="-I${LUA_INCDIR}" OPTIONS_DEFINE= DOCS +DOCSDIR= ${LUA_DOCSDIR} + post-patch: ${REINPLACE_CMD} -e \ "s|%%PREFIX%%|${PREFIX}| ; \ diff --git a/devel/swig30/Makefile b/devel/swig30/Makefile index a964840eb064..eb152d127379 100644 --- a/devel/swig30/Makefile +++ b/devel/swig30/Makefile @@ -3,6 +3,7 @@ PORTNAME= swig PORTVERSION= 3.0.12 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX= 30 @@ -25,7 +26,7 @@ CONFIGURE_ARGS= --program-suffix=${PORTVERSION:R} \ --with-lualib=${LUA_LIBDIR} GNU_CONFIGURE= yes TEST_TARGET= check -USES= gmake lua +USES= gmake lua:build PLIST_SUB= PORTVERSION=${PORTVERSION} |