Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/conntrack-tools/01-config-file-path.patch
	community-testing/conntrack-tools/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/gigi/PKGBUILD
	community-testing/glob2/PKGBUILD
	community-testing/megaglest/PKGBUILD
	community-testing/openimageio/PKGBUILD
	community/gtk2hs-buildtools/PKGBUILD
	community/haddock/PKGBUILD
	community/haskell-dataenc/PKGBUILD
	community/haskell-ghc-paths/PKGBUILD
	community/haskell-haskeline/PKGBUILD
	community/haskell-hslogger/PKGBUILD
	community/haskell-tar/PKGBUILD
	community/haskell-terminfo/PKGBUILD
	community/haskell-utf8-string/PKGBUILD
	community/haskell-x11-xft/PKGBUILD
	community/libnetfilter_acct/PKGBUILD
	community/libnetfilter_conntrack/PKGBUILD
	community/libnetfilter_queue/PKGBUILD
	community/libnfnetlink/PKGBUILD
	community/sfk/PKGBUILD
	extra/cabal-install/PKGBUILD
	extra/claws-mail/PKGBUILD
	extra/haskell-http/PKGBUILD
	extra/haskell-mtl/PKGBUILD
	extra/haskell-network/PKGBUILD
	extra/haskell-parsec/PKGBUILD
	extra/haskell-text/PKGBUILD
	extra/haskell-transformers/PKGBUILD
	extra/haskell-zlib/PKGBUILD
	extra/nx/PKGBUILD
	extra/ocaml/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/lib32-dbus-core/PKGBUILD
	multilib/lib32-gnutls/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-libxcb/PKGBUILD
	multilib/libtool-multilib/PKGBUILD
	social/squirm/PKGBUILD
	staging/kdebindings-python/PKGBUILD
	testing/curl/PKGBUILD
	testing/dnsutils/PKGBUILD
	testing/dnsutils/remove-bind.patch
	testing/mesa/PKGBUILD
	testing/openldap/PKGBUILD
	testing/pam/PKGBUILD
	testing/subversion/PKGBUILD
	testing/systemd/PKGBUILD
	testing/sysvinit/PKGBUILD

2 files changed, 20 insertions, 9 deletions

diff --git a/extra/xsp/PKGBUILD b/extra/xsp/PKGBUILD
index 24ce7a846..88b3f9217 100644
--- a/extra/xsp/PKGBUILD
+++ b/extra/xsp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156037 2012-04-11 18:58:41Z daniel $
+# $Id: PKGBUILD 168400 2012-10-10 22:19:53Z tomegun $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=xsp
 pkgver=2.10.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A simple webserver based on mono - provides ASP.NET support"
 arch=(i686 x86_64 'mips64el')
 license=('custom')
@@ -12,12 +12,8 @@ url="http://www.go-mono.com"
 depends=('mono>=2.10.2' 'sqlite')
 options=(!makeflags)
 install=${pkgname}.install
-source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
-        ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp)
-md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6'
-         '9575bd7d6f64d51ba05bdd6370665858'
-         '35d921df0fefc30f47a438c95d420efc'
-         'c917c07f68b945691506c29750db482f')
+source=(http://download.mono-project.com/sources/xsp/xsp-2.10.2.tar.bz2
+        ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp ${pkgname}.service)
 
 build() {
  # get rid of that .wapi errors; thanks to brice
@@ -57,5 +53,12 @@ package(){
   install -D -m644 ${srcdir}/${pkgname}.webapp \
     ${pkgdir}/etc/${pkgname}/${pkgname}.webapp
   install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-
+ # install systemd service file
+  install -D -m644 ${srcdir}/${pkgname}.service \
+    ${pkgdir}/usr/lib/systemd/system/xsp.service
 }
+md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6'
+         '9575bd7d6f64d51ba05bdd6370665858'
+         '35d921df0fefc30f47a438c95d420efc'
+         'c917c07f68b945691506c29750db482f'
+         '9d83bd36d209f8d36a11dfbc4fa50819')
diff --git a/extra/xsp/xsp.service b/extra/xsp/xsp.service
new file mode 100644
index 000000000..36b802e21
--- /dev/null
+++ b/extra/xsp/xsp.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=XSP Web Server
+
+[Service]
+ExecStart=/usr/bin/xsp --appconfigdir /etc/xsp --nonstop
+
+[Install]
+WantedBy=multi-user.target