[arch-commits] Commit in zsh/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Giovanni Scafora]

    Date: Tuesday, October 20, 2009 @ 07:58:18
  Author: giovanni
Revision: 56249

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-x86_64/	(properties)
  zsh/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)


Property changes on: zsh/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /zsh/trunk:1-51617
   + /zsh/trunk:1-56248

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-20 11:55:08 UTC (rev 56248)
+++ extra-x86_64/PKGBUILD	2009-10-20 11:58:18 UTC (rev 56249)
@@ -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')