[arch-commits] Commit in zsh/trunk (PKGBUILD usr_zsh.sh zsh.install)
Pierre Schmitz
pierre at archlinux.org
Tue Jul 6 07:47:55 UTC 2010
Date: Tuesday, July 6, 2010 @ 03:47:55
Author: pierre
Revision: 84997
cleanup PKGBUILD
fix FS#20086
Modified:
zsh/trunk/PKGBUILD
zsh/trunk/zsh.install
Deleted:
zsh/trunk/usr_zsh.sh
-------------+
PKGBUILD | 69 +++++++++++++++++++++++++++++-----------------------------
usr_zsh.sh | 9 -------
zsh.install | 10 ++------
3 files changed, 38 insertions(+), 50 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-07-06 06:32:55 UTC (rev 84996)
+++ PKGBUILD 2010-07-06 07:47:55 UTC (rev 84997)
@@ -1,46 +1,47 @@
# $Id$
-# Maintainer: Jeff 'codemac' Mickey <jeff at archlinux.org>
-# Maintainer: aurelien <aurelien at archlinux.org>
-# Contributor: Jochem Kossen <j.kossen at home.nl>
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
pkgname=zsh
pkgver=4.3.10
-pkgrel=3
-pkgdesc="A very advanced and programmable command interpreter (shell) for UNIX"
+pkgrel=4
+pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
arch=('i686' 'x86_64')
-url="http://www.zsh.org/"
+url='http://www.zsh.org/'
license=('custom')
-depends=('ncurses' 'pcre')
+depends=('pcre' 'libcap')
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}"
- # 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 \
- --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-term-lib="ncursesw" \
- --enable-multibyte \
- --enable-function-subdirs \
- --enable-zsh-mem \
- --with-tcsetpgrp \
- --enable-pcre \
- --enable-zsh-secure-free \
- --disable-gdbm
- make || return 1
- make DESTDIR="${pkgdir}/" install
+ 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 \
+ --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-term-lib='ncursesw' \
+ --enable-multibyte \
+ --enable-function-subdirs \
+ --with-tcsetpgrp \
+ --enable-pcre \
+ --enable-cap \
+ --enable-zsh-secure-free \
+ --disable-gdbm
+ make
+}
- install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}/" install
+ install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
Deleted: usr_zsh.sh
===================================================================
--- usr_zsh.sh 2010-07-06 06:32:55 UTC (rev 84996)
+++ usr_zsh.sh 2010-07-06 07:47:55 UTC (rev 84997)
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-/bin/echo "WARNING: you should be calling zsh with /bin/zsh,"
-/bin/echo "not with /usr/bin/zsh. Please execute chsh to fix"
-/bin/echo "this. Legacy /usr/bin/zsh support will go away!"
-/bin/echo ""
-
-exec /bin/zsh $@
-
Modified: zsh.install
===================================================================
--- zsh.install 2010-07-06 06:32:55 UTC (rev 84996)
+++ zsh.install 2010-07-06 07:47:55 UTC (rev 84997)
@@ -1,15 +1,11 @@
post_install() {
- if [ ! "`/bin/grep /bin/zsh /etc/shells`" ]; then
- /bin/sed -i "s|/bin/bash|/bin/bash\n/bin/zsh|" /etc/shells
- fi
+ grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells
}
post_upgrade() {
- post_install $1
+ post_install
}
pre_remove() {
- /bin/sed -i '/^\/bin\/zsh/d' /etc/shells
+ sed -i '/^\/bin\/zsh/d' etc/shells
}
-
-# vim:set ts=2 sw=2 et:
\ No newline at end of file
More information about the arch-commits
mailing list