summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Mason <ms13sp@gmail.com>2009-06-08 14:58:09 +0000
committerMichael Mason <ms13sp@gmail.com>2009-06-08 14:58:09 +0000
commitaf73d3395ad713e014efb49fc60b0c9d99a11e1f (patch)
tree026ea7dfdd4198312b9b44e3981022fed83855fd
parente2b5ba4617a752900656a2d239c4f0bcc6a073d4 (diff)
parent31109f210df44c1822c8f9d576d0e08d6fa90232 (diff)
downloadaports-af73d3395ad713e014efb49fc60b0c9d99a11e1f.tar.bz2
aports-af73d3395ad713e014efb49fc60b0c9d99a11e1f.tar.xz
Merge branch 'master' of git://git.alpinelinux.org/aports
-rw-r--r--core/apk-tools/APKBUILD4
-rw-r--r--core/zlib/APKBUILD5
2 files changed, 5 insertions, 4 deletions
diff --git a/core/apk-tools/APKBUILD b/core/apk-tools/APKBUILD
index d1c5c0c6..f4ece5d3 100644
--- a/core/apk-tools/APKBUILD
+++ b/core/apk-tools/APKBUILD
@@ -3,7 +3,7 @@ pkgname=apk-tools
pkgver=2.0_pre12
pkgrel=1
pkgdesc="Alpine Package Keeper - package manager for alpine"
-depends="uclibc"
+depends=
makedepends="zlib-dev"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
fd-leak.patch"
@@ -14,7 +14,7 @@ build() {
cd "$srcdir/$pkgname-$pkgver"
patch -p1 < ../fd-leak.patch || return 1
sed -i -e 's:-Werror::' Make.rules
- make
+ make || return 1
make DESTDIR="$pkgdir" install
cd "$pkgdir/sbin"
ln -s apk apk_add
diff --git a/core/zlib/APKBUILD b/core/zlib/APKBUILD
index 72738d40..5a171860 100644
--- a/core/zlib/APKBUILD
+++ b/core/zlib/APKBUILD
@@ -1,10 +1,11 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=zlib
pkgver=1.2.3.3
-pkgrel=3
+pkgrel=4
pkgdesc="A compression/decompression Library"
license=custom:zlib
url="http://www.gzip.org/zlib"
-depends='uclibc'
+depends=
source="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"
subpackages="$pkgname-dev $pkgname-doc"