Made configuration via config.h more flexible.

1 files changed, 35 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d2cbc2d..19eeba5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,21 +5,51 @@
 
 pkgname=st
 pkgver=0.8.2
-pkgrel=3
+pkgrel=4
 pkgdesc='A simple virtual terminal emulator for X.'
 arch=('i686' 'x86_64' 'armv7h')
 license=('MIT')
 depends=(libxft)
 makedepends=(libxext ncurses)
 url="http://st.suckless.org"
-source=(http://dl.suckless.org/st/$pkgname-$pkgver.tar.gz config.h)
-sha256sums=('aeb74e10aa11ed364e1bcc635a81a523119093e63befd2f231f8b0705b15bf35' 'SKIP')
+source=(http://dl.suckless.org/st/$pkgname-$pkgver.tar.gz)
+sha256sums=('aeb74e10aa11ed364e1bcc635a81a523119093e63befd2f231f8b0705b15bf35')
 
 prepare() {
   sed '/@tic/d' -i $pkgname-$pkgver/Makefile
 
-  # user is supposed to maintain config.h him/herself
-  cp $srcdir/config.h $srcdir/$pkgname-$pkgver/config.h
+  # This package provides a mechanism to provide a custom config.h. Multiple
+  # configuration states are determined by the presence of two files in
+  # $startdir:
+  #
+  # * 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.
+  #
+  # 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=
+  if [ -e "$startdir/config.h" ]
+  then
+    cp "$startdir/config.h" "$pkgname-$pkgver"
+  elif [ ! -e "$startdir/config.def.h" ]
+  then
+    abort=1
+    msg='This package can be configured in config.h. Copy provided '
+    msg+='config.def.h to config.h and modify to change configuration. Leave '
+    msg+='config.def.h as it is to use default values. Then rerun makepkg.'
+    error "$msg"
+  fi
+  cp "$pkgname-$pkgver/config.def.h" "$startdir"
+  test -z "$abort"
 }
 
 build() {