Merge remote-tracking branch 'aur/master'

PKGBUILD

@@ -5,66 +5,62 @@
 
 pkgname=st
 pkgver=0.8.2
-pkgrel=7
+pkgrel=10
 pkgdesc='A simple virtual terminal emulator for X.'
 arch=('i686' 'x86_64' 'armv7h')
 license=('MIT')
 depends=(libxft)
-makedepends=(libxext ncurses)
 url=https://st.suckless.org
 source=(https://dl.suckless.org/$pkgname/$pkgname-$pkgver.tar.gz
         config.h
         https://st.suckless.org/patches/nordtheme/st-nordtheme-0.8.2.diff
         https://st.suckless.org/patches/scrollback/st-scrollback-20190331-21367a0.diff
-        https://st.suckless.org/patches/scrollback/st-scrollback-mouse-0.8.diff)
+        https://st.suckless.org/patches/scrollback/st-scrollback-mouse-0.8.diff
+        terminfo.patch
+        README.terminfo.rst)
 sha256sums=('aeb74e10aa11ed364e1bcc635a81a523119093e63befd2f231f8b0705b15bf35'
             '8fc9a87a5bac9e4eebd4f7683e009aa34d74e9e0cbd0f2cc5e60f3fd01d40f3f'
-            'bd7c467dba6027c156d1bd1f3b65d8666787d3c2ff5c743e54e19c6d79a5ba96'
+            '01de8a6d0d855c31496c7963e78edb7565a81b60dcb9e9f00dd3eab1f43b526b'
             'f974bc0e11bda909a6d6d529d28abde4c97e651107b6a6047f2fab8837010b43'
-            '3fb38940cc3bad3f9cd1e2a0796ebd0e48950a07860ecf8523a5afd0cd1b5a44')
-_makedir=$pkgname-$pkgver
-_makeopts="--directory=$_makedir"
+            '3fb38940cc3bad3f9cd1e2a0796ebd0e48950a07860ecf8523a5afd0cd1b5a44'
+            'bf6c8b73a606a8e513c7919d91f93ed7aeb5f44e80269bb244cc01659145a5ea'
+            '0ebcbba881832adf9c98ce9fe7667c851d3cc3345077cb8ebe32702698665be2')
+_sourcedir=$pkgname-$pkgver
+_makeopts="--directory=$_sourcedir"
 
 prepare() {
-  # Do not install terminfo files, as they conflict with ncurses.
-  sed -r \
-    -e '/^[[:space:]]+tic\>/d' \
-    -e '/^[[:space:]]+@echo .* terminfo/d' \
-    -i $_makedir/Makefile
+  patch --directory="$_sourcedir" --strip=0 < terminfo.patch
 
   # 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: The user has supplied his or her configuration. The file will
-  #   be copied to $srcdir and used during build.
-  # * config.def.h only: The user was previously made aware of the
-  #   configuration options and has opted not to make any configuration
-  #   changes. The package is built using default values.
-  # * neither file: Initial state. The user receives a message on how to
-  #   configure this package. The build process is aborted after the copy
-  #   operation below.
+  # 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 provide an up to
-  # date template for the user. If neither file was present initially, further
-  # build steps are aborted at this point. Even if no config.h is provided,
-  # future runs will proceed with default values due to the presence of
-  # config.def.h.
-  abort=
+  # 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" "$_makedir"
+    cp "$BUILDDIR/config.h" "$_sourcedir"
   elif [ ! -e "$BUILDDIR/config.def.h" ]
   then
-    abort=1
-    msg='This package can be configured in config.h. Copy config.def.h just '
-    msg+='placed into the package directory to config.h and modify it to '
-    msg+='change the configuration. Or just leave it alone to use default '
-    msg+='values. Then restart the build process.'
-    error "$msg"
+    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 "$_makedir/config.def.h" "$BUILDDIR"
-  test -z "$abort"
+  cp "$_sourcedir/config.def.h" "$BUILDDIR"
 
   # apply patches
   cd $srcdir/$pkgname-$pkgver/
@@ -83,6 +79,8 @@ package() {
   local licdir="$shrdir/licenses/$pkgname"
   local docdir="$shrdir/doc/$pkgname"
   make $_makeopts PREFIX=/usr DESTDIR="$pkgdir" install
-  install $installopts "$licdir" "$_makedir/LICENSE"
-  install $installopts "$docdir" "$_makedir/README"
+  install $installopts "$licdir" "$_sourcedir/LICENSE"
+  install $installopts "$docdir" "$_sourcedir/README"
+  install $installopts "$docdir" README.terminfo.rst
+  install $installopts "$shrdir/$pkgname" "$_sourcedir/st.info"
 }