diff options
| author | Michael Straube | 2017-02-18 20:07:29 +0100 |
|---|---|---|
| committer | Michael Straube | 2017-02-18 20:09:44 +0100 |
| commit | 7831034831d9a13361de85c952c7f7eb321878f3 (patch) | |
| tree | 1ed92f7d90575d8fad5f2da12711dab3d2efa74a | |
| parent | 580fe765f7dddf2c84322e50570381cc90e5b1df (diff) | |
| download | aur-7831034831d9a13361de85c952c7f7eb321878f3.tar.gz | |
Update to 2.44
| -rw-r--r--[-rwxr-xr-x] | .SRCINFO | 15 | ||||
| -rw-r--r--[-rwxr-xr-x] | PKGBUILD | 72 | ||||
| -rw-r--r--[-rwxr-xr-x] | yash.install | 4 |
3 files changed, 35 insertions, 56 deletions
diff --git a/.SRCINFO b/.SRCINFO index 0388c0b37e12..5a598b058e02 100755..100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,16 +1,15 @@ -# Generated by mksrcinfo v8 -# Thu Sep 29 22:27:19 UTC 2016 pkgbase = yash pkgdesc = Yet Another SHell is a POSIX-compliant command line shell - pkgver = 2.42 - pkgrel = 2 + pkgver = 2.44 + pkgrel = 1 url = http://sourceforge.jp/projects/yash/ + install = yash.install arch = i686 arch = x86_64 - license = GPL2 - makedepends = pax - source = yash-2.42.tar.xz::http://osdn.jp/frs/redir.php?m=iij&f=%2Fyash%2F63432%2Fyash-2.38.tar.xz - md5sums = 7cdebec758b8301622d0e33e99305be2 + license = GPL + depends = ncurses + source = https://de.osdn.net/projects/yash/downloads/66984/yash-2.44.tar.xz + sha256sums = f1352b49195a3879284e3ab60af4b30d3a87d696c838b246e2068ccbdfcf2e66 pkgname = yash diff --git a/PKGBUILD b/PKGBUILD index 33475afe3d02..bf51bc19bcb7 100755..100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,56 +1,36 @@ -# Maintainer: Pablo Lezaeta <prflr88@gmail.com> +# Maintainer: Michael Straube <straubem@gmx.de> +# Contributor: Pablo Lezaeta <prflr88@gmail.com> pkgname=yash -pkgver=2.42 -pkgrel=2 +pkgver=2.44 +pkgrel=1 pkgdesc="Yet Another SHell is a POSIX-compliant command line shell" -arch=("i686" "x86_64") -license=("GPL2") +arch=('i686' 'x86_64') url="http://sourceforge.jp/projects/yash/" -#ToDo: Add propper deps -makedepends=("pax") -source=("${pkgname}-${pkgver}.tar.xz::http://osdn.jp/frs/redir.php?m=iij&f=%2Fyash%2F63432%2Fyash-2.38.tar.xz") - - +license=('GPL') +depends=('ncurses') +install=yash.install +source=("https://de.osdn.net/projects/yash/downloads/66984/yash-${pkgver}.tar.xz") +sha256sums=('f1352b49195a3879284e3ab60af4b30d3a87d696c838b246e2068ccbdfcf2e66') build() { - #cd "${srcdir}/${pkgname}-${pkgver}" - cd "${srcdir}/${pkgname}-2.38" - - export LDFLAGS="${LDFLAGS} -lXau -lm" - - ./configure --prefix=/usr \ - libdir=/usr/lib \ - libexecdir=/usr/lib/yash \ - bindir=/usr/bin \ - sbindir=/usr/bin \ - --enable-alias \ - --enable-array \ - --enable-dirstack \ - --enable-help \ - --enable-history \ - --enable-lineedit \ - --enable-nls \ - --enable-printf \ - --enable-socket \ - --enable-test \ - --enable-ulimit - make PREFIX=/usr + cd ${pkgname}-${pkgver} + ./configure \ + --prefix=/usr \ + --enable-array \ + --enable-dirstack \ + --enable-help \ + --enable-history \ + --enable-lineedit \ + --enable-nls \ + --enable-printf \ + --enable-socket \ + --enable-test \ + --enable-ulimit + make } package() { - #cd "${srcdir}/${pkgname}-${pkgver}" - cd "${srcdir}/${pkgname}-2.38" - - LDFLAGS="${LDFLAGS} -lXau -lm" - - make install DESTDIR="$pkgdir" \ - PREFIX=/usr \ - prefix=/usr \ - libdir=/usr/lib \ - libexecdir=/usr/lib/yash \ - bindir=/usr/bin \ - sbindir=/usr/bin + cd ${pkgname}-${pkgver} + make install DESTDIR="${pkgdir}" } -#Default to md5 as makepkg -g do, blame pacman dev team -md5sums=('7cdebec758b8301622d0e33e99305be2') diff --git a/yash.install b/yash.install index b8ad816cd0a5..6e1c5178e740 100755..100644 --- a/yash.install +++ b/yash.install @@ -1,5 +1,5 @@ post_install() { - grep -q '/usr/bin/yash' etc/shells || echo '/usr/bin/yash' >> etc/shells + grep -qe '^/usr/bin/yash$' etc/shells || echo '/usr/bin/yash' >> etc/shells } post_upgrade() { @@ -7,5 +7,5 @@ post_upgrade() { } pre_remove() { - sed -i '/^\/bin\/yash/d' etc/shells + sed -i -r '/^(\/usr)?\/bin\/yash$/d' etc/shells } |