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

[Giovanni Scafora]

    Date: Tuesday, October 20, 2009 @ 08:22:29
  Author: giovanni
Revision: 56250

Merged revisions 56248 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/zsh/trunk

........
  r56248 | giovanni | 2009-10-20 04:55:08 -0700 (mar, 20 ott 2009) | 2 lines
  
  upgpkg: zsh 4.3.10-3
      Fixed FS16360
........

Modified:
  zsh/repos/extra-i686/	(properties)
  zsh/repos/extra-i686/PKGBUILD
Deleted:
  zsh/repos/extra-i686/zprofile

----------+
 PKGBUILD |   19 ++++++++++++-------
 zprofile |   36 ------------------------------------
 2 files changed, 12 insertions(+), 43 deletions(-)


Property changes on: zsh/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /zsh/trunk:1-51618
   + /zsh/trunk:1-56249

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-20 11:58:18 UTC (rev 56249)
+++ extra-i686/PKGBUILD	2009-10-20 12:22:29 UTC (rev 56250)
@@ -2,19 +2,26 @@
 # 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.10
-pkgrel=2
+pkgrel=3
 pkgdesc="A very advanced and programmable command interpreter (shell) for UNIX"
 arch=('i686' 'x86_64')
 url="http://www.zsh.org/"
 license=('custom')
 depends=('ncurses' 'pcre')
 install=zsh.install
-source=(ftp://ftp.zsh.org/pub/$pkgname-$pkgver.tar.bz2)
+source=(ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('74c5b275544400082a1cde806c98682a')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # FS#16360
+  sed -i "s:init.d:rc.d:g" Doc/Zsh/compsys.yo \
+                           Doc/zsh.texi \
+                           Completion/Unix/Type/_services \
+                           Completion/Unix/Command/_init_d
   ./configure --prefix=/usr \
               --bindir=/bin \
               --enable-etcdir=/etc/zsh \
@@ -33,9 +40,7 @@
               --enable-zsh-secure-free \
 	      --disable-gdbm
   make || return 1
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="${pkgdir}/" install
 
-  install -D -m644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-
-md5sums=('74c5b275544400082a1cde806c98682a')

Deleted: extra-i686/zprofile
===================================================================
--- extra-i686/zprofile	2009-10-20 11:58:18 UTC (rev 56249)
+++ extra-i686/zprofile	2009-10-20 12:22:29 UTC (rev 56250)
@@ -1,36 +0,0 @@
-#
-# /etc/zsh/zprofile
-#
-
-export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/opt/bin"
-
-export MANPATH="/usr/man"
-export LESSCHARSET="latin1"
-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