From eafdcf37bde62cdee3ebd7b0bcf0b6e36d5042ef Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:51:40 -0600
Subject: jfsutils: update binary path to /usr/bin refs #961

---
 abs/core/jfsutils/PKGBUILD       | 23 ++++++++++++++++-------
 abs/core/jfsutils/inttypes.patch | 12 ++++++++++++
 2 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 abs/core/jfsutils/inttypes.patch

diff --git a/abs/core/jfsutils/PKGBUILD b/abs/core/jfsutils/PKGBUILD
index fee4867..dc7ed30 100644
--- a/abs/core/jfsutils/PKGBUILD
+++ b/abs/core/jfsutils/PKGBUILD
@@ -1,21 +1,30 @@
-# $Id: PKGBUILD 142848 2011-11-17 00:38:27Z bisson $
+# $Id: PKGBUILD 186264 2013-05-23 06:41:02Z bisson $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=jfsutils
 pkgver=1.1.15
-pkgrel=3
+pkgrel=4
 pkgdesc='JFS filesystem utilities'
-arch=('i686' 'x86_64')
 url='http://jfs.sourceforge.net'
+arch=('i686' 'x86_64')
 license=('GPL')
+depends=('util-linux')
+source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz"
+        'inttypes.patch')
+sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50'
+          '88551e7d8418bab0df4643dce248110d4c9b0a53')
+
 groups=('base')
-depends=('util-linux-ng')
-source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../inttypes.patch
+}
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --sbindir=/sbin 
+	./configure --prefix=/usr --sbindir=/usr/bin 
 	make
 }
 
diff --git a/abs/core/jfsutils/inttypes.patch b/abs/core/jfsutils/inttypes.patch
new file mode 100644
index 0000000..2018bb8
--- /dev/null
+++ b/abs/core/jfsutils/inttypes.patch
@@ -0,0 +1,12 @@
+diff -Naur old/libfs/devices.h new/libfs/devices.h
+--- old/libfs/devices.h	2005-11-23 07:43:55.000000000 +1100
++++ new/libfs/devices.h	2013-01-06 11:30:25.381538024 +1100
+@@ -40,6 +40,8 @@
+ #define ERROR_INVALID_PARAMETER	87
+ #define ERROR_DISK_FULL		112
+ 
++#include <inttypes.h>
++
+ struct stat;
+ 
+ int ujfs_get_dev_size(FILE *, int64_t * size);
-- 
cgit v0.12