From cc57cb201ddb179d2bb481c13dd4f286ae643b12 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 4 Jun 2013 00:27:56 -0700
Subject: Tue Jun  4 00:27:56 PDT 2013

---
 extra/zsh/PKGBUILD    | 17 +++++------------
 extra/zsh/zsh.install | 15 ++-------------
 2 files changed, 7 insertions(+), 25 deletions(-)

(limited to 'extra/zsh')

diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index 2ec03a9e5..a922500b2 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173826 2012-12-24 15:21:31Z pierre $
+# $Id: PKGBUILD 187080 2013-06-03 11:17:13Z allan $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zsh
 pkgver=5.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
 arch=('i686' 'x86_64')
 url='http://www.zsh.org/'
@@ -11,7 +11,7 @@ license=('custom')
 depends=('pcre' 'libcap' 'gdbm')
 backup=('etc/zsh/zprofile')
 install=zsh.install
-source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2"
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'zprofile')
 md5sums=('b8f2ad691acf58b3252225746480dcad'
          '24a9335edf77252a7b5f52e079f7aef7')
@@ -19,12 +19,6 @@ md5sums=('b8f2ad691acf58b3252225746480dcad'
 build() {
 	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
-
 	# Set correct keymap path
 	sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys
 
@@ -34,7 +28,6 @@ build() {
 	rm -f  Completion/Unix/Command/_osc
 
 	./configure --prefix=/usr \
-		--bindir=/bin \
 		--enable-etcdir=/etc/zsh \
 		--enable-zshenv=/etc/zsh/zshenv \
 		--enable-zlogin=/etc/zsh/zlogin \
@@ -51,7 +44,7 @@ build() {
 		--enable-pcre \
 		--enable-cap \
 		--enable-zsh-secure-free
-	make all info
+	make
 }
 
 check() {
@@ -61,7 +54,7 @@ check() {
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}/" install install.info
+	make DESTDIR="${pkgdir}/" install
 	install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile"
 	install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/zsh/zsh.install b/extra/zsh/zsh.install
index 8e54d92ee..a2aafa252 100644
--- a/extra/zsh/zsh.install
+++ b/extra/zsh/zsh.install
@@ -1,12 +1,5 @@
-infodir=usr/share/info
-filelist=(zsh.info zsh.info-1 zsh.info-2 zsh.info-3 zsh.info-4 zsh.info-5 zsh.info-6)
-
 post_install() {
-	grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells
-	[ -x usr/bin/install-info ] || return 0
-	for file in ${filelist[@]}; do
-	    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-	done
+	grep -q '/usr/bin/zsh' etc/shells || echo '/usr/bin/zsh' >> etc/shells
 }
 
 post_upgrade() {
@@ -14,9 +7,5 @@ post_upgrade() {
 }
 
 pre_remove() {
-	sed -i '/^\/bin\/zsh/d' etc/shells
-	[ -x usr/bin/install-info ] || return 0
-	for file in ${filelist[@]}; do
-	    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-	done
+	sed -i -r '/^(\/usr)?\/bin\/zsh$/d' etc/shells
 }
-- 
cgit v1.2.3-54-g00ecf