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

[Jeff Mickey]

    Date: Sunday, November 9, 2008 @ 17:59:07
  Author: jeff
Revision: 18880

Merged revisions 356,18879 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/zsh/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r18879 | jeff | 2008-11-09 17:57:37 -0500 (Sun, 09 Nov 2008) | 1 line
  
  upgpkg: zsh 4.3.9-1
........

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

-------------+
 PKGBUILD    |   21 +++++++++------------
 zsh.install |   36 +-----------------------------------
 2 files changed, 10 insertions(+), 47 deletions(-)


Property changes on: zsh/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /zsh/trunk:1
   + /zsh/trunk:1-18879

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-09 22:57:37 UTC (rev 18879)
+++ extra-x86_64/PKGBUILD	2008-11-09 22:59:07 UTC (rev 18880)
@@ -3,18 +3,19 @@
 # Maintainer: aurelien <aurelien at archlinux.org>
 # Contributor: Jochem Kossen <j.kossen at home.nl>
 pkgname=zsh
-pkgver=4.3.5
-pkgrel=2
+pkgver=4.3.9
+pkgrel=1
 pkgdesc="A very advanced and programmable command interpreter (shell) for UNIX"
 arch=('i686' 'x86_64')
 url="http://www.zsh.org/"
 license=('custom')
-depends=('ncurses')
+depends=('ncurses' 'gdbm')
+options=('!zipman')
 install="zsh.install"
-source=(ftp://ftp.zsh.org/pub/$pkgname-$pkgver.tar.bz2 usr_zsh.sh)
+source=(ftp://ftp.zsh.org/pub/$pkgname-$pkgver.tar.bz2)
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --bindir=/bin \
     --enable-etcdir=/etc/zsh \
 	--enable-zshenv=/etc/zsh/zshenv \
@@ -30,13 +31,9 @@
 	--with-tcsetpgrp \
     --enable-zsh-secure-free
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR="$pkgdir/" install
 
-  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
+  install -D -m644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-md5sums=('db0d4b71da8e5877fa1e29d4cea38b8c'
-         '7b7afc638a9274cc16a3546ca2fff2ff')
-sha1sums=('9ab505ff4c029b4905d2c4b741f0f0d42e4375c9'
-          '762070405771e6392b671d40ad7e85946654b9df')
+md5sums=('0539d0a590e545ad8c40ff8c97e94538')

Modified: extra-x86_64/zsh.install
===================================================================
--- extra-x86_64/zsh.install	2008-11-09 22:57:37 UTC (rev 18879)
+++ extra-x86_64/zsh.install	2008-11-09 22:59:07 UTC (rev 18880)
@@ -1,49 +1,15 @@
-
 post_install() {
-  MANPAGES=($(pacman -Ql zsh |grep usr/share/man/ |awk '{print $2}'))
-  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
-		/bin/sed -i "s|/usr/bin/zsh|/bin/zsh|" /etc/shells
-		
-		echo ""
-		echo ">> WARNING: /usr/bin/zsh has moved to /bin/zsh,"
-		echo ">> please update your user accounts as needed"
-		echo ""
   fi
 }
 
-pre_upgrade() {
-  MANPAGES=($(pacman -Ql zsh |grep usr/share/man/ |awk '{print $2}'))
-  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
 }
 
 pre_remove() {
   /bin/sed -i '/^\/bin\/zsh/d' /etc/shells
-  pre_upgrade $1
 }
 
-op=$1
-shift
-
-$op $*
-# vim: ts=2: ft=sh
+# vim:set ts=2 sw=2 et:
\ No newline at end of file