[arch-commits] Commit in yaws/trunk (PKGBUILD yaws.install)

[Alexander Rødseth]

    Date: Tuesday, May 29, 2018 @ 07:54:29
  Author: arodseth
Revision: 333140

upgpkg: yaws 2.0.5-1

Modified:
  yaws/trunk/PKGBUILD
  yaws/trunk/yaws.install

--------------+
 PKGBUILD     |   30 +++++++++++++++---------------
 yaws.install |    2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-29 07:54:01 UTC (rev 333139)
+++ PKGBUILD	2018-05-29 07:54:29 UTC (rev 333140)
@@ -1,33 +1,31 @@
 # $Id$
 # Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
-# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
+# Contributor: Vesa Kaihlavirta <vegai at iki.fi>
 # Contributor: Patrick Smits <mail at patricksmits.net>
 
 pkgname=yaws
-pkgver=2.0.4
-pkgrel=3
+pkgver=2.0.5
+pkgrel=1
 pkgdesc='Web server/framework written in Erlang'
 arch=('x86_64')
 url='http://yaws.hyber.org/'
 license=('BSD')
-depends=('pam' 'erlang-nox')
+depends=('erlang-nox' 'pam')
 backup=('etc/yaws/yaws.conf')
 options=('!emptydirs')
 install="$pkgname.install"
-source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz" # no https
+source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz"
         "$pkgname.service")
-sha256sums=('da6677c315aadc7c64c970ef74eaa29f61eba886c7d30c61806651ac38c1e6c5'
+sha256sums=('be82d1b5bcd9d32406244eb4f542e653a2d9d82cf34bc3c61e15d26e84db7601'
             '3628a0f6fdacc91c216cb782e3f3da638958cca6eee34a0a1e692482659109db')
 
 prepare() {
   cd "$pkgname-$pkgver"
 
-  # use python2
-  for f in cgi.yaws cgi-bin/foo.py; do
-    sed -i 's:n/python:n/python2:' "www/$f"
-  done
+  # python2 fix
+  sed -i 's:n/python:n/python2:' www/cgi{.yaws,-bin/foo.py}
 
-  # don't treat warnings as errors just now
+  # treat warnings as warnings
   sed -i 's/-Werror//g' include.mk
 }
 
@@ -35,7 +33,7 @@
   cd "$pkgname-$pkgver"
 
   export wwwdir=/srv/http/yaws
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc
   make
 }
 
@@ -43,6 +41,7 @@
   cd "$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
+
   install -d "$pkgdir/usr/lib/erlang/lib"
   ln -s /usr/lib/yaws "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver"
   install -Dm644 "$srcdir/$pkgname.service" \
@@ -50,11 +49,12 @@
   install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
-  # path fixes
+  # path fix
   cp -ru examples/include "$pkgdir/usr/lib/yaws-$pkgver/examples/"
   mv "$pkgdir/srv/http/yaws/"* "$pkgdir/srv/http/www" || true
-  rmdir "$pkgdir/srv/http/yaws" || true
+  rmdir --ignore-fail-on-non-empty "$pkgdir/srv/http/yaws"
   mv "$pkgdir/srv/http/www" "$pkgdir/srv/http/yaws" || true
 }
 
-# vim:set ts=2 sw=2 et:
+# getver: raw.githubusercontent.com/klacke/yaws/master/vsn.mk
+# vim: ts=2 sw=2 et:

Modified: yaws.install
===================================================================
--- yaws.install	2018-05-29 07:54:01 UTC (rev 333139)
+++ yaws.install	2018-05-29 07:54:29 UTC (rev 333140)
@@ -10,4 +10,4 @@
   rmdir --ignore-fail-on-non-empty /var/log/yaws
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et: