diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
commit | d07d53d7af1e9694d9558783841bc2df3124a90f (patch) | |
tree | 40d68de204b29d3360efd654d3c458c9cdad3cd6 /extra/fam | |
parent | a873bdc69d24650d832933463af71dfaa96f1a8a (diff) | |
parent | 64e290184042563a240e2d6d15c02e06703d00ee (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/obconf/PKGBUILD
community/obconf/obconf.install
community/qstardict/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
extra/cups/PKGBUILD
extra/eject/PKGBUILD
extra/emacs/PKGBUILD
extra/evilwm/PKGBUILD
extra/fbset/PKGBUILD
extra/gmpc/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gtkpod/PKGBUILD
extra/kdepim/PKGBUILD
extra/kile/PKGBUILD
extra/libvpx/PKGBUILD
extra/php-apc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/potrace/PKGBUILD
extra/racket/PKGBUILD
extra/soundtouch/PKGBUILD
extra/wireshark/PKGBUILD
extra/xpdf/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/lib32-acl/PKGBUILD
multilib/lib32-attr/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'extra/fam')
-rw-r--r-- | extra/fam/PKGBUILD | 8 | ||||
-rwxr-xr-x | extra/fam/fam | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/extra/fam/PKGBUILD b/extra/fam/PKGBUILD index 295b69dfe..4f2560625 100644 --- a/extra/fam/PKGBUILD +++ b/extra/fam/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 124073 2011-05-16 14:51:09Z andrea $ +# $Id: PKGBUILD 136014 2011-08-21 14:26:17Z eric $ # Maintainer: # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fam pkgver=2.7.0 -pkgrel=15 +pkgrel=16 pkgdesc="File Alteration Monitor" arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'GPL') depends=('rpcbind' 'gcc-libs' 'bash') url="http://oss.sgi.com/projects/fam/" backup=('etc/fam/fam.conf') -options=('!makeflags') # Don't !libtool +options=('!makeflags' 'libtool') 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 @@ -24,7 +24,7 @@ md5sums=('1bf3ae6c0c58d3201afc97c6a4834e39' '47b41e0b0498793af004696a096d7da1' '2638b8ffacb9f03b6e438e08ea7b290a' 'fc0cabc0ac4f819680401eb3090c29c9' - '92a37f9eb6ad0e60ded9c70e9ad93a88') + 'ec50139679bc31508a843cafa47cd298') build() { cd "${srcdir}"/${pkgname}-${pkgver} diff --git a/extra/fam/fam b/extra/fam/fam index 5fc54a6df..69a049730 100755 --- a/extra/fam/fam +++ b/extra/fam/fam @@ -6,13 +6,10 @@ PID=`pidof -o %PPID /usr/sbin/famd` case "$1" in start) - #Check for running portmap, start when not running - ck_daemon rpcbind && /etc/rc.d/rpcbind start stat_busy "Starting File Alteration Monitor" if ck_daemon rpcbind; then - stat_fail - echo "ERROR: rpcbind is not running" - exit 1 + echo "ERROR: Refusing to start fam without rpcbind running!" >&2 + stat_die fi if [ -z "$PID" ]; then /usr/sbin/famd -T 0 -c /etc/fam/fam.conf |