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

Pierre Schmitz pierre at archlinux.org
Sat Nov 19 01:05:36 EST 2011


    Date: Saturday, November 19, 2011 @ 01:05:35
  Author: pierre
Revision: 142954

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  zsh/repos/staging-i686/
  zsh/repos/staging-i686/PKGBUILD
    (from rev 142953, zsh/trunk/PKGBUILD)
  zsh/repos/staging-i686/modules.patch
    (from rev 142953, zsh/trunk/modules.patch)
  zsh/repos/staging-i686/zsh.install
    (from rev 142953, zsh/trunk/zsh.install)
  zsh/repos/staging-x86_64/
  zsh/repos/staging-x86_64/PKGBUILD
    (from rev 142953, zsh/trunk/PKGBUILD)
  zsh/repos/staging-x86_64/modules.patch
    (from rev 142953, zsh/trunk/modules.patch)
  zsh/repos/staging-x86_64/zsh.install
    (from rev 142953, zsh/trunk/zsh.install)

------------------------------+
 staging-i686/PKGBUILD        |   58 +++++++++++++++++++++++++++++++++++++++++
 staging-i686/modules.patch   |   11 +++++++
 staging-i686/zsh.install     |   11 +++++++
 staging-x86_64/PKGBUILD      |   58 +++++++++++++++++++++++++++++++++++++++++
 staging-x86_64/modules.patch |   11 +++++++
 staging-x86_64/zsh.install   |   11 +++++++
 6 files changed, 160 insertions(+)

Copied: zsh/repos/staging-i686/PKGBUILD (from rev 142953, zsh/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2011-11-19 06:05:35 UTC (rev 142954)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=zsh
+pkgver=4.3.12
+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=('pcre' 'libcap' 'gdbm')
+install=zsh.install
+source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" 'modules.patch')
+md5sums=('7a82c0bf0635e046ca4e9ec1bdef3811'
+         'b367c1398b60242f7044a93a837227f9')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	# upstream patch to fix handling of compressed kernel modules
+	patch -p1 -i ${srcdir}/modules.patch
+	# 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-fndir=/usr/share/zsh/functions \
+		--enable-scriptdir=/usr/share/zsh/scripts \
+		--with-tcsetpgrp \
+		--enable-pcre \
+		--enable-cap \
+		--enable-zsh-secure-free
+	make
+}
+
+check() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	# This test wont work with the noatime mount option
+	rm Test/C02cond.ztst
+	HOME="${srcdir}" make check
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}/" install
+	install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Copied: zsh/repos/staging-i686/modules.patch (from rev 142953, zsh/trunk/modules.patch)
===================================================================
--- staging-i686/modules.patch	                        (rev 0)
+++ staging-i686/modules.patch	2011-11-19 06:05:35 UTC (rev 142954)
@@ -0,0 +1,11 @@
+--- a/Completion/Linux/Command/_modutils
++++ b/Completion/Linux/Command/_modutils
+@@ -107,7 +107,7 @@ case "$state" in
+       ! _retrieve_cache modules-$kver;
+     then 
+       # 2011-01-02 gi1242: Do we need .o files? Or is .ko enough?
+-      modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko)(.:t:r) )
++      modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko|ko.gz)(.:t:r:r) )
+       _store_cache modules-$kver modules
+     fi
+ 

Copied: zsh/repos/staging-i686/zsh.install (from rev 142953, zsh/trunk/zsh.install)
===================================================================
--- staging-i686/zsh.install	                        (rev 0)
+++ staging-i686/zsh.install	2011-11-19 06:05:35 UTC (rev 142954)
@@ -0,0 +1,11 @@
+post_install() {
+	grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells
+}
+
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+	sed -i '/^\/bin\/zsh/d' etc/shells
+}

Copied: zsh/repos/staging-x86_64/PKGBUILD (from rev 142953, zsh/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2011-11-19 06:05:35 UTC (rev 142954)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=zsh
+pkgver=4.3.12
+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=('pcre' 'libcap' 'gdbm')
+install=zsh.install
+source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" 'modules.patch')
+md5sums=('7a82c0bf0635e046ca4e9ec1bdef3811'
+         'b367c1398b60242f7044a93a837227f9')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	# upstream patch to fix handling of compressed kernel modules
+	patch -p1 -i ${srcdir}/modules.patch
+	# 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-fndir=/usr/share/zsh/functions \
+		--enable-scriptdir=/usr/share/zsh/scripts \
+		--with-tcsetpgrp \
+		--enable-pcre \
+		--enable-cap \
+		--enable-zsh-secure-free
+	make
+}
+
+check() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	# This test wont work with the noatime mount option
+	rm Test/C02cond.ztst
+	HOME="${srcdir}" make check
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}/" install
+	install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Copied: zsh/repos/staging-x86_64/modules.patch (from rev 142953, zsh/trunk/modules.patch)
===================================================================
--- staging-x86_64/modules.patch	                        (rev 0)
+++ staging-x86_64/modules.patch	2011-11-19 06:05:35 UTC (rev 142954)
@@ -0,0 +1,11 @@
+--- a/Completion/Linux/Command/_modutils
++++ b/Completion/Linux/Command/_modutils
+@@ -107,7 +107,7 @@ case "$state" in
+       ! _retrieve_cache modules-$kver;
+     then 
+       # 2011-01-02 gi1242: Do we need .o files? Or is .ko enough?
+-      modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko)(.:t:r) )
++      modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko|ko.gz)(.:t:r:r) )
+       _store_cache modules-$kver modules
+     fi
+ 

Copied: zsh/repos/staging-x86_64/zsh.install (from rev 142953, zsh/trunk/zsh.install)
===================================================================
--- staging-x86_64/zsh.install	                        (rev 0)
+++ staging-x86_64/zsh.install	2011-11-19 06:05:35 UTC (rev 142954)
@@ -0,0 +1,11 @@
+post_install() {
+	grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells
+}
+
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+	sed -i '/^\/bin\/zsh/d' etc/shells
+}



More information about the arch-commits mailing list