aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-02-01 21:03:25 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-02-01 21:03:25 +0000
commit6ed7cd11af911e1f32eaba35d1e15d2d36a77bea (patch)
tree7e066de19e1a8cf8ce19a76f951d6a378b3eaf60
parent7aa5fcdf4ff094e0cc9ad4f94ccb82e4c31bce04 (diff)
downloadaports-6ed7cd11af911e1f32eaba35d1e15d2d36a77bea.tar.bz2
aports-6ed7cd11af911e1f32eaba35d1e15d2d36a77bea.tar.xz
main/xfsprogs: upgrade to 3.1.1
-rw-r--r--main/xfsprogs/APKBUILD11
-rw-r--r--main/xfsprogs/xfsprogs-3.0.0-gzip.patch24
2 files changed, 3 insertions, 32 deletions
diff --git a/main/xfsprogs/APKBUILD b/main/xfsprogs/APKBUILD
index 83d31e03fd..638c4b72f0 100644
--- a/main/xfsprogs/APKBUILD
+++ b/main/xfsprogs/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xfsprogs
-pkgver=3.1.0
+pkgver=3.1.1
pkgrel=0
pkgdesc="XFS filesystem utilities"
url="http://oss.sgi.com/projects/xfs/"
@@ -9,17 +9,13 @@ depends="e2fsprogs"
makedepends="e2fsprogs-dev bash"
subpackages="$pkgname-dev $pkgname-doc"
source="ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}-$pkgver.tar.gz
- xfsprogs-3.0.0-gzip.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_builddir"
- for i in ../*.patch; do
- msg "Applying $i..."
- patch -p1 < $i || return 1
- done
+ sed -i -e 's/--best//' Makefile doc/Makefile
}
build() {
@@ -40,5 +36,4 @@ package() {
cd "$_builddir"
make -j1 DIST_ROOT="$pkgdir" install install-dev
}
-md5sums="07c1ff6a4a44b58ee5ffdabca33a4493 xfsprogs-3.1.0.tar.gz
-c72865de30f55343e843dd4fd49a91c5 xfsprogs-3.0.0-gzip.patch"
+md5sums="c2308b46ee707597ac50aae418d321b8 xfsprogs-3.1.1.tar.gz"
diff --git a/main/xfsprogs/xfsprogs-3.0.0-gzip.patch b/main/xfsprogs/xfsprogs-3.0.0-gzip.patch
deleted file mode 100644
index 40f80023d4..0000000000
--- a/main/xfsprogs/xfsprogs-3.0.0-gzip.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru xfsprogs-3.0.0.orig/doc/Makefile xfsprogs-3.0.0/doc/Makefile
---- xfsprogs-3.0.0.orig/doc/Makefile 2009-02-18 13:42:47.000000000 +0000
-+++ xfsprogs-3.0.0/doc/Makefile 2009-02-18 13:43:10.000000000 +0000
-@@ -13,7 +13,7 @@
- include $(BUILDRULES)
-
- CHANGES.gz:
-- $(ZIP) --best -c < CHANGES > $@
-+ $(ZIP) -c < CHANGES > $@
-
- install: default
- $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
-diff -ru xfsprogs-3.0.0.orig/include/buildmacros xfsprogs-3.0.0/include/buildmacros
---- xfsprogs-3.0.0.orig/include/buildmacros 2009-02-18 13:42:47.000000000 +0000
-+++ xfsprogs-3.0.0/include/buildmacros 2009-02-18 13:43:46.000000000 +0000
-@@ -128,7 +128,7 @@
- MAN_MAKERULE = \
- @for f in *.[12345678] ""; do \
- if test ! -z "$$f"; then \
-- $(ZIP) --best -c < $$f > $$f.gz; \
-+ $(ZIP) -c < $$f > $$f.gz; \
- fi; \
- done
-