[arch-commits] Commit in foomatic-db-engine/repos (2 files)

[François Charette]

    Date: Thursday, October 1, 2009 @ 09:27:01
  Author: francois
Revision: 53503

Merged revisions 53501 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/foomatic-db-engine/trunk

........
  r53501 | francois | 2009-10-01 15:25:27 +0200 (Thu, 01 Oct 2009) | 2 lines
  
  upgpkg: foomatic-db-engine 4.0.3-2
      standardize perl install, fix pkgdesc
........

Modified:
  foomatic-db-engine/repos/testing-x86_64/	(properties)
  foomatic-db-engine/repos/testing-x86_64/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)


Property changes on: foomatic-db-engine/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /foomatic-db-engine/trunk:1-50952
   + /foomatic-db-engine/trunk:1-53502

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-10-01 13:26:05 UTC (rev 53502)
+++ testing-x86_64/PKGBUILD	2009-10-01 13:27:01 UTC (rev 53503)
@@ -1,33 +1,33 @@
 # $Id$
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Firmicus <francois.archlinux.org>
 
 # build order: foomatic-db / -filters / -db-engines / -db-hpijs / -db-nonfree
 
 pkgname=foomatic-db-engine
 pkgver=4.0.3
-pkgrel=1
-pkgdesc="Foomatic is a system for using free software printer drivers with common spoolers on Unix"
+pkgrel=2
+pkgdesc="System for using free software printer drivers with common spoolers on Unix"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('perl' 'libxml2' 'foomatic-filters>=$pkgver' 'bash')
+depends=('perl>=5.10' 'libxml2' 'foomatic-filters>=$pkgver' 'bash')
 replaces=('foomatic')
 conflicts=('foomatic')
 source=(http://www.linuxprinting.org/download/foomatic/$pkgname-${pkgver/_/-}.tar.gz)
 url="http://www.linuxprinting.org/foomatic.html"
-options=('force')
+options=('force' '!emptydirs')
 md5sums=('fdb02175cc857f63bb06b25ac3b1658b')
 
 build() {
    cd ${srcdir}/${pkgname}-${pkgver}
-    ./configure --prefix=/usr
+   ./configure --prefix=/usr
+   # standardize Perl installation:
+   pushd lib
+   perl Makefile.PL INSTALLDIRS=vendor || return 1
+   popd
    make || return 1
-   eval `perl -V:archname`
-   make DESTDIR=${pkgdir} \
-	INSTALLARCHLIB=/usr/lib/perl5/current/${archname} \
-	INSTALLSITELIB=/usr/lib/perl5/site_perl/current/ \
-        INSTALLSITEARCH=/usr/lib/perl5/site_perl/current/${archname} install || return 1
-   /usr/bin/find ${pkgdir} -name '.packlist' -delete
-   # fix permissions
-   chmod 755 ${pkgdir}/usr/lib{,/perl5,/perl5/site_perl}
+   make DESTDIR=${pkgdir} install || return 1
+   find $pkgdir -name '.packlist' -delete
+   find $pkgdir -name '*.pod' -delete
 }