[arch-commits] CVS update of extra/multimedia/acidrip (PKGBUILD)

[Eric Belanger]

    Date: Wednesday, December 5, 2007 @ 03:15:53
  Author: eric
    Path: /home/cvs-extra/extra/multimedia/acidrip

Modified: PKGBUILD (1.5 -> 1.6)

upgpkg: acidrip 0.14-5
fixed clobbering of perl symlink (close  FS#8235)


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


Index: extra/multimedia/acidrip/PKGBUILD
diff -u extra/multimedia/acidrip/PKGBUILD:1.5 extra/multimedia/acidrip/PKGBUILD:1.6
--- extra/multimedia/acidrip/PKGBUILD:1.5	Wed Nov 28 02:59:17 2007
+++ extra/multimedia/acidrip/PKGBUILD	Wed Dec  5 03:15:53 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.5 2007/11/28 07:59:17 aaron Exp $
+# $Id: PKGBUILD,v 1.6 2007/12/05 08:15:53 eric Exp $
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
 
 pkgname=acidrip
 pkgver=0.14
-pkgrel=4
+pkgrel=5
 pkgdesc="AcidRip is a Gtk2::Perl  application for ripping and encoding DVD's"
 license=('GPL')
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@
 source=(http://downloads.sourceforge.net/sourceforge/acidrip/$pkgname-$pkgver.tar.gz
         http://untrepid.com/acidrip/acidrip-icon4bit.png
         acidrip.desktop crop-fixes.patch)
-md5sums=('c1c27bbf658e5c30f43e067a8ae283de' '7498602e2a3838cf35b94af85d9954d3'
+md5sums=('c1c27bbf658e5c30f43e067a8ae283de' '7498602e2a3838cf35b94af85d9954d3'\
          'f6896612df224a325d66c5f8fa8553e7' '1a8470702e2e0eda8ecbc473141aa08f')
 options=(!emptydirs)
 
@@ -20,16 +20,22 @@
 {
   cd $startdir/src/$pkgname-$pkgver
   patch -up1 < ../crop-fixes.patch || return 1
-
-  perl Makefile.PL
+  # Force module installation to "current" perl directories.
+  eval `perl -V:archname`
+  perl Makefile.PL \
+      INSTALLARCHLIB=/usr/lib/perl5/current/${archname} \
+      INSTALLSITELIB=/usr/lib/perl5/site_perl/current \
+      INSTALLSITEARCH=/usr/lib/perl5/site_perl/current/${archname}
   sed -i "s%^DESTDIR.*%DESTDIR=$startdir/pkg%" Makefile
   make || return 1
   make prefix=$startdir/pkg/usr install
-  rm -rf $startdir/pkg/usr/lib/perl5/5.8.8
-  rm -rf $startdir/pkg/usr/lib/perl5/site_perl/5.8.8/i686-linux-thread-multi/
 
   install -D -m644 $startdir/src/acidrip-icon4bit.png \
     $startdir/pkg/usr/share/pixmaps/acidrip.png
   install -D -m644 $startdir/src/acidrip.desktop \
     $startdir/pkg/usr/share/applications/acidrip.desktop
+
+  # remove perllocal.pod and .packlist
+  find ${startdir}/pkg -name perllocal.pod -delete
+  find ${startdir}/pkg -name .packlist -delete
 }