[arch-commits] Commit in bonnie++/trunk (PKGBUILD move_away_from_sbin.patch)

[Jelle van der Waa]

    Date: Monday, May 20, 2013 @ 12:20:22
  Author: jelle
Revision: 91155

upgpkg: bonnie++ 1.03e-7

Move files to /usr/bin if possible

Added:
  bonnie++/trunk/move_away_from_sbin.patch
Modified:
  bonnie++/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   11 +++++++----
 move_away_from_sbin.patch |   14 ++++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-20 09:57:23 UTC (rev 91154)
+++ PKGBUILD	2013-05-20 10:20:22 UTC (rev 91155)
@@ -4,19 +4,20 @@
 
 pkgname=bonnie++
 pkgver=1.03e
-pkgrel=6
+pkgrel=7
 pkgdesc="Based on the Bonnie hard drive benchmark by Tim Bray"
 arch=('i686' 'x86_64')
 url="http://www.coker.com.au/bonnie++/"
 license=('GPL')
 depends=('perl')
-source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz)
-sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb')
+source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz move_away_from_sbin.patch)
+sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb'
+            'c100df652c26f38c950baaf3fe25a74d51ba830066f9d02d273cbb5fc5660814')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver}
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr 
   sed -i "s:CFLAGS=-O2  -DNDEBUG \$(WFLAGS) \$(MORECFLAGS):CFLAGS=${CFLAGS}:" Makefile
   make
 }
@@ -24,6 +25,8 @@
 package() {
   cd $srcdir/${pkgname}-${pkgver}
 
+  # https://www.archlinux.org/todo/move-files-to-usrbin-if-possible/
+  patch -Np1 -i $srcdir/move_away_from_sbin.patch
   make prefix="${pkgdir}/usr" install
 
   install -d $pkgdir/usr/share/doc/bonnie++

Added: move_away_from_sbin.patch
===================================================================
--- move_away_from_sbin.patch	                        (rev 0)
+++ move_away_from_sbin.patch	2013-05-20 10:20:22 UTC (rev 91155)
@@ -0,0 +1,14 @@
+diff -aur bonnie++-1.03e/Makefile bonnie++-1.03ef/Makefile
+--- bonnie++-1.03e/Makefile	2013-05-13 08:40:45.122959831 +0000
++++ bonnie++-1.03ef/Makefile	2013-05-13 08:43:20.365248937 +0000
+@@ -33,8 +33,8 @@
+ 	$(CXX) zcav.cpp -o zcav $(ZCAVOBJS) $(LFLAGS)
+ 
+ install-bin: $(EXES)
+-	mkdir -p $(eprefix)/bin $(eprefix)/sbin
+-	${INSTALL} -s $(EXES) $(eprefix)/sbin
++	mkdir -p $(eprefix)/bin 
++	${INSTALL} -s $(EXES) $(eprefix)/bin
+ 	${INSTALL} $(SCRIPTS) $(eprefix)/bin
+ 
+ install: install-bin