~alpine/aports

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
1

[alpine-aports] [PATCH] main/haserl: version bump to 0.9.35

Nathan Angelacos <nangel@alpinelinux.org>
Details
Message ID
<1426169323-4652-1-git-send-email-nangel@alpinelinux.org>
Sender timestamp
1426169323
DKIM signature
missing
Download raw message
Patch: +6 -86
---
 main/haserl/APKBUILD    | 12 ++++----
 testing/haserl/APKBUILD | 80 -------------------------------------------------
 2 files changed, 6 insertions(+), 86 deletions(-)
 delete mode 100644 testing/haserl/APKBUILD

diff --git a/main/haserl/APKBUILD b/main/haserl/APKBUILD
index 6c8e8f0..8a4f8f9 100644
--- a/main/haserl/APKBUILD
+++ b/main/haserl/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
_luaversions="5.1 5.2"
_defaultlua="5.2"
_luaversions="5.3 5.2 5.1"
_defaultlua="5.3"
pkgname=haserl
pkgver=0.9.33
pkgver=0.9.35
pkgrel=1
pkgdesc="Html And Shell Embedded Report Language"
url="http://haserl.sourceforge.net/"
@@ -75,6 +75,6 @@ for _i in $_luaversions; do
	eval "split_${_i/./_}() { _split $_i; }"
done

md5sums="a9decddb508944d56f71dd2f821e2ec5  haserl-0.9.33.tar.gz"
sha256sums="9a65b14dc721643fc5b85c79117cb6d824bd3683b246744137bb5d978df7621b  haserl-0.9.33.tar.gz"
sha512sums="8a285f43daee95a9dc8bbda1166323ab65ccad16ec13e61efaea0fbf88b1920d1af3e7efe7aade0025c8fd1368dcb5262b63f4848ab2fb7b0976ba8751d03886  haserl-0.9.33.tar.gz"
md5sums="918f0b4f6cec0b438c8b5c78f2989010  haserl-0.9.35.tar.gz"
sha256sums="a1b633e80f3e2638e7f8f850786e95072cfd9877f88780092996fd6aaf7ae2da  haserl-0.9.35.tar.gz"
sha512sums="f0f2fc46540223b4b5369fe13b3020bed5e0578b7ca1ed1688f01678ba5302c876540c0d58dde427f9180915fa38cfffd01f1a4cbbc0fce851789056b3665ab0  haserl-0.9.35.tar.gz"
diff --git a/testing/haserl/APKBUILD b/testing/haserl/APKBUILD
deleted file mode 100644
index 5f53255..0000000
--- a/testing/haserl/APKBUILD
@@ -1,80 +0,0 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
_luaversions="5.3 5.2"
_defaultlua="5.3"
pkgname=haserl
pkgver=0.9.34
pkgrel=1
pkgdesc="Html And Shell Embedded Report Language"
url="http://haserl.sourceforge.net/"
arch="all"
license="GPL2"
depends=""
makedepends="automake autoconf"
subpackages="$pkgname-doc"
for _i in $_luaversions; do
	depends="$depends haserl-lua$_i"
	makedepends="$makedepends lua$_i-dev"
	subpackages="$subpackages haserl-lua$_i:split_${_i/./_}"
done
options="suid"
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"

_sdir="$srcdir"/$pkgname-$pkgver
prepare() {
	cd "$_sdir"
	for i in $source; do
		case $i in
		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
		esac
	done
	sed -i -e 's/^        /\t/' src/Makefile.am || return 1
	rm -f src/haserl_lualib.inc

	aclocal && autoconf && autoheader && automake --add-missing || return 1

	for _i in $_luaversions; do
		cp -r "$_sdir" "$srcdir"/build-$_i
	done
}

build() {
	for _i in $_luaversions; do
		cd "$srcdir"/build-$_i
		./configure \
			--build=$CBUILD \
			--host=$CHOST \
			--prefix=/usr \
			--with-lua=lua$_i \
			|| return 1
		make || return 1
	done
}

package() {
	for _i in $_luaversions; do
		cd "$srcdir"/build-$_i
		make DESTDIR="$pkgdir/" install || return 1
		chmod 4111 "$pkgdir"/usr/bin/haserl
		mv "$pkgdir"/usr/bin/haserl "$pkgdir"/usr/bin/haserl-lua$_i
	done
	ln -s haserl-lua$_defaultlua "$pkgdir"/usr/bin/haserl
}

_split() {
	local d= _ver=$1
	pkgdesc="Html And Shell Embedded Report Language with Lua $_ver support"
	replaces="$pkgname"
	depends=
	if [ -f "$pkgdir"/usr/bin/haserl-lua$_ver ]; then
		mkdir -p "$subpkgdir"/usr/bin
		mv "$pkgdir"/usr/bin/haserl-lua$_ver "$subpkgdir"/usr/bin/ || return 1
	fi
}

for _i in $_luaversions; do
	eval "split_${_i/./_}() { _split $_i; }"
done

md5sums="cae2240f25040c7a0a270c35cf7abda4  haserl-0.9.34.tar.gz"
sha256sums="2b6d2051465a9108d9dfe3e20dccc440f55b39f579fca1d69fc99240b8dba543  haserl-0.9.34.tar.gz"
sha512sums="22876271255926d7832db4786859e4e30fccc6f9aab5c272adc05186b298e53fd2e3cee855ff03d8129fa66995e06f183133b9208d0d8525a72782fcf63e71cf  haserl-0.9.34.tar.gz"
-- 
2.3.2



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Natanael Copa <ncopa@alpinelinux.org>
Details
Message ID
<20150312170647.2e5637eb@ncopa-desktop.alpinelinux.org>
In-Reply-To
<1426169323-4652-1-git-send-email-nangel@alpinelinux.org> (view parent)
Sender timestamp
1426176407
DKIM signature
missing
Download raw message
On Thu, 12 Mar 2015 14:08:43 +0000
Nathan Angelacos <nangel@alpinelinux.org> wrote:

> ---
>  main/haserl/APKBUILD    | 12 ++++----
>  testing/haserl/APKBUILD | 80 -------------------------------------------------
>  2 files changed, 6 insertions(+), 86 deletions(-)
>  delete mode 100644 testing/haserl/APKBUILD
> 
> diff --git a/main/haserl/APKBUILD b/main/haserl/APKBUILD
> index 6c8e8f0..8a4f8f9 100644
> --- a/main/haserl/APKBUILD
> +++ b/main/haserl/APKBUILD
> @@ -1,8 +1,8 @@
>  # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
> -_luaversions="5.1 5.2"
> -_defaultlua="5.2"
> +_luaversions="5.3 5.2 5.1"
> +_defaultlua="5.3"

I applied your first patch, sorry.

I have now pushed a fixup that re-added lua 5.1 support.

Please let me know if it needs more fixing.

Thanks!

-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Reply to thread Export thread (mbox)