From d44ad86d1f6cb8ab59dd413ba19668c633ff7dfd Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 20 May 2011 09:12:44 +0000
Subject: main/attr: upgrade to 2.4.46

---
 main/attr/APKBUILD                | 39 ++++++++++++++++++++++++++------------
 main/attr/attr-2.4.32-build.patch | 40 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 12 deletions(-)
 create mode 100644 main/attr/attr-2.4.32-build.patch

(limited to 'main')

diff --git a/main/attr/APKBUILD b/main/attr/APKBUILD
index 8fd0665608..8eb09f417a 100644
--- a/main/attr/APKBUILD
+++ b/main/attr/APKBUILD
@@ -1,23 +1,28 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=attr
-pkgver=2.4.44
-_ver=2.4.44
-pkgrel=7
-pkgdesc="Extended attribute support library for ACL support"
-url="http://oss.sgi.com/projects/xfs/"
+pkgver=2.4.46
+pkgrel=0
+pkgdesc="Utilities for managing filesystem extended attributes"
+url="http://acl.bestbits.at/"
 arch="all"
 license="LGPL"
 depends=
 makedepends="libtool autoconf automake bash gzip"
-subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://ftp.archlinux.org/other/attr/attr-${pkgver}.src.tar.gz"
+subpackages="$pkgname-dev $pkgname-doc libattr"
+source="http://download.savannah.gnu.org/releases-noredirect/attr/attr-$pkgver.src.tar.gz
+	attr-2.4.32-build.patch
+	"
 
 prepare() {
 	cd "$srcdir"/attr-$pkgver
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+
 	sed -i -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
 		include/builddefs.in
-
-	autoconf || return 1
 }
 
 build() {
@@ -44,8 +49,18 @@ build() {
 
 package() {
 	cd "$srcdir"/attr-$pkgver
-	make DIST_ROOT="$pkgdir" install install-lib install-dev
+	make -j1 LIBTOOL=$PWD/libtool DESTDIR="$pkgdir" \
+		install install-lib install-dev
 	# provided by man-pages
-	rm -fr "$pkgdir"/usr/share/man/man2
+	rm -fr "$pkgdir"/usr/share/man/man2 \
+		"$pkgdir"/lib/*.a "$pkgdir"/lib/*.la
 }
-md5sums="adeefe65c5ad1febe46da185c5bfd5d4  attr-2.4.44.src.tar.gz"
+
+libattr() {
+	pkgdesc="Dynamic library for extended attribute support"
+	mkdir -p "$subpkgdir"/lib
+	mv "$pkgdir"/lib/lib*.so.* "$subpkgdir"/lib/
+}
+
+md5sums="db557c17fdfa4f785333ecda08654010  attr-2.4.46.src.tar.gz
+6d6bd02aca84ec61516d6700a87bbff7  attr-2.4.32-build.patch"
diff --git a/main/attr/attr-2.4.32-build.patch b/main/attr/attr-2.4.32-build.patch
new file mode 100644
index 0000000000..a7c3af20b7
--- /dev/null
+++ b/main/attr/attr-2.4.32-build.patch
@@ -0,0 +1,40 @@
+diff --git a/include/builddefs.in b/include/builddefs.in
+index 6df0f5a..575a6df 100644
+--- a/include/builddefs.in
++++ b/include/builddefs.in
+@@ -40,14 +40,14 @@ PKG_RELEASE	= @pkg_release@
+ PKG_VERSION	= @pkg_version@
+ PKG_PLATFORM	= @pkg_platform@
+ PKG_DISTRIBUTION= @pkg_distribution@
+-PKG_BIN_DIR	= @bindir@
+-PKG_SBIN_DIR	= @sbindir@
+-PKG_LIB_DIR	= @libdir@@libdirsuffix@
+-PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
+-PKG_INC_DIR	= @includedir@/attr
+-PKG_MAN_DIR	= @mandir@
+-PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
+-PKG_LOCALE_DIR	= @datadir@/locale
++PKG_BIN_DIR	= $(DESTDIR)@bindir@
++PKG_SBIN_DIR	= $(DESTDIR)@sbindir@
++PKG_LIB_DIR	= $(DESTDIR)@libdir@@libdirsuffix@
++PKG_DEVLIB_DIR	= $(DESTDIR)@libexecdir@@libdirsuffix@
++PKG_INC_DIR	= $(DESTDIR)@includedir@/attr
++PKG_MAN_DIR	= $(DESTDIR)@mandir@
++PKG_DOC_DIR	= $(DESTDIR)@datadir@/doc/@pkg_name@-@pkg_version@
++PKG_LOCALE_DIR	= $(DESTDIR)@datadir@/locale
+ 
+ CC		= @cc@
+ AWK		= @awk@
+diff --git a/include/buildmacros b/include/buildmacros
+index ab89182..3118a17 100644
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
+ 	  $(LFILES:.l=.o) \
+ 	  $(YFILES:%.y=%.tab.o)
+ 
+-INSTALL	= $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
++INSTALL	= $(TOPDIR)/include/install-sh
+ 
+ SHELL = /bin/sh
+ IMAGES_DIR = $(TOPDIR)/all-images
-- 
cgit v1.2.3