summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-03-05 08:55:44 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-03-05 09:22:48 +0000
commit7cdd90297a0beade05a6e7ab75b21c5cc0bf41c9 (patch)
treeadaad0f9109ee43650cf6c107e4d01d55556f62e /main
parent60b6a7e787d84b1d12aa5fc4678ed70036b3ebc0 (diff)
downloadaports-7cdd90297a0beade05a6e7ab75b21c5cc0bf41c9.tar.bz2
aports-7cdd90297a0beade05a6e7ab75b21c5cc0bf41c9.tar.xz
main/abuild: upgrade to 2.7.3
Diffstat (limited to 'main')
-rw-r--r--main/abuild/0001-Delete-downloaded-source-if-fails-md5sum.patch28
-rw-r--r--main/abuild/0001-abuild-only-warn-when-we-think-there-should-have-bee.patch43
-rw-r--r--main/abuild/APKBUILD12
-rw-r--r--main/abuild/enhanced-subpkgdesc.patch31
4 files changed, 3 insertions, 111 deletions
diff --git a/main/abuild/0001-Delete-downloaded-source-if-fails-md5sum.patch b/main/abuild/0001-Delete-downloaded-source-if-fails-md5sum.patch
deleted file mode 100644
index 2bace192e..000000000
--- a/main/abuild/0001-Delete-downloaded-source-if-fails-md5sum.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3ce5ea77d1ec3760e4961b63def94e6f5bb73d24 Mon Sep 17 00:00:00 2001
-From: Ted Trask <ttrask01@yahoo.com>
-Date: Fri, 11 Feb 2011 15:09:44 +0000
-Subject: [PATCH 1/2] Delete downloaded source if fails md5sum
-
----
- abuild.in | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/abuild.in b/abuild.in
-index 551d759..22f50fd 100755
---- a/abuild.in
-+++ b/abuild.in
-@@ -167,7 +167,10 @@ md5check() {
- fi
- fetch || return 1
- msg "Checking md5sums..."
-- cd "$srcdir" && echo "$md5sums" | md5sum -c
-+ cd "$srcdir"
-+ if ! echo "$md5sums" | md5sum -c; then
-+ cleancache && return 1
-+ fi
- }
-
- # verify upstream sources
---
-1.6.6.1
-
diff --git a/main/abuild/0001-abuild-only-warn-when-we-think-there-should-have-bee.patch b/main/abuild/0001-abuild-only-warn-when-we-think-there-should-have-bee.patch
deleted file mode 100644
index a2ca264b2..000000000
--- a/main/abuild/0001-abuild-only-warn-when-we-think-there-should-have-bee.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 479cca4a44124b36f41872940adfb183597f40e7 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 6 Jan 2011 20:21:33 +0000
-Subject: [PATCH] abuild: only warn when we think there should have been noarch
-
-and we dont want -dev packages to be noarch
----
- abuild.in | 12 ++++++++----
- 1 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/abuild.in b/abuild.in
-index 904b1c3..0b602ca 100755
---- a/abuild.in
-+++ b/abuild.in
-@@ -566,6 +566,11 @@ dir_has_arch_binaries() {
- return 1
- }
-
-+# returns true if this is the -dev package
-+is_dev_pkg() {
-+ test "${subpkgname%-dev}" != "$subpkgname"
-+}
-+
- # check that noarch is set if needed
- archcheck() {
- options_has "!archcheck" && return 0
-@@ -573,10 +578,9 @@ archcheck() {
- [ "$arch" != "noarch" ] && return 0
- error "Arch specific binaries found so arch must not be set to \"noarch\""
- return 1
-- else
-- [ "$arch" = "noarch" ] && return 0
-- error "No arch specific binaries found so arch should be set to \"noarch\""
-- return 1
-+ elif [ "$arch" != "noarch" ] && ! is_dev_pkg; then
-+ # we dont want -dev package go to noarch
-+ warning "No arch specific binaries found so arch should probably be set to \"noarch\""
- fi
- return 0
- }
---
-1.7.3.4
-
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 598bd92a2..e6efcd2ec 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,13 +1,10 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgdesc="Script to build Alpine Packages"
pkgname=abuild
-pkgver=2.7.2
-pkgrel=2
+pkgver=2.7.3
+pkgrel=0
url=http://git.alpinelinux.org/cgit/abuild/
source="http://git.alpinelinux.org/cgit/abuild.git/snapshot/abuild-$pkgver.tar.bz2
- 0001-abuild-only-warn-when-we-think-there-should-have-bee.patch
- enhanced-subpkgdesc.patch
- 0001-Delete-downloaded-source-if-fails-md5sum.patch
"
depends="fakeroot file sudo pax-utils openssl apk-tools>=2.0.7-r1"
makedepends="openssl-dev pkgconfig"
@@ -40,7 +37,4 @@ package() {
install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles
}
-md5sums="6b621f93e51faf19dc1edffbfaba67d1 abuild-2.7.2.tar.bz2
-865f1e53e76cb77abb356cd6bb5b9588 0001-abuild-only-warn-when-we-think-there-should-have-bee.patch
-7fbc7dd27edae8cc5b2bc0a499aac8b6 enhanced-subpkgdesc.patch
-29b02ad1d49939e4fe7ad6b022188992 0001-Delete-downloaded-source-if-fails-md5sum.patch"
+md5sums="b1e1f1deb38311dbbe94eefaaa731872 abuild-2.7.3.tar.bz2"
diff --git a/main/abuild/enhanced-subpkgdesc.patch b/main/abuild/enhanced-subpkgdesc.patch
deleted file mode 100644
index 3bcc76725..000000000
--- a/main/abuild/enhanced-subpkgdesc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0187915cc2caed5bfe5fbd1f41da003d9d691fa0 Mon Sep 17 00:00:00 2001
-From: William Pitcock <nenolod@dereferenced.org>
-Date: Fri, 28 Jan 2011 00:46:43 +0000
-Subject: default_doc/default_dev: enhanced pkgdesc
-
----
-diff --git a/abuild.in b/abuild.in
-index 904b1c3..551d759 100755
---- a/abuild.in
-+++ b/abuild.in
-@@ -757,7 +757,9 @@ default_doc() {
- depends="$depends_doc"
- install="$install_doc"
- triggers="$triggers_doc"
-+ pkgdesc="$pkgdesc (documentation)"
- arch=${arch_doc:-"noarch"}
-+
- local i
- for i in doc man info html sgml licenses gtk-doc; do
- if [ -d "$pkgdir/usr/share/$i" ]; then
-@@ -806,6 +808,8 @@ default_dev() {
- depends="$pkgname $depends_dev"
- install="$install_dev"
- triggers="$triggers_dev"
-+ pkgdesc="$pkgdesc (development files)"
-+
- for i in $origsubpackages; do
- [ "${i%:*}" = "$subpkgname" ] || depends="$depends ${i%:*}"
- done
---
-cgit v0.8.3.3