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

[Jeff Mickey]

    Date: Wednesday, March 12, 2008 @ 15:19:40
  Author: jeff
    Path: /home/cvs-extra/extra/system/zsh

Modified: PKGBUILD (1.22 -> 1.23) zsh.install (1.3 -> 1.4)
 Removed: zprofile (1.6)

upgpkg: zsh 4.3.5-1


-------------+
 PKGBUILD    |   19 ++++++++++++++-----
 zprofile    |   34 ----------------------------------
 zsh.install |    3 ++-
 3 files changed, 16 insertions(+), 40 deletions(-)


Index: extra/system/zsh/PKGBUILD
diff -u extra/system/zsh/PKGBUILD:1.22 extra/system/zsh/PKGBUILD:1.23
--- extra/system/zsh/PKGBUILD:1.22	Fri Jul 13 01:57:54 2007
+++ extra/system/zsh/PKGBUILD	Wed Mar 12 15:19:39 2008
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD,v 1.22 2007/07/13 05:57:54 eric Exp $
+# $Id: PKGBUILD,v 1.23 2008/03/12 19:19:39 jeff Exp $
+# Maintainer: Jeff 'codemac' Mickey <jeff at archlinux.org>
 # Maintainer: aurelien <aurelien at archlinux.org>
 # Contributor: Jochem Kossen <j.kossen at home.nl>
 pkgname=zsh
-pkgver=4.3.4
+pkgver=4.3.5
 pkgrel=1
 pkgdesc="A very advanced and programmable command interpreter (shell) for UNIX"
 arch=('i686' 'x86_64')
@@ -11,19 +12,22 @@
 depends=('ncurses')
 install="zsh.install"
 source=(ftp://ftp.zsh.org/pub/$pkgname-$pkgver.tar.bz2 usr_zsh.sh)
-md5sums=('8410a30e4f5c6160790bc3afc096424f' '7b7afc638a9274cc16a3546ca2fff2ff')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
   ./configure --prefix=/usr --bindir=/bin \
-    --enable-etcdir=/etc/zsh \
+    --enable-etcdir=/etc/zsh \ # not removed until FS#8946 proves to be more than people not running login shells.
     --enable-zshenv=/etc/zsh/zshenv \
     --enable-zlogin=/etc/zsh/zlogin \
     --enable-zlogout=/etc/zsh/zlogout \
     --enable-zprofile=/etc/profile \
     --enable-zshrc=/etc/zsh/zshrc \
     --enable-maildir-support \
-    --with-curses-terminfo \
+	--with-term-lib="ncursesw" \
+	--enable-multibyte \
+	--enable-function-subdirs \
+	--enable-zsh-mem \
+	--with-tcsetpgrp \
     --enable-zsh-secure-free
   make || return 1
   make DESTDIR=$startdir/pkg install
@@ -31,3 +35,8 @@
   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
 }
+
+md5sums=('db0d4b71da8e5877fa1e29d4cea38b8c'
+         '7b7afc638a9274cc16a3546ca2fff2ff')
+sha1sums=('9ab505ff4c029b4905d2c4b741f0f0d42e4375c9'
+          '762070405771e6392b671d40ad7e85946654b9df')
Index: extra/system/zsh/zprofile
diff -u extra/system/zsh/zprofile:1.6 extra/system/zsh/zprofile:removed
--- extra/system/zsh/zprofile:1.6	Sat Feb  2 13:48:35 2008
+++ extra/system/zsh/zprofile	Wed Mar 12 15:19:40 2008
@@ -1,34 +0,0 @@
-#
-# /etc/zsh/zprofile
-#
-
-export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/opt/bin"
-
-export INPUTRC="/etc/inputrc"
-export LESS="-R"
-
-# Locale settings (find your locale with 'locale -a')
-export LANG="en_US"
-export LC_COLLATE="C"
-
-export COLUMNS LINES
-
-export PS1='[%n@%m %1~]$ '
-export PS2='> '
-
-umask 022
-
-if [ "$TERM" = "xterm" -o "$TERM" = "xterm-color" -o "$TERM" = "rxvt" -o "$TERM" = "xterm-xfree86" ]; then
-  PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\007"'
-fi
-
-# load profiles from /etc/profile.d
-#  (to disable a profile, just remove execute permission on it)
-for profile in /etc/profile.d/*.sh; do
-  if [ -x $profile ]; then
-    . $profile
-  fi
-done
-unset profile
-
-# End of file
Index: extra/system/zsh/zsh.install
diff -u extra/system/zsh/zsh.install:1.3 extra/system/zsh/zsh.install:1.4
--- extra/system/zsh/zsh.install:1.3	Fri Jul 13 01:57:55 2007
+++ extra/system/zsh/zsh.install	Wed Mar 12 15:19:39 2008
@@ -1,6 +1,6 @@
-MANPAGES=($(pacman -Ql zsh |grep usr/man/ |awk '{print $2}'))
 
 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
@@ -22,6 +22,7 @@
 }
 
 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)