aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2011-01-27 18:51:29 -0600
committerWilliam Pitcock <nenolod@dereferenced.org>2011-01-27 18:51:29 -0600
commit16d00f80d0d2c199a3554d04ba07f5292a3f1585 (patch)
tree4613c104a1d6d08300cac63345d724e6c64b8cfa /main
parentc574610d3f0080448d834cad0516bfb919557f7b (diff)
downloadaports-16d00f80d0d2c199a3554d04ba07f5292a3f1585.tar.gz
aports-16d00f80d0d2c199a3554d04ba07f5292a3f1585.tar.bz2
aports-16d00f80d0d2c199a3554d04ba07f5292a3f1585.tar.xz
main/abuild: add enhanced subpackage description patch from head
Diffstat (limited to 'main')
-rw-r--r--main/abuild/APKBUILD6
-rw-r--r--main/abuild/enhanced-subpkgdesc.patch31
2 files changed, 35 insertions, 2 deletions
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index c6db1eeee3..74e770e859 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,10 +2,11 @@
pkgdesc="Script to build Alpine Packages"
pkgname=abuild
pkgver=2.7.2
-pkgrel=0
+pkgrel=1
url=http://git.alpinelinux.org/cgit/abuild/
source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2
0001-abuild-only-warn-when-we-think-there-should-have-bee.patch
+ enhanced-subpkgdesc.patch
"
depends="fakeroot file sudo pax-utils openssl apk-tools>=2.0.7-r1"
makedepends="openssl-dev pkgconfig"
@@ -39,4 +40,5 @@ package() {
}
md5sums="6b621f93e51faf19dc1edffbfaba67d1 abuild-2.7.2.tar.bz2
-865f1e53e76cb77abb356cd6bb5b9588 0001-abuild-only-warn-when-we-think-there-should-have-bee.patch"
+865f1e53e76cb77abb356cd6bb5b9588 0001-abuild-only-warn-when-we-think-there-should-have-bee.patch
+7fbc7dd27edae8cc5b2bc0a499aac8b6 enhanced-subpkgdesc.patch"
diff --git a/main/abuild/enhanced-subpkgdesc.patch b/main/abuild/enhanced-subpkgdesc.patch
new file mode 100644
index 0000000000..3bcc767251
--- /dev/null
+++ b/main/abuild/enhanced-subpkgdesc.patch
@@ -0,0 +1,31 @@
+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