[arch-commits] Commit in hylafax/repos (3 files)

[Tobias Powalowski]

    Date: Monday, May 4, 2009 @ 12:34:05
  Author: tpowa
Revision: 37910

Merged revisions 356,37908 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/hylafax/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fr, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r37908 | tpowa | 2009-05-04 16:27:42 +0000 (Mo, 04 Mai 2009) | 1 line
  
  upgpkg: hylafax 6.0.0-1
........

Modified:
  hylafax/repos/extra-i686/	(properties)
  hylafax/repos/extra-i686/PKGBUILD
  hylafax/repos/extra-i686/config.local

--------------+
 PKGBUILD     |   32 ++++++++++++++++----------------
 config.local |    5 +++--
 2 files changed, 19 insertions(+), 18 deletions(-)


Property changes on: hylafax/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /hylafax/trunk:1
   + /hylafax/trunk:1-37909

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-05-04 16:29:10 UTC (rev 37909)
+++ extra-i686/PKGBUILD	2009-05-04 16:34:05 UTC (rev 37910)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Paul Mattal <paul at archlinux.org>
 pkgname=hylafax
-pkgver=4.4.4
+pkgver=6.0.0
 pkgrel=1
 pkgdesc="Fax Server"
 arch=('i686' 'x86_64')
@@ -15,8 +15,6 @@
 	var/spool/hylafax/etc/hosts.hfaxd) 
 source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz hylafax \
         hylafax.cron.daily config.local)
-md5sums=('4beb3d438ca6c4f00f1d94f9643e6668' '9b6700132ca65b0d5df91b585f18b9a5'\
-         '52beffe7dc296b4f9ce9fd0387f7804e' '67f19b7e06602aa27d6d4d96ddbd54b9')
 
 # build as root for successful build!
 build() {
@@ -27,20 +25,16 @@
     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 $startdir/pkg/usr/{bin,lib/fax,man,sbin,share/ghostscript/fonts} \
-  	|| return 1
-  mkdir -p $startdir/pkg/var/{spool/hylafax,lock} || return 1
-  mkdir -p $startdir/pkg/home/httpd/hylafax || return 1
-  cd $startdir/src/${pkgname}-${pkgver} || return 1
+  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
 
   cp ../config.local . || return 1
   ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}" || return 1
-  make -j 1 || return 1
-  make ROOT=$startdir/pkg install || return 1
-  install -D -m 755 $startdir/src/hylafax $startdir/pkg/etc/rc.d/hylafax \
-  	|| return 1
-  install -D -m 744 $startdir/src/hylafax.cron.daily \
-  	$startdir/pkg/etc/cron.daily/hylafax || 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
   # remove group if created
   if [ $uucp_created -eq 1 ]; then
     userdel uucp &>/dev/null
@@ -48,8 +42,14 @@
     userdel fax &>/dev/null
   fi
   # add missing awk file for notify-4.1 script
-  install -D -m 755 $startdir/src/${pkgname}-${pkgver}/util/notify.awk \
-  	$startdir/pkg/var/spool/hylafax/bin/notify.awk || return 1
+  install -D -m 755 $srcdir/${pkgname}-${pkgver}/util/notify.awk \
+  	$spkgdir/var/spool/hylafax/bin/notify.awk || return 1
+  # fix permission on /var/lock
+  chmod 1777 $pkgdir/var/lock
 
   install -D -m644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/COPYRIGHT
 }
+md5sums=('716de4f44b2a18205b4b24135f307e23'
+         '9b6700132ca65b0d5df91b585f18b9a5'
+         '52beffe7dc296b4f9ce9fd0387f7804e'
+         '0d2ce24d918226a852539aebf57d3f4a')

Modified: extra-i686/config.local
===================================================================
--- extra-i686/config.local	2009-05-04 16:29:10 UTC (rev 37909)
+++ extra-i686/config.local	2009-05-04 16:34:05 UTC (rev 37910)
@@ -60,11 +60,12 @@
 DIR_LIB="/usr/lib"
 DIR_LIBDATA="/usr/lib/fax"		# directory for client data
 DIR_LIBEXEC="/usr/lib/fax"		# directory for libraries&hidden apps
-DIR_MAN="/usr/man"		# directory for manual pages
+DIR_MAN="/usr/share/man"		# directory for manual pages
 DIR_SPOOL="/var/spool/hylafax"		# directory for spooling area
 DIR_SBIN="/usr/sbin"		# directory for system apps
 DIR_LOCKS="/var/lock"		# directory for UUCP lock files
 FONTMAP="/usr/share/ghostscript/fonts"	# directorys containing Fontmap files
+DIR_LOCALE="/usr/share/locale"
 #PATH_AFM="/usr/lib/DPS/AFM"		# directorys for AFM files
 
 #
@@ -75,7 +76,7 @@
 # in forming URLs; they are not directory pathnames
 # in the filesystem.
 #
-DIR_HTML="/home/httpd/hylafax"	# directory for HTML documentation
+DIR_HTML="/usr/share/hylafax/httpd"	# directory for HTML documentation
 #DIR_CGI="/var/httpd/cgi-bin"		# directory for CGI scripts
 #HTMLPATH="/hylafax"			# virtual path to HTML materials
 #CGIPATH="/cgi-bin"			# virtual path to CGI scripts