diff --git a/srcpkgs/lua51-luasocket/template b/srcpkgs/lua51-luasocket/template index 69ad4cc7cde..d62a998ae34 100644 --- a/srcpkgs/lua51-luasocket/template +++ b/srcpkgs/lua51-luasocket/template @@ -1,8 +1,9 @@ # Template file for 'lua51-luasocket' pkgname=lua51-luasocket version=3.1.0 -revision=2 -build_style=gnu-makefile +revision=3 +build_style=meta +hostmakedepends="luarocks-lua54" depends="lua51" _desc="Network support for the Lua language" short_desc="${_desc} (5.1.x)" @@ -18,47 +19,23 @@ for _lua_version in $_lua_versions; do makedepends+=" ${_lua_version/./}-devel" done -post_extract() { - mkdir -p lua51 - mv * lua51 || true - cp -a lua51 lua52 - cp -a lua51 lua53 - cp -a lua51 lua54 -} +#if [[ CROSS_BUILD ]]; then +# for _lua_version in $_lua_versions; do +# hostmakedepends+=" ${_lua_version/./}-devel" +# done +#fi -do_build() { - for _lua_version in $_lua_versions; do - cd "${wrksrc}/${_lua_version/./}/src/" - make \ - LD="$CC" \ - CC="$CC" \ - LUAINC="${XBPS_CROSS_BASE}/usr/include/${_lua_version}" \ - LUAVER="${_lua_version#lua}" \ - LUAV="${_lua_version#lua}" \ - PLAT=linux \ - ${makejobs} \ - all-unix - done +_rockname=${pkgname#lua51-} +_rocksrel=1 +_package() { + luarocks config --lua-version="$1" variables.LUA_INCDIR "${XBPS_CROSS_BASE}/usr/include/lua$1" + luarocks --lua-version="$1" --tree="${PKGDESTDIR}/usr/" \ + make --deps-mode=none --no-manifest "rockspecs/${_rockname}-${version}-${_rocksrel}.rockspec" } do_install() { - for _lua_version in $_lua_versions; do - cd "${wrksrc}/${_lua_version/./}/src/" - make \ - STRIP=true \ - PREFIX=/usr \ - prefix=/usr \ - DESTDIR="${DESTDIR}" \ - LUAVER="${_lua_version#lua}" \ - LUAV="${_lua_version#lua}" \ - LDIR_linux="lib/lua/${_lua_version#lua}" \ - PLAT=linux \ - install - done -} - -post_install() { - vlicense ./lua51/LICENSE + _package 5.1 + vlicense LICENSE } luasocket_package() { @@ -71,8 +48,8 @@ lua52-luasocket_package() { depends="lua52" short_desc="${_desc} (5.2.x)" pkg_install() { - vmove usr/lib/lua/5.2 - vlicense ${wrksrc}/lua52/LICENSE + _package 5.2 + vlicense LICENSE } } @@ -80,8 +57,8 @@ lua53-luasocket_package() { depends="lua53" short_desc="${_desc} (5.3.x)" pkg_install() { - vmove usr/lib/lua/5.3 - vlicense ${wrksrc}/lua53/LICENSE + _package 5.3 + vlicense LICENSE } } @@ -89,7 +66,7 @@ lua54-luasocket_package() { depends="lua54" short_desc="${_desc} (5.4.x)" pkg_install() { - vmove usr/lib/lua/5.4 - vlicense ${wrksrc}/lua54/LICENSE + _package 5.4 + vlicense LICENSE } }