terminfo updates

PKGBUILD

@@ -1,22 +1,28 @@
-# Maintainer: Tarmo Heiskanen <turskii@gmail.com>
-# Contributor: mar77i <mar77i at mar77i dot ch>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Scytrin dai Kinthra <scytrin@gmail.com>
+# Maintainer:  Vincent Grande <shoober420@gmail.com>
+# Contributor: Jose Riha <jose1711 gmail com>
+# Contributor: Sebastian J. Bronner <waschtl@sbronner.com>
+# Contributor: Patrick Jackson <PatrickSJackson gmail com>
+# Contributor: Christoph Vigano <mail@cvigano.de>
 
 pkgname=st-git
-pkgver=0.8.2.r20.g8386642
+pkgver=0.8.3.r6.g914fb82
 pkgrel=1
-pkgdesc='Simple virtual terminal emulator for X'
-url='https://st.suckless.org/'
-arch=('i686' 'x86_64')
+pkgdesc='A simple virtual terminal emulator for X.'
+arch=('i686' 'x86_64' 'armv7h')
 license=('MIT')
-depends=('libxft')
-makedepends=('ncurses' 'libxext' 'git')
-source=('git://git.suckless.org/st')
-sha1sums=('SKIP')
-provides=("st")
-conflicts=("st")
-
+depends=(libxft)
+provides=(st)
+conflicts=(st)
+url=https://st.suckless.org
+source=(git://git.suckless.org/st
+	terminfo.patch
+	README.terminfo.rst)
+sha256sums=(SKIP
+	    SKIP
+            SKIP)
+_gitname="st"	    
+_sourcedir="$_gitname"
+_makeopts="--directory=$_sourcedir"
 
 pkgver() {
     cd "${srcdir}/st"
@@ -24,25 +30,51 @@ pkgver() {
 }
 
 prepare() {
-    cd "${srcdir}/st"
 
-    echo 'Copying config.def.h to $startdir...'
-    cp config.def.h "${startdir}/"
-
-    echo 'Copying config.h from $startdir if it exists...'
-    [ -f "${startdir}/config.h" ] && cp "${startdir}/config.h" . || true
+  # This package provides a mechanism to provide a custom config.h. Multiple
+  # configuration states are determined by the presence of two files in
+  # $BUILDDIR:
+  #
+  # config.h  config.def.h  state
+  # ========  ============  =====
+  # absent    absent        Initial state. The user receives a message on how
+  #                         to configure this package.
+  # absent    present       The user was previously made aware of the
+  #                         configuration options and has not made any
+  #                         configuration changes. The package is built using
+  #                         default values.
+  # present                 The user has supplied his or her configuration. The
+  #                         file will be copied to $srcdir and used during
+  #                         build.
+  #
+  # After this test, config.def.h is copied from $srcdir to $BUILDDIR to
+  # provide an up to date template for the user.
+  if [ -e "$BUILDDIR/config.h" ]
+  then
+    cp "$BUILDDIR/config.h" "$_sourcedir"
+  elif [ ! -e "$BUILDDIR/config.def.h" ]
+  then
+    msg='This package can be configured in config.h. Copy the config.def.h '
+    msg+='that was just placed into the package directory to config.h and '
+    msg+='modify it to change the configuration. Or just leave it alone to '
+    msg+='continue to use default values.'
+    warning "$msg"
+  fi
+  cp "$_sourcedir/config.def.h" "$BUILDDIR"
 }
 
 build() {
-    cd "${srcdir}/st"
-
-    make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
+  make $_makeopts X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
 }
 
 package() {
-    cd "${srcdir}/st"
-
-    make PREFIX=/usr DESTDIR="${pkgdir}" TERMINFO="/dev/null" install
-    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    install -Dm644 README "${pkgdir}/usr/share/doc/${pkgname}/README"
+  local installopts='--mode 0644 -D --target-directory'
+  local shrdir="$pkgdir/usr/share"
+  local licdir="$shrdir/licenses/$pkgname"
+  local docdir="$shrdir/doc/$pkgname"
+  make $_makeopts PREFIX=/usr DESTDIR="$pkgdir" install
+  install $installopts "$licdir" "$_sourcedir/LICENSE"
+  install $installopts "$docdir" "$_sourcedir/README"
+  install $installopts "$docdir" README.terminfo.rst
+  install $installopts "$shrdir/$pkgname" "$_sourcedir/st.info"
 }