Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	extra/flac/PKGBUILD
	extra/glib/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/qiv/PKGBUILD
	extra/vamp-plugin-sdk/PKGBUILD
	extra/vcdimager/PKGBUILD
	extra/xorg-server/PKGBUILD

3 files changed, 39 insertions, 24 deletions

diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD
index a5f794452..56881e4bb 100644
--- a/extra/hylafax/PKGBUILD
+++ b/extra/hylafax/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 62528 2010-01-09 20:34:27Z tpowa $
+# $Id: PKGBUILD 134870 2011-08-08 08:29:49Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 pkgname=hylafax
-pkgver=6.0.4
+pkgver=6.0.5
 pkgrel=1
 pkgdesc="Fax Server"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,12 +10,14 @@ license=('custom')
 depends=('libtiff' 'pam' 'ghostscript')
 makedepends=('smtp-server')
 url="http://www.hylafax.org/"
-backup=(var/spool/hylafax/bin/{faxrcvd,notify} \
-	usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules} \
+backup=(var/spool/hylafax/bin/{faxrcvd,notify}
+	usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules}
 	var/spool/hylafax/etc/hosts.hfaxd) 
-source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz hylafax \
-        hylafax.cron.daily config.local)
-options=('!makeflags')
+source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz 
+        hylafax 
+        hylafax.cron.daily 
+        config.local
+        configure-6.0.5.patch)
 
 # build as root for successful build!
 build() {
@@ -26,16 +28,22 @@ build() {
     useradd -u 10 -g uucp -d '/' -s /bin/false uucp &>/dev/null
     useradd -u 69 -g daemon -d '/' -s /bin/false fax &>/dev/null
   fi
-  mkdir -p $pkgdir/usr/{bin,lib/fax,sbin,share/ghostscript/fonts} || return 1
-  mkdir -p $pkgdir/var/{spool/hylafax,lock} || return 1
-  cd $srcdir/${pkgname}-${pkgver} || return 1
+  mkdir -p $pkgdir/usr/{bin,lib/fax,sbin,share/ghostscript/fonts}
+  mkdir -p $pkgdir/var/{spool/hylafax,lock}
+  cd $srcdir/${pkgname}-${pkgver}
 
-  cp ../config.local . || return 1
-  ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}" || return 1
-  make || return 1
-  make ROOT=$pkgdir install || return 1
-  install -D -m 755 $srcdir/hylafax $pkgdir/etc/rc.d/hylafax || return 1
-  install -D -m 744 $srcdir/hylafax.cron.daily $pkgdir/etc/cron.daily/hylafax || return 1
+  cp ../config.local .
+  # fix compiling
+  patch -Np0 -i ../configure-6.0.5.patch
+  ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}"
+  make
+}
+
+package () {
+  cd $srcdir/${pkgname}-${pkgver}
+  make ROOT=$pkgdir install
+  install -D -m 755 $srcdir/hylafax $pkgdir/etc/rc.d/hylafax
+  install -D -m 744 $srcdir/hylafax.cron.daily $pkgdir/etc/cron.daily/hylafax
   # remove group if created
   if [ $uucp_created -eq 1 ]; then
     userdel uucp &>/dev/null
@@ -44,13 +52,14 @@ build() {
   fi
   # add missing awk file for notify-4.1 script
   install -D -m 755 $srcdir/${pkgname}-${pkgver}/util/notify.awk \
-  	$spkgdir/var/spool/hylafax/bin/notify.awk || return 1
+  	$spkgdir/var/spool/hylafax/bin/notify.awk
   # fix permission on /var/lock
   chmod 1777 $pkgdir/var/lock
 
   install -D -m644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/COPYRIGHT
 }
-md5sums=('6ba4bc3a47c9d2634de1b14f4ab34c80'
+md5sums=('eb9ac942354ad708e20e4583cec6615f'
          '6602288a405324d8c8e3c5eac2bf19fd'
          '52beffe7dc296b4f9ce9fd0387f7804e'
-         '0d2ce24d918226a852539aebf57d3f4a')
+         '0d2ce24d918226a852539aebf57d3f4a'
+         '51d9f639bb76e5e39cdc8e2ac07e208d')
diff --git a/extra/hylafax/configure-6.0.5.patch b/extra/hylafax/configure-6.0.5.patch
new file mode 100644
index 000000000..e1f1126a5
--- /dev/null
+++ b/extra/hylafax/configure-6.0.5.patch
@@ -0,0 +1,11 @@
+--- configure.old	2011-08-08 10:19:37.619657223 +0200
++++ configure	2011-08-08 10:20:26.422189170 +0200
+@@ -2882,7 +2882,7 @@
+ 	echo '#define HAS_FCHMOD 1'
+ 	Note "... configure use of fchmod"
+ 	CheckFuncDecl fchmod 'extern int fchmod(int, mode_t);' \
+-	    unistd.h libc.h $OSFCNH sys/stat.h
++	    unistd.h $OSFCNH sys/stat.h libc.h
+     }
+     CheckFuncDecl mknod 'extern int mknod(const char*, mode_t, dev_t);' \
+ 	unistd.h sys/stat.h
diff --git a/extra/hylafax/hylafax.install b/extra/hylafax/hylafax.install
index d9d991e6b..bd97d42bd 100644
--- a/extra/hylafax/hylafax.install
+++ b/extra/hylafax/hylafax.install
@@ -42,8 +42,3 @@ pre_remove() {
   userdel fax &>/dev/null
   print_remove
 }
-
-op=$1
-shift
-
-$op $*