diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-25 08:04:27 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-25 08:05:20 +0000 |
commit | 813dd96e24bc89891bb82454af34c910f5a26827 (patch) | |
tree | 8607b3c3d1b2677d65cbd079aa110b8033bfe6a1 | |
parent | 9f0f0d9a0679bffa14141a444612c48f20c7bb64 (diff) | |
download | alpine_aports-813dd96e24bc89891bb82454af34c910f5a26827.tar.bz2 alpine_aports-813dd96e24bc89891bb82454af34c910f5a26827.tar.xz alpine_aports-813dd96e24bc89891bb82454af34c910f5a26827.zip |
main/lua-expat: add support for Lua 5.2 and claim maintainership
-rw-r--r-- | main/lua-expat/APKBUILD | 70 | ||||
-rw-r--r-- | main/lua-expat/newconfig | 26 |
2 files changed, 49 insertions, 47 deletions
diff --git a/main/lua-expat/APKBUILD b/main/lua-expat/APKBUILD index e62eb085c3..3d62111a66 100644 --- a/main/lua-expat/APKBUILD +++ b/main/lua-expat/APKBUILD | |||
@@ -1,34 +1,62 @@ | |||
1 | # Contributor: Mika Havela <mika.havela@gmail.com> | 1 | # Contributor: Mika Havela <mika.havela@gmail.com> |
2 | # Maintainer: Mika Havela <mika.havela@gmail.com> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | _luaversions="5.1 5.2" | ||
3 | pkgname=lua-expat | 4 | pkgname=lua-expat |
4 | _name=luaexpat | 5 | _name=expat |
5 | pkgver=1.3.0 | 6 | pkgver=1.3.0 |
6 | pkgrel=0 | 7 | pkgrel=1 |
7 | pkgdesc="LuaExpat is a SAX XML parser based on the Expat library. LuaExpat is free software and uses the same license as Lua 5.0." | 8 | pkgdesc="SAX XML parser based on the Expat library" |
8 | url="http://luaforge.net/projects/luaexpat/" | 9 | url="https://matthewwild.co.uk/projects/luaexpat/" |
9 | arch="all" | 10 | arch="all" |
10 | license="MIT" | 11 | license="MIT" |
11 | depends="lua" | 12 | depends="" |
12 | makedepends="lua-dev expat-dev" | 13 | makedepends="expat-dev" |
13 | install= | 14 | install= |
14 | source="http://matthewwild.co.uk/projects/$_name/$_name-$pkgver.tar.gz | 15 | subpackages= |
15 | newconfig" | ||
16 | replaces="luaexpat" | ||
17 | 16 | ||
17 | for _i in $_luaversions; do | ||
18 | makedepends="$makedepends lua${_i}-dev" | ||
19 | subpackages="$subpackages lua${_i}-$_name:_split${_i/./}" | ||
20 | depends="$depends lua${_i}-$_name" | ||
21 | done | ||
22 | |||
23 | source="http://matthewwild.co.uk/projects/luaexpat/luaexpat-$pkgver.tar.gz" | ||
24 | |||
25 | _builddir="$srcdir"/luaexpat-1.3.0 | ||
18 | build() { | 26 | build() { |
19 | cd "$srcdir/$_name-$pkgver" | 27 | cd "$srcdir" |
20 | mv ../newconfig ./config | 28 | for _i in $_luaversions; do |
21 | make LUA_V=5.1 || return 1 | 29 | cp -r "$_builddir" "$srcdir"/build-$_i || return 1 |
30 | cd "$srcdir"/build-$_i | ||
31 | make LUA_V=$_i || return 1 | ||
32 | done | ||
22 | } | 33 | } |
23 | 34 | ||
24 | package() { | 35 | package() { |
25 | cd "$srcdir/$_name-$pkgver" | 36 | cd "$srcdir" |
26 | make LUA_V=5.1 DESTDIR="$pkgdir" install | 37 | for _i in $_luaversions; do |
38 | (cd "$srcdir"/build-$_i && make install LUA_V=$_i \ | ||
39 | DESTDIR="$pkgdir") \ | ||
40 | || return 1 | ||
41 | done | ||
27 | } | 42 | } |
28 | 43 | ||
29 | md5sums="3c20b5795e7107f847f8da844fbfe2da luaexpat-1.3.0.tar.gz | 44 | _split() { |
30 | eb947b7aa99b487289b02c1ab1b8ccd3 newconfig" | 45 | local d= _ver=$1 |
31 | sha256sums="d060397960d87b2c89cf490f330508b7def1a0677bdc120531c571609fc57dc3 luaexpat-1.3.0.tar.gz | 46 | pkgdesc="$pkgdesc for Lua $_ver" |
32 | 3744a9bd14aa64a9751642a263d94155a43834e4d0be694cdb6e522b1a37ea4e newconfig" | 47 | depends= |
33 | sha512sums="91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae luaexpat-1.3.0.tar.gz | 48 | for d in usr/lib/lua usr/share/lua; do |
34 | 84bc640c1f18669fccf3cac2cd25106005504fd663bd2bd2afc72bcdc2a3fe4cdc13314bf5c849eca0ffe48d80d7c58c6739862b8e5978bc8326432b876b44b5 newconfig" | 49 | if [ -d "$pkgdir"/$d/$_ver ]; then |
50 | mkdir -p "$subpkgdir"/$d | ||
51 | mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/ || return 1 | ||
52 | fi | ||
53 | done | ||
54 | } | ||
55 | |||
56 | for _i in $_luaversions; do | ||
57 | eval "_split${_i/./}() { _split $_i; }" | ||
58 | done | ||
59 | |||
60 | md5sums="3c20b5795e7107f847f8da844fbfe2da luaexpat-1.3.0.tar.gz" | ||
61 | sha256sums="d060397960d87b2c89cf490f330508b7def1a0677bdc120531c571609fc57dc3 luaexpat-1.3.0.tar.gz" | ||
62 | sha512sums="91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae luaexpat-1.3.0.tar.gz" | ||
diff --git a/main/lua-expat/newconfig b/main/lua-expat/newconfig deleted file mode 100644 index 7d8d6331fc..0000000000 --- a/main/lua-expat/newconfig +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | LUA_LIBDIR= usr/lib/lua/5.1 | ||
2 | LUA_DIR= usr/share/lua/5.1 | ||
3 | LUA_INC= /usr/include | ||
4 | EXPAT_INC= /usr/include | ||
5 | |||
6 | # OS dependent | ||
7 | LIB_OPTION= -shared | ||
8 | |||
9 | LIBNAME= $T.so.$V | ||
10 | LUA_VERSION_NUM= 514 | ||
11 | COMPAT_DIR= ../compat/src | ||
12 | |||
13 | # Compilation parameters | ||
14 | CWARNS = -Wall -pedantic \ | ||
15 | -Waggregate-return \ | ||
16 | -Wcast-align \ | ||
17 | -Wmissing-prototypes \ | ||
18 | -Wstrict-prototypes \ | ||
19 | -Wnested-externs \ | ||
20 | -Wpointer-arith \ | ||
21 | -Wshadow \ | ||
22 | -Wwrite-strings | ||
23 | |||
24 | CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \ | ||
25 | -I$(COMPAT_DIR) -I$(EXPAT_INC) | ||
26 | CC = gcc | ||