summaryrefslogtreecommitdiff
path: root/community/yaws
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2013-01-20 15:38:15 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2013-01-20 15:38:15 -0300
commitc28258d27bd9d58760eb647f912bb98a536aa753 (patch)
tree261e61872b291c02790e5483c769710942547731 /community/yaws
parenteefed5e3db847eccce0207f89c7430b9ec4994b7 (diff)
parent949fa4e5ed405aaddcebff7e21008f03cdffa580 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/erlang/PKGBUILD community/fcitx-mozc/PKGBUILD community/geda-gaf/PKGBUILD community/mplayer2/PKGBUILD community/parcellite/PKGBUILD community/python2-pytables/PKGBUILD community/ruby-gtk2/PKGBUILD core/kbd/PKGBUILD core/systemd/PKGBUILD extra/calligra/PKGBUILD extra/dmapi/PKGBUILD extra/gstreamer0.10-ugly/PKGBUILD extra/gvfs/PKGBUILD extra/libcdio/PKGBUILD extra/libtorrent-rasterbar/PKGBUILD extra/llvm/PKGBUILD extra/nx/PKGBUILD extra/ocaml/PKGBUILD extra/php-xcache/PKGBUILD extra/qtwebkit/PKGBUILD extra/vcdimager/PKGBUILD extra/w3m/PKGBUILD extra/xorg-bdftopcf/PKGBUILD extra/xorg-xcalc/PKGBUILD extra/xorg-xconsole/PKGBUILD extra/xorg-xedit/PKGBUILD extra/xorg-xmag/PKGBUILD extra/xorg-xmessage/PKGBUILD extra/xorg-xvidtune/PKGBUILD libre/unzip-libre/PKGBUILD social/opentracker/PKGBUILD
Diffstat (limited to 'community/yaws')
-rw-r--r--community/yaws/PKGBUILD13
-rw-r--r--community/yaws/yaws.service1
2 files changed, 8 insertions, 6 deletions
diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD
index f88fe5655..402d60541 100644
--- a/community/yaws/PKGBUILD
+++ b/community/yaws/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 80743 2012-12-01 19:51:02Z arodseth $
+# $Id: PKGBUILD 82428 2013-01-17 13:32:57Z arodseth $
# Maintainer: Vesa Kaihlavirta
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Patrick Smits <mail@patricksmits.net>
pkgname=yaws
pkgver=1.95
-pkgrel=3
+pkgrel=4
pkgdesc='Yet Another Web Server, pure Erlang HTTP server/framework'
arch=('x86_64' 'i686' 'mips64el')
url='http://yaws.hyber.org/'
@@ -14,18 +14,19 @@ depends=('pam' 'erlang')
backup=('etc/yaws/yaws.conf')
options=('!emptydirs')
install=$pkgname.install
+optdepends=('erlang-nox: erlang without X')
source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz"
"$pkgname.service")
sha256sums=('e4efae836561f5e8a1324a5c9ab63fb82468e9dc93dc95cb4cb6248ab6b95406'
- 'cce672e0bc73f536186bdbb8ac139d8000db4bd67f5fdeff84fdc4b4f8bd84f9')
+ '3f8347add6e3741e77f7bb9ba6b31feb1c878e2e58ecf19063891e801fa24698')
build() {
cd "$pkgname-$pkgver"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
- for file in www/cgi.yaws www/cgi-bin/foo.py; do
- # python2 fix
- sed -i '0,/on/s//on2/' "$file"
+ # python2 fix
+ for file in cgi.yaws cgi-bin/foo.py; do
+ sed -i '0,/on/s//on2/' "www/$file"
done
make
}
diff --git a/community/yaws/yaws.service b/community/yaws/yaws.service
index 48f9bb8ef..7e2ced32d 100644
--- a/community/yaws/yaws.service
+++ b/community/yaws/yaws.service
@@ -4,6 +4,7 @@ After=syslog.target network.target
[Service]
Type=forking
+GuessMainPID=no
ExecStart=/usr/bin/yaws --daemon --heart
ExecReload=/usr/bin/yaws --hup
ExecStop=/usr/bin/yaws --stop