Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bwbar/PKGBUILD
	community/directfb/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gnash/PKGBUILD
	community/guake/PKGBUILD
	community/pidgin-libnotify/PKGBUILD
	community/png2ico/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/torcs/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/abiword/PKGBUILD
	extra/alsaplayer/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-desktop2/PKGBUILD
	extra/gnome-python/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gnugo/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/koffice/PKGBUILD
	extra/lcms/PKGBUILD
	extra/libao/PKGBUILD
	extra/libcue/PKGBUILD
	extra/libdaemon/PKGBUILD
	extra/libgnome-media-profiles/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libots/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxfcegui4/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/rssh/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim-pinyin/PKGBUILD
	extra/scim-tables/PKGBUILD
	extra/scim-uim/PKGBUILD
	extra/tsocks/PKGBUILD
	extra/vigra/PKGBUILD
	extra/w3m/PKGBUILD
	extra/wv/PKGBUILD
	extra/xclip/PKGBUILD
	extra/xfce4-datetime-plugin/PKGBUILD
	extra/xfce4-notes-plugin/PKGBUILD
	extra/xfce4-quicklauncher-plugin/PKGBUILD
	extra/xfce4-sensors-plugin/PKGBUILD
	extra/xorg-font-util/PKGBUILD
	extra/xorg-setxkbmap/PKGBUILD
	extra/xorg-xev/PKGBUILD
	extra/xsane/PKGBUILD
	extra/yakuake/PKGBUILD
	extra/zvbi/PKGBUILD
	multilib/lib32-cairo/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-libcanberra/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-libglade/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/wine/PKGBUILD
	testing/vlc/PKGBUILD
	testing/xulrunner/PKGBUILD

1 files changed, 31 insertions, 25 deletions

diff --git a/extra/capi4hylafax/PKGBUILD b/extra/capi4hylafax/PKGBUILD
index f8918d70e..7b0a94459 100644
--- a/extra/capi4hylafax/PKGBUILD
+++ b/extra/capi4hylafax/PKGBUILD
@@ -1,49 +1,55 @@
-# $Id: PKGBUILD 84286 2010-06-28 14:07:57Z tpowa $
+# $Id: PKGBUILD 148688 2012-02-05 11:46:56Z ibiru $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=capi4hylafax
 pkgver=010300
-pkgrel=4
+pkgrel=5
 pkgdesc="capi plugin for hylafax to enable isdn faxing"
 arch=(i686 x86_64 'mips64el')
 url="ftp://ftp.avm.de/tools"
 license=('GPL')
-depends=('glibc' 'capi4k-utils' 'hylafax' 'gcc-libs' 'libtiff')
+depends=('glibc' 'capi4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog')
 source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz
 	config.faxCAPI capi4hylafax.rc)
+md5sums=('d37dc652ac80d1525ef8693be55ee67f'
+         '653b60695d21c128f020a86274ca9192'
+         '1fe40c58289fa3ba625ce6fe2fdb3d07')
 install=capi4hylafax.install
 backup=(var/spool/hylafax/etc/config.faxCAPI)
+
 build() {
-  cd $srcdir/$pkgname-01.03.00
+  cd "$srcdir"/$pkgname-01.03.00
 # fix config file
-  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in || return 1
-  ./configure || return 1
-  make || return 1
-  install -m755 -D src/faxsend/c2faxsend $pkgdir/usr/bin/c2faxsend
-  install -m755 -D src/faxrecv/c2faxrecv $pkgdir/usr/bin/c2faxrecv
-  install -m755 -D setupconffile $pkgdir/usr/bin/c2faxaddmodem
-  install -m644 -D $srcdir/config.faxCAPI $pkgdir/var/spool/hylafax/etc/config.faxCAPI
-  install -m755 -D $srcdir/capi4hylafax.rc $pkgdir/etc/rc.d/capi4hylafax
+  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in
+  autoreconf --force --install
+  ./configure
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-01.03.00
+  install -m755 -D src/faxsend/c2faxsend "$pkgdir"/usr/bin/c2faxsend
+  install -m755 -D src/faxrecv/c2faxrecv "$pkgdir"/usr/bin/c2faxrecv
+  install -m755 -D setupconffile "$pkgdir"/usr/bin/c2faxaddmodem
+  install -m644 -D "$srcdir"/config.faxCAPI "$pkgdir"/var/spool/hylafax/etc/config.faxCAPI
+  install -m755 -D "$srcdir"/capi4hylafax.rc "$pkgdir"/etc/rc.d/capi4hylafax
 # adding FIFO
-  mkfifo $pkgdir/var/spool/hylafax/FIFO.faxCAPI
-  chown 10 $pkgdir/var/spool/hylafax/FIFO.faxCAPI
-  chgrp 14 $pkgdir/var/spool/hylafax/FIFO.faxCAPI
-  chmod 0600 $pkgdir/var/spool/hylafax/FIFO.faxCAPI
+  mkfifo "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+  chown 10 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+  chgrp 14 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+  chmod 0600 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
 # fix /var/spool/hylafax permission
-  chown 10 $pkgdir/var/spool/hylafax
-  chgrp 14 $pkgdir/var/spool/hylafax
+  chown 10 "$pkgdir"/var/spool/hylafax
+  chgrp 14 "$pkgdir"/var/spool/hylafax
 # adding udev rule
-  mkdir -p $pkgdir/lib/udev/rules.d
-cat << EOF >> $pkgdir/lib/udev/rules.d/53-capi4hylafax.rules
+  mkdir -p "$pkgdir"/lib/udev/rules.d
+cat << EOF >> "$pkgdir"/lib/udev/rules.d/53-capi4hylafax.rules
 # CAPI devices
 SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp"
 SUBSYSTEM=="tty" KERNEL=="capi[0-9]*", NAME="capi/%n", GROUP="uucp"
 
 EOF
 # fix c2faxadd
-  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' $pkgdir/usr/bin/c2faxaddmodem || return 1
-  echo "main_config_dialog" >>  $pkgdir/usr/bin/c2faxaddmodem
+  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' "$pkgdir"/usr/bin/c2faxaddmodem
+  echo "main_config_dialog" >>  "$pkgdir"/usr/bin/c2faxaddmodem
 }
-md5sums=('d37dc652ac80d1525ef8693be55ee67f'
-         '653b60695d21c128f020a86274ca9192'
-         '1fe40c58289fa3ba625ce6fe2fdb3d07')