[arch-commits] CVS update of extra/system/zsh (PKGBUILD zsh.install)

[Eric Belanger]

    Date: Friday, July 13, 2007 @ 01:57:55
  Author: eric
    Path: /home/cvs-extra/extra/system/zsh

Modified: PKGBUILD (1.21 -> 1.22) zsh.install (1.2 -> 1.3)

upgpkg: zsh 4.3.4-1
added license, used --bindir=/bin to install binary in correct location (close  FS#7359 and  FS#5599), uncompress man pages such that meta-man page zshall works properly (close  FS#4580)


-------------+
 PKGBUILD    |   20 +++++++++-----------
 zsh.install |   33 +++++++++++++++++++++++----------
 2 files changed, 32 insertions(+), 21 deletions(-)


Index: extra/system/zsh/PKGBUILD
diff -u extra/system/zsh/PKGBUILD:1.21 extra/system/zsh/PKGBUILD:1.22
--- extra/system/zsh/PKGBUILD:1.21	Tue Oct 17 07:35:12 2006
+++ extra/system/zsh/PKGBUILD	Fri Jul 13 01:57:54 2007
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD,v 1.21 2006/10/17 11:35:12 ganja_guru Exp $
+# $Id: PKGBUILD,v 1.22 2007/07/13 05:57:54 eric Exp $
 # Maintainer: aurelien <aurelien at archlinux.org>
 # Contributor: Jochem Kossen <j.kossen at home.nl>
 pkgname=zsh
-pkgver=4.3.2
-pkgrel=2
+pkgver=4.3.4
+pkgrel=1
 pkgdesc="A very advanced and programmable command interpreter (shell) for UNIX"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.zsh.org/"
-
+license=('custom')
 depends=('ncurses')
-
 install="zsh.install"
 source=(ftp://ftp.zsh.org/pub/$pkgname-$pkgver.tar.bz2 usr_zsh.sh)
-md5sums=('e13fc4bb338fbb27ef7508a474310c8f' '7b7afc638a9274cc16a3546ca2fff2ff')
+md5sums=('8410a30e4f5c6160790bc3afc096424f' '7b7afc638a9274cc16a3546ca2fff2ff')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr \
+  ./configure --prefix=/usr --bindir=/bin \
     --enable-etcdir=/etc/zsh \
     --enable-zshenv=/etc/zsh/zshenv \
     --enable-zlogin=/etc/zsh/zlogin \
@@ -26,10 +25,9 @@
     --enable-maildir-support \
     --with-curses-terminfo \
     --enable-zsh-secure-free
-  find . -name Makefile -exec sed -i -e 's/mawk/awk/' {} \;
   make || return 1
   make DESTDIR=$startdir/pkg install
 
-	mv $startdir/pkg/usr/bin $startdir/pkg/bin
-	install -D -m 755 $startdir/src/usr_zsh.sh $startdir/pkg/usr/bin/zsh
+  install -D -m 755 $startdir/src/usr_zsh.sh $startdir/pkg/usr/bin/zsh
+  install -D -m644 LICENCE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
 }
Index: extra/system/zsh/zsh.install
diff -u extra/system/zsh/zsh.install:1.2 extra/system/zsh/zsh.install:1.3
--- extra/system/zsh/zsh.install:1.2	Sun Oct 15 20:08:08 2006
+++ extra/system/zsh/zsh.install	Fri Jul 13 01:57:55 2007
@@ -1,5 +1,14 @@
-# arg 1: the new package version
+MANPAGES=($(pacman -Ql zsh |grep usr/man/ |awk '{print $2}'))
+
 post_install() {
+  echo -n "==> uncompressing zsh manpages... "
+  for man in "${MANPAGES[@]}"; do
+    gunzip $man
+  done
+  if [ $? -eq 0 ]; then
+     echo "done."
+  fi
+
   if [ ! "`/bin/grep /bin/zsh /etc/shells`" ]; then
     /bin/sed -i "s|/bin/bash|/bin/bash\n/bin/zsh|" /etc/shells
 	else
@@ -12,20 +21,24 @@
   fi
 }
 
-# arg 1: the new package version
-# arg 2: the old package version
+pre_upgrade() {
+  echo -n "==> deleting uncompressed zsh manpages... "
+  for man in "${MANPAGES[@]}"; do
+    cd $(dirname $man)
+    rm -f $(basename $man .gz)
+  done
+  if [ $? -eq 0 ]; then
+    echo "done"
+  fi
+}
+
 post_upgrade() {
-	post_install $1
+  post_install $1
 }
 
-# arg 1: the old package version
 pre_remove() {
   /bin/sed -i '/^\/bin\/zsh/d' /etc/shells
-}
-
-# arg 1: the old package version
-post_remove() {
-  /bin/true
+  pre_upgrade $1
 }
 
 op=$1