aboutsummaryrefslogtreecommitdiffstats
path: root/main/abuild
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-06-30 15:05:34 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-06-30 15:05:34 +0000
commit4304b5c6e9e63fa82aec3c87425b5f00664d1472 (patch)
tree7ef78335f27e5de4cbf930e8eb715885fe61052d /main/abuild
parent90eebd4f441149269ee25703aea551fff6a0b6a0 (diff)
downloadaports-4304b5c6e9e63fa82aec3c87425b5f00664d1472.tar.bz2
aports-4304b5c6e9e63fa82aec3c87425b5f00664d1472.tar.xz
main/abuild: fix error message for conflicts
Diffstat (limited to 'main/abuild')
-rw-r--r--main/abuild/APKBUILD18
-rw-r--r--main/abuild/abuild-conflict-message.patch30
2 files changed, 46 insertions, 2 deletions
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 989c7bebea..4ad26188c4 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,14 +2,27 @@
pkgdesc="Script to build Alpine Packages"
pkgname=abuild
pkgver=2.3
-pkgrel=0
+pkgrel=1
url=http://git.alpinelinux.org/cgit/abuild/
source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2
+ abuild-conflict-message.patch
"
depends="fakeroot file sudo pax-utils openssl apk-tools"
makedepends="openssl-dev pkgconfig"
license=GPL-2
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ for i in $source; do
+ case $i in
+ *.patch)
+ msg "Applying $i"
+ patch -p1 -i "$srcdir"/$i || return 1
+ ;;
+ esac
+ done
+}
+
build() {
cd "$srcdir/$pkgname-$pkgver"
make
@@ -21,4 +34,5 @@ package() {
install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
}
-md5sums="7c738e0018202160366b8329ec693502 abuild-2.3.tar.bz2"
+md5sums="7c738e0018202160366b8329ec693502 abuild-2.3.tar.bz2
+45ee7aa6e00732a8c36d7740fb8d2aeb abuild-conflict-message.patch"
diff --git a/main/abuild/abuild-conflict-message.patch b/main/abuild/abuild-conflict-message.patch
new file mode 100644
index 0000000000..b560634adb
--- /dev/null
+++ b/main/abuild/abuild-conflict-message.patch
@@ -0,0 +1,30 @@
+commit c30c346362223658980275d54d5b7911a3a7486c
+Author: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed Jun 30 14:59:07 2010 +0000
+
+ abuild: detect and report conflicting dependencies properly
+
+diff --git a/abuild.in b/abuild.in
+index 0c94653..4034a86 100755
+--- a/abuild.in
++++ b/abuild.in
+@@ -841,15 +841,16 @@ builddeps() {
+ # find which deps are missing
+ for i in $deps; do
+ if [ "${i#\!}" != "$i" ]; then
+- list_has ${i#\!} $installed_deps \
++ $APK info -q -e "${i#\!}" \
+ && conflicts="$conflicts ${i#\!}"
+ elif ! deplist_has $i $installed_deps || [ -n "$upgrade" ]; then
+ missing="$missing $i"
+ fi
+ done
+-
++
+ if [ -n "$conflicts" ]; then
+- die "Conflicting package(s) installed:$conflics"
++ error "Conflicting package(s) installed:$conflicts"
++ return 1
+ fi
+
+ if [ -z "$install_deps" ] && [ -z "$recursive" ]; then