diff options
author | Leonardo Arena <rnalrd@gmail.com> | 2010-03-04 14:53:23 +0000 |
---|---|---|
committer | Leonardo Arena <rnalrd@gmail.com> | 2010-03-04 14:53:23 +0000 |
commit | b21fa2e8a6dea9ed5efc4eadec03b8f9171b7a91 (patch) | |
tree | 0077a9d9d2b8eb24dc406993f9098d5fc9b9659b | |
parent | b708d6b8cb089a3dd1678a4ecbf5ed506ca20224 (diff) | |
parent | 5279f694f8836b795d9a238f6058fdd24cfa7d80 (diff) | |
download | aports-b21fa2e8a6dea9ed5efc4eadec03b8f9171b7a91.tar.bz2 aports-b21fa2e8a6dea9ed5efc4eadec03b8f9171b7a91.tar.xz |
Merge branch 'master' of git://dev.alpinelinux.org/aports
-rw-r--r-- | main/pound/APKBUILD (renamed from testing/pound/APKBUILD) | 0 | ||||
-rw-r--r-- | main/pound/pound.cfg (renamed from testing/pound/pound.cfg) | 0 | ||||
-rw-r--r-- | main/pound/pound.initd (renamed from testing/pound/pound.initd) | 0 | ||||
-rw-r--r-- | main/util-vserver/APKBUILD | 12 |
4 files changed, 9 insertions, 3 deletions
diff --git a/testing/pound/APKBUILD b/main/pound/APKBUILD index 058d7f374..058d7f374 100644 --- a/testing/pound/APKBUILD +++ b/main/pound/APKBUILD diff --git a/testing/pound/pound.cfg b/main/pound/pound.cfg index 664ea53c9..664ea53c9 100644 --- a/testing/pound/pound.cfg +++ b/main/pound/pound.cfg diff --git a/testing/pound/pound.initd b/main/pound/pound.initd index 135139404..135139404 100644 --- a/testing/pound/pound.initd +++ b/main/pound/pound.initd diff --git a/main/util-vserver/APKBUILD b/main/util-vserver/APKBUILD index 066fded1f..5d77bca77 100644 --- a/main/util-vserver/APKBUILD +++ b/main/util-vserver/APKBUILD @@ -2,7 +2,7 @@ pkgname=util-vserver pkgver=0.30.216_pre2882 _realver=0.30.216-pre2882 -pkgrel=6 +pkgrel=7 pkgdesc="Linux-VServer admin utilities" url="http://www.nongnu.org/util-vserver/" license="GPL" @@ -24,8 +24,7 @@ subpackages="$pkgname-doc $pkgname-dev" _builddir="$srcdir"/$pkgname-$_realver -build() { - local i +prepare() { cd "$_builddir" for i in ../*.patch; do [ -r "$i" ] || continue @@ -38,6 +37,13 @@ build() { # this is an ugly workaround sed -i -e "s:as_echo=.*:as_echo=echo:g" configure + # issue 305 + sed -i -e 's/^function //' gentoo/util-vserver +} + +build() { + local i + cd "$_builddir" ./configure --prefix=/usr \ --mandir=/usr/share/man \ --sysconfdir=/etc \ |