[arch-commits] CVS update of extra/daemons/fam (PKGBUILD fam-2.7.0-dnotify.patch)

[Jan de Groot]

    Date: Wednesday, September 19, 2007 @ 17:19:54
  Author: jgc
    Path: /home/cvs-extra/extra/daemons/fam

Modified: PKGBUILD (1.22 -> 1.23) fam-2.7.0-dnotify.patch (1.1 -> 1.2)

upgpkg: fam 2.7.0-10
Make it compile with gcc 4.2, add license, fix dependencies


-------------------------+
 PKGBUILD                |   28 ++++++++++++++++++----------
 fam-2.7.0-dnotify.patch |    4 ++--
 2 files changed, 20 insertions(+), 12 deletions(-)


Index: extra/daemons/fam/PKGBUILD
diff -u extra/daemons/fam/PKGBUILD:1.22 extra/daemons/fam/PKGBUILD:1.23
--- extra/daemons/fam/PKGBUILD:1.22	Mon May 15 13:29:49 2006
+++ extra/daemons/fam/PKGBUILD	Wed Sep 19 17:19:54 2007
@@ -1,26 +1,34 @@
-# $Id: PKGBUILD,v 1.22 2006/05/15 17:29:49 uid1016 Exp $
+# $Id: PKGBUILD,v 1.23 2007/09/19 21:19:54 jgc Exp $
 # Maintainer: dorphell <dorphell at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 pkgname=fam
 pkgver=2.7.0
-pkgrel=9
+pkgrel=10
 pkgdesc="File Alteration Monitor - used by KDE, GNOME and others"
 arch=(i686 x86_64)
-depends=('portmap' 'gcc')
+license=('LGPL' 'GPL')
+depends=('portmap' 'gcc-libs')
 url="http://oss.sgi.com/projects/fam/"
 backup=(etc/fam/fam.conf)
-source=(ftp://oss.sgi.com/projects/fam/download/stable/$pkgname-$pkgver.tar.gz
+options=('!makeflags')
+source=(ftp://oss.sgi.com/projects/fam/download/stable/${pkgname}-${pkgver}.tar.gz
 	fam-2.7.0-dnotify.patch
 	fam-2.7.0-largefiles.patch
 	include_fam_h.patch
 	fam
 	fam-2.7.0-noc++.patch)
+md5sums=('1bf3ae6c0c58d3201afc97c6a4834e39'
+         '073d1763318344635ea316293390205c'
+         '47b41e0b0498793af004696a096d7da1'
+         '2638b8ffacb9f03b6e438e08ea7b290a'
+         '45b648907ba1c7edec17fb544f1f4a13'
+         '0274cd113d3dcb015653b5606c7714ac')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 -i $startdir/src/fam-2.7.0-dnotify.patch || return 1
-  patch -Np1 -i $startdir/src/fam-2.7.0-largefiles.patch || return 1
-  patch -Np0 -i $startdir/src/include_fam_h.patch || return 1
+  cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np1 -i ${startdir}/src/fam-2.7.0-dnotify.patch || return 1
+  patch -Np1 -i ${startdir}/src/fam-2.7.0-largefiles.patch || return 1
+  patch -Np0 -i ${startdir}/src/include_fam_h.patch || return 1
   patch -Np1 -i ${startdir}/src/fam-2.7.0-noc++.patch || return 1
 
   chmod 755 configure || return 1
@@ -33,7 +41,7 @@
 
   ./configure --prefix=/usr --sysconfdir=/etc/fam
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  install -D -m755 ../fam $startdir/pkg/etc/rc.d/fam
+  make DESTDIR=${startdir}/pkg install
+  install -D -m755 ../fam ${startdir}/pkg/etc/rc.d/fam
   # Don't libtoolslay fam, gamin shouldn't be slayed either
 }
Index: extra/daemons/fam/fam-2.7.0-dnotify.patch
diff -u extra/daemons/fam/fam-2.7.0-dnotify.patch:1.1 extra/daemons/fam/fam-2.7.0-dnotify.patch:1.2
--- extra/daemons/fam/fam-2.7.0-dnotify.patch:1.1	Wed May 25 05:32:38 2005
+++ extra/daemons/fam/fam-2.7.0-dnotify.patch	Wed Sep 19 17:19:54 2007
@@ -647,8 +647,8 @@
 +    static int pipe_write_fd;
 +    static int pipe_read_fd;
 +    static int change_queue[QUEUESIZE];
-+    static volatile sig_atomic_t DNotify::queue_overflowed;
-+    static volatile sig_atomic_t DNotify::queue_changed;
++    static volatile sig_atomic_t queue_overflowed;
++    static volatile sig_atomic_t queue_changed;
 +    static volatile int queue_head; // Only modified by read handler
 +    static volatile int queue_tail; // Only modified by signal handler
 +    static EventHandler ehandler;