From 126af148530f656a2ed192a852477b2ee97d5397 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Fri, 18 Nov 2011 23:15:18 +0000
Subject: Fri Nov 18 23:15:18 UTC 2011

---
 community/floyd/PKGBUILD        | 27 ++++++++++++++++-----------
 community/floyd/build-fix.patch | 30 ++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 11 deletions(-)
 create mode 100644 community/floyd/build-fix.patch

(limited to 'community/floyd')

diff --git a/community/floyd/PKGBUILD b/community/floyd/PKGBUILD
index d41e42daa..ae919142d 100644
--- a/community/floyd/PKGBUILD
+++ b/community/floyd/PKGBUILD
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 5264 2009-11-07 13:00:24Z ibiru $
+# $Id: PKGBUILD 58684 2011-11-17 15:37:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=floyd
 pkgver=2.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="displays system load with pulse of keyboard LED"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.asahi-net.or.jp/~pi9s-nnb/floyd/"
 license=("GPL")
-depends=(glibc)
-backup=(etc/fuse.conf)
-source=(http://www.asahi-net.or.jp/~pi9s-nnb/floyd/$pkgname-$pkgver.tar.gz)
-md5sums=('c1b80bc76ac4e25e821a193428fa42a4')
+depends=()
+source=(http://www.asahi-net.or.jp/~pi9s-nnb/floyd/$pkgname-$pkgver.tar.gz
+	build-fix.patch)
+md5sums=('c1b80bc76ac4e25e821a193428fa42a4'
+         '0cde2017ead790f9d556ef34c6a4008f')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  sed -i "s#/usr/local#/usr#" ./Makefile
-  make floyd || return 1
-  install -D -m 0755 ./floyd $startdir/pkg/usr/bin/floyd && \
-  install -D -m 0644 ./floyd.1 $startdir/pkg/usr/share/man/man1/floyd.1
+  patch -p1 <$srcdir/build-fix.patch
+  make pthread
+}
+
+package() {
+  cd $startdir/src/$pkgname-$pkgver
+  mkdir -p $pkgdir/usr/share/man/man1 $pkgdir/usr/bin
+  make install MANDIR=$pkgdir/usr/share/man/man1 BINDIR=$pkgdir/usr/bin
 }
diff --git a/community/floyd/build-fix.patch b/community/floyd/build-fix.patch
new file mode 100644
index 000000000..d78737b54
--- /dev/null
+++ b/community/floyd/build-fix.patch
@@ -0,0 +1,30 @@
+diff -wbBur floyd-2.0.1/floyd.c floyd-2.0.1.my/floyd.c
+--- floyd-2.0.1/floyd.c	2005-12-01 12:49:43.000000000 +0300
++++ floyd-2.0.1.my/floyd.c	2011-11-17 19:31:13.000000000 +0400
+@@ -167,11 +167,6 @@
+   }
+   if (gfprm.verbose || doargforked)	/* doargforked: set by -D */
+     fprintf(stderr, "%s: signal %d received [%d]\n", progname, sig, getpid());
+-#ifdef linux
+-  pthread_kill_other_threads_np();
+-#else
+-  Maybe you loose. Check out if you have pthread_kill_other_threads_np().
+-#endif
+   close(fdes);			/* but here ? */
+   exit(0);
+ }
+diff -wbBur floyd-2.0.1/voodoo.c floyd-2.0.1.my/voodoo.c
+--- floyd-2.0.1/voodoo.c	1999-07-29 18:01:10.000000000 +0400
++++ floyd-2.0.1.my/voodoo.c	2011-11-17 19:31:18.000000000 +0400
+@@ -101,11 +101,6 @@
+     perror("KDSETLED");
+   }
+   fprintf(stderr, "%s: signal %d received [%d]\n", progname, sig, getpid());
+-#ifdef linux
+-  pthread_kill_other_threads_np();
+-#else
+-  Maybe you loose. Check out if you have pthread_kill_other_threads_np().
+-#endif
+   exit(0);
+ }
+ 
-- 
cgit v1.2.3-54-g00ecf