summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-10-03 11:22:10 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-10-03 11:22:17 +0000
commit773d4e0fb5f90dae87e37e46d6c7a8d7c471b46f (patch)
tree29a3c1bf5c7a27510e8923a29af8f286921507fb /main
parent5ac3fc43abee1cd6970a774801faf081426d3163 (diff)
downloadaports-773d4e0fb5f90dae87e37e46d6c7a8d7c471b46f.tar.bz2
aports-773d4e0fb5f90dae87e37e46d6c7a8d7c471b46f.tar.xz
main/abuild: upgrade to 2.11.0
Diffstat (limited to 'main')
-rw-r--r--main/abuild/0001-abuild-make-it-possible-to-override-lang_subpkg.patch48
-rw-r--r--main/abuild/APKBUILD10
2 files changed, 4 insertions, 54 deletions
diff --git a/main/abuild/0001-abuild-make-it-possible-to-override-lang_subpkg.patch b/main/abuild/0001-abuild-make-it-possible-to-override-lang_subpkg.patch
deleted file mode 100644
index 0be210ef4..000000000
--- a/main/abuild/0001-abuild-make-it-possible-to-override-lang_subpkg.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 43f888ad5e92b2242f512992c71902100956a87a Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 2 Sep 2011 09:35:55 +0000
-Subject: [PATCH] abuild: make it possible to override lang_subpkg
-
-We alos introduce $langdir where you can set other dir to look for
-localization dirs.
----
- abuild.in | 16 ++++++++++++----
- 1 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/abuild.in b/abuild.in
-index 4fd739f..e5a24eb 100755
---- a/abuild.in
-+++ b/abuild.in
-@@ -478,17 +478,25 @@ prepare_subpackages() {
- fi
- }
-
--lang_subpkg() {
-+default_lang_subpkg() {
- if [ -z "$lang" ]; then
- error "lang is not set"
- return 1
- fi
-+ pkgdesc="$pkgname language pack for $lang"
- arch="noarch"
- install_if="$pkgname=$pkgver-r$pkgrel lang-$lang"
-- mkdir -p "$subpkgdir"/usr/share/locale
-- mv "$pkgdir"/usr/share/locale/$lang* \
-- "$subpkgdir"/usr/share/locale/ \
-+ local dir
-+ for dir in ${langdir:-/usr/share/locale}; do
-+ mkdir -p "$subpkgdir"/$dir
-+ mv "$pkgdir"/$dir/$lang* \
-+ "$subpkgdir"/$dir/ \
- || return 1
-+ done
-+}
-+
-+lang_subpkg() {
-+ default_lang_subpkg
- }
-
- prepare_language_packs() {
---
-1.7.6.1
-
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index a2d2835ba..c7e17e62f 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,11 +1,10 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgdesc="Script to build Alpine Packages"
pkgname=abuild
-pkgver=2.10.0
-pkgrel=1
+pkgver=2.11.0
+pkgrel=0
url=http://git.alpinelinux.org/cgit/abuild/
-source="http://git.alpinelinux.org/cgit/abuild.git/snapshot/abuild-$pkgver.tar.bz2
- 0001-abuild-make-it-possible-to-override-lang_subpkg.patch
+source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2
"
depends="fakeroot file sudo pax-utils openssl apk-tools>=2.0.7-r1 uclibc-utils abuildhelper"
makedepends="openssl-dev pkgconfig"
@@ -38,5 +37,4 @@ package() {
install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles
}
-md5sums="fd310ee9f47726ed1e1c64e795192962 abuild-2.10.0.tar.bz2
-68451f36bcede50fc391fa944a11ecc2 0001-abuild-make-it-possible-to-override-lang_subpkg.patch"
+md5sums="199cae5ee1f859203498b0c79ab4a62f abuild-2.11.0.tar.bz2"