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

[Eric Belanger]

    Date: Sunday, July 20, 2008 @ 19:51:57
  Author: eric
Revision: 5803

Merged revisions 3594-5802 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/p7zip/trunk

........
  r5772 | hugo | 2008-07-20 16:22:38 -0400 (Sun, 20 Jul 2008) | 2 lines
  
  upgpkg: p7zip 4.58-2
      updated to fix FS#10965
........

Modified:
  p7zip/repos/extra-x86_64/	(properties)
  p7zip/repos/extra-x86_64/PKGBUILD
  p7zip/repos/extra-x86_64/p7zip.install

---------------+
 PKGBUILD      |   20 ++++++++++----------
 p7zip.install |    2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)


Property changes on: p7zip/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /p7zip/trunk:1-3593
   + /p7zip/trunk:1-5802

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-20 22:16:57 UTC (rev 5802)
+++ extra-x86_64/PKGBUILD	2008-07-20 23:51:57 UTC (rev 5803)
@@ -1,12 +1,12 @@
 # $Id$
-# Maintainer: Aaron Griffin <aaron at archlinux.org>
+# Maintainer: Hugo Doria <hugo at archlinux.org>
 # Contributor: TuxSpirit<tuxspirit at archlinux.fr>  2007/11/17 21:22:36 UTC
 
 pkgname=p7zip
 pkgver=4.58
-pkgrel=1
+pkgrel=2
 pkgdesc="A command-line port of the 7zip compression utility"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://p7zip.sourceforge.net"
 depends=(gcc-libs bash)
@@ -16,7 +16,7 @@
 options=(!emptydirs)
 
 build() {
-  cd $startdir/src/${pkgname}_${pkgver}
+  cd ${srcdir}/${pkgname}_${pkgver}
 
   #Arch64 fix
   if [ "$CARCH" == "x86_64" ]; then
@@ -28,16 +28,16 @@
   sed -i "s|usr/local|usr|g" makefile
   sed -i "s|-O1|$CXXFLAGS|g" makefile.machine
   make all3 || return 1
-  sed -i "s|DEST_HOME=|DEST_HOME=$startdir/pkg/usr # |g" install.sh
+  sed -i "s|DEST_HOME=|DEST_HOME=${pkgdir}/usr # |g" install.sh
   sed -i 's|${DEST_HOME}/man|${DEST_HOME}/share/man|' install.sh
   ./install.sh 
-  install -m555 bin/7z.so $startdir/pkg/usr/lib/p7zip/
+  install -m555 bin/7z.so ${pkgdir}/usr/lib/p7zip/
 
-  sed -i "s|$startdir/pkg/usr|/usr|g" $startdir/pkg/usr/bin/7z
-  sed -i "s|$startdir/pkg/usr|/usr|g" $startdir/pkg/usr/bin/7za
-  sed -i "s|$startdir/pkg/usr|/usr|g" $startdir/pkg/usr/bin/7zr
+  sed -i "s|${pkgdir}/usr|/usr|g" ${pkgdir}/usr/bin/7z
+  sed -i "s|${pkgdir}/usr|/usr|g" ${pkgdir}/usr/bin/7za
+  sed -i "s|${pkgdir}/usr|/usr|g" ${pkgdir}/usr/bin/7zr
 
   # Install mc's virtual filesystem
   install -m644 -D contrib/VirtualFileSystemForMidnightCommander/u7z \
-    $startdir/pkg/usr/share/mc/extfs/u7z
+    ${pkgdir}/usr/share/mc/extfs/u7z
 }

Modified: extra-x86_64/p7zip.install
===================================================================
--- extra-x86_64/p7zip.install	2008-07-20 22:16:57 UTC (rev 5802)
+++ extra-x86_64/p7zip.install	2008-07-20 23:51:57 UTC (rev 5803)
@@ -6,7 +6,7 @@
 post_upgrade () {
     echo ":: In order to use p7zip with mc:"
     echo ":: Add u7z to /usr/share/mc/extfs/extfs.ini"
-    echo ":: and add the following to /usr/share/mv/mc.ext:"
+    echo ":: and add the following to /usr/share/mc/mc.ext:"
     echo "::"
     echo ":: regex/\.(7z|7Z)$"
     echo ":: 	View=%view{ascii} 7za l %f"