Merge pull request #16 from DanielOaks/arch-dist-update

Updated Arch distribution files

distribution/arch/PKGBUILD.git.example

@@ -2,7 +2,7 @@
 # Rename to PKGBUILD to build via makepkg
 _pkgname=civetweb
 pkgname=$_pkgname-git
-pkgver=20130820
+pkgver=v1.4.24.g73c40b6
 pkgrel=1
 pkgdesc="Small and quick-to-use web server; https/php/cgi support; MIT license - git development version"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://sourceforge.net/p/civetweb/"
 license=('MIT')
 groups=()
 depends=()
-makedepends=('git')
+makedepends=('git sed')
 optdepends=('php-cgi: for php support')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
@@ -18,20 +18,25 @@ backup=("etc/$_pkgname/$_pkgname.conf")
 source=("$_pkgname::git+https://github.com/sunsetbrew/civetweb.git")
 md5sums=('SKIP')
 
-#pkgver() {
-#  cd "$srcdir/$_pkgname"
-#  echo "0.$(git rev-list --count HEAD).$(git describe --always)"
-#}
+pkgver() {
+  cd "$srcdir/$_pkgname"
+  git describe --tags | sed 's|-|.|g'
+}
 
 build() {
   cd "$srcdir/$_pkgname"
-  make build WITH_IPV6=1 WITH_LUA=1
+  make build WITH_IPV6=1
 }
 
 package() {
-  make install "PREFIX=$pkgdir" TARGET_OS=LINUX
-  install -d -m 755 "$pkgdir/usr/lib/systemd/system"
-  install -m 644 "$srcdir/$_pkgname/distribution/arch/$_pkgname.service" "$pkgdir/usr/lib/systemd/system/$_pkgname.service"
+  cd "$srcdir/$_pkgname"
+  make install PREFIX="$pkgdir/usr" SYSCONFDIR="$pkgdir/etc/local/$_pkgname"
+  
+  install -Dm644 "$srcdir/$_pkgname/distribution/arch/$_pkgname.service" "$pkgdir/usr/lib/systemd/system/$_pkgname.service"
+
+  sed -i "s/^document_root [^\n]*/document_root \/srv\/http/g" "$pkgdir/etc/local/$_pkgname/$_pkgname.conf"
+  sed -i "s/^# access_log_file/access_log_file \/var\/log\/$_pkgname\/access.log/g" "$pkgdir/etc/local/$_pkgname/$_pkgname.conf"
+  sed -i "s/^# error_log_file/access_log_file \/var\/log\/$_pkgname\/error.log/g" "$pkgdir/etc/local/$_pkgname/$_pkgname.conf"
 }
 
 # vim:set ts=2 sw=2 et:

distribution/arch/civetweb.conf

@@ -1,13 +0,0 @@
-document_root /usr/local/share/doc/civetweb
-listening_ports 8080
-
-access_log_file /var/log/civetweb-access.log
-error_log_file  /var/log/civetweb-error.log
-
-access_control_list -0.0.0.0/0,+127.0.0.1
-authentication_domain localhost
-
-index_files index.html,index.htm,index.php
-
-# cgi_interpreter /usr/bin/php-cgi
-# cgi_extensions  php