diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-12-30 01:37:41 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-01-01 11:05:02 +0100 |
| commit | a77d089bc9df46c5e0623a36c66868693828b897 (patch) | |
| tree | 7ff222cf92cba0d6fe4c86be70b7cd4ea363f948 | |
| parent | 6c7e83f3a76feba3e459fc9d5366c535fc1588b7 (diff) | |
| download | aports-a77d089bc9df46c5e0623a36c66868693828b897.tar.bz2 aports-a77d089bc9df46c5e0623a36c66868693828b897.tar.xz | |
main/lua: merge into main/lua5.1
| -rw-r--r-- | main/lua/APKBUILD | 38 | ||||
| -rw-r--r-- | main/lua5.1/APKBUILD | 17 |
2 files changed, 16 insertions, 39 deletions
diff --git a/main/lua/APKBUILD b/main/lua/APKBUILD deleted file mode 100644 index 14a4653c30..0000000000 --- a/main/lua/APKBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=lua -pkgver=5.1.5 -pkgrel=4 -pkgdesc="A powerful light-weight programming language designed for extending applications." -url="https://www.lua.org/" -arch="noarch" -license="MIT" -depends="lua5.1" -makedepends="lua5.1-dev" -subpackages="$pkgname-dev $pkgname-doc" -source="" - -build() { - return 0 -} - -package() { - mkdir -p "$pkgdir"/usr/bin - ln -s lua5.1 "$pkgdir"/usr/bin/lua - ln -s luac5.1 "$pkgdir"/usr/bin/luac -} - -dev() { - depends="lua5.1-dev" - mkdir -p "$subpkgdir"/usr/lib/pkgconfig - ln -s lua5.1.pc "$subpkgdir"/usr/lib/pkgconfig/lua.pc -} - -doc() { - depends="lua5.2-doc" - mkdir -p "$subpkgdir"/usr/share/man/man1 - ln -s lua5.1.1 "$subpkgdir"/usr/share/man/man1/lua.1 - ln -s luac5.1.1 "$subpkgdir"/usr/share/man/man1/luac.1 -} - - - diff --git a/main/lua5.1/APKBUILD b/main/lua5.1/APKBUILD index 3630b0fb05..cb11b99833 100644 --- a/main/lua5.1/APKBUILD +++ b/main/lua5.1/APKBUILD @@ -3,13 +3,14 @@ pkgname=lua5.1 _pkgname=lua pkgver=5.1.5 _luaver=${pkgname#lua} -pkgrel=4 +pkgrel=5 pkgdesc="A powerful light-weight programming language designed for extending applications." url="https://www.lua.org/" arch="all" license="MIT" depends_dev="$pkgname" makedepends="libtool autoconf automake" +provides="lua" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="https://www.lua.org/ftp/lua-$pkgver.tar.gz lua-5.1-make.patch @@ -73,15 +74,29 @@ package() { install -D -m 644 etc/lua.pc "$pkgdir"/usr/lib/pkgconfig/lua$_luaver.pc install -D -m 644 doc/lua.1 "$pkgdir"/usr/share/man/man1/lua$_luaver.1 install -D -m 644 doc/luac.1 "$pkgdir"/usr/share/man/man1/luac$_luaver.1 + + # Create symlinks without version suffix. + ln -s lua$_luaver "$pkgdir"/usr/bin/lua + ln -s luac$_luaver "$pkgdir"/usr/bin/luac + ln -s lua$_luaver.pc "$pkgdir"/usr/lib/pkgconfig/lua.pc + ln -s lua$_luaver.1 "$pkgdir"/usr/share/man/man1/lua.1 + ln -s luac$_luaver.1 "$pkgdir"/usr/share/man/man1/luac.1 } dev() { default_dev + provides="lua-dev" replaces="lua-dev" } +doc() { + default_doc + provides="lua-doc" +} + libs() { pkgdesc="Lua dynamic library runtime" + provides="lua-libs" replaces="lua lua-libs" mkdir -p "$subpkgdir"/usr |