Merged upstream, mesa needs revision

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

Conflicts:
	community-staging/gigi/PKGBUILD
	community-staging/lxdm/PKGBUILD
	community-staging/lxdm/lxdm-pam
	community-staging/lxdm/lxdm.install
	community-staging/lxdm/service
	community-testing/gigi/PKGBUILD
	community/calf/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gmic/PKGBUILD
	community/gnash/PKGBUILD
	community/prboom/PKGBUILD
	community/scorched3d/PKGBUILD
	community/tmux/PKGBUILD
	community/torcs/PKGBUILD
	core/curl/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/akonadi/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/ftgl/PKGBUILD
	extra/gcin/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/mesa/PKGBUILD
	extra/python-telepathy/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/ruby/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-xkb-plugin/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/baobab/PKGBUILD
	gnome-unstable/epiphany/PKGBUILD
	gnome-unstable/gdm/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-games/PKGBUILD
	gnome-unstable/gnome-screensaver/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/libpeas/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/mutter/PKGBUILD
	gnome-unstable/networkmanager/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-gnutls/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/lib32-sqlite/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD
	staging/calligra/PKGBUILD
	staging/inkscape/PKGBUILD
	staging/kdebase-workspace/PKGBUILD
	staging/kdebase-workspace/kde-np.pam
	staging/kdebase-workspace/kde.pam
	staging/kdebase-workspace/kdm.service
	staging/libreoffice/PKGBUILD
	staging/libreoffice/libreoffice-common.csh
	staging/libreoffice/libreoffice-common.sh
	staging/poppler/PKGBUILD
	testing/dbus-python/PKGBUILD
	testing/e2fsprogs/PKGBUILD
	testing/iproute2/PKGBUILD
	testing/iptables/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdebase-workspace/kde-np.pam
	testing/kdebase-workspace/kde.pam
	testing/kdebindings-python/PKGBUILD
	testing/lvm2/PKGBUILD
	testing/lvm2/lvm-on-crypt.service
	testing/lvm2/lvm.service
	testing/miro/PKGBUILD
	testing/postgresql/PKGBUILD
	testing/postgresql/postgresql.install
	testing/postgresql/postgresql.service
	testing/ppp/PKGBUILD
	testing/ppp/ip-down
	testing/pyqt/PKGBUILD
	testing/qscintilla/PKGBUILD
	testing/sip/PKGBUILD
	testing/systemd/PKGBUILD
	testing/systemd/systemd.install
	testing/util-linux/PKGBUILD
	testing/wpa_supplicant/PKGBUILD
	testing/wpa_supplicant/config
	testing/xf86-video-intel/PKGBUILD

2 files changed, 15 insertions, 2 deletions

diff --git a/community/pptpd/PKGBUILD b/community/pptpd/PKGBUILD
index b6d9382da..ab5e4d45c 100644
--- a/community/pptpd/PKGBUILD
+++ b/community/pptpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 74350 2012-07-25 10:18:29Z spupykin $
+# $Id: PKGBUILD 77852 2012-10-15 09:47:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=pptpd
 pkgver=1.3.4
-pkgrel=10
+pkgrel=11
 pkgdesc="Poptop server"
 arch=(i686 x86_64 'mips64el')
 url="http://poptop.sourceforge.net/"
@@ -12,9 +12,11 @@ depends=(ppp glibc)
 backup=(etc/pptpd.conf)
 source=(http://downloads.sourceforge.net/sourceforge/poptop/pptpd-$pkgver.tar.gz
 	pptpd
+	pptpd.service
 	unrecognized-opt.patch)
 md5sums=('b38df9c431041922c997c1148bedf591'
          'e09f81beb5d59a0fdfba94e3a60d992b'
+         '144c17c7d5c1b95cfb3450eb73aa2e50'
          'cfa02c86d0413eb94fac15599986f54c')
 
 build() {
@@ -38,6 +40,7 @@ package() {
   mkdir -p $pkgdir/etc/
   echo -e "# Read man pptpd.conf, see samples in /usr/share/doc/pptpd\n# and write your pptpd configuration here" >$pkgdir/etc/pptpd.conf
   install -Dm0755 ../pptpd $pkgdir/etc/rc.d/pptpd
+  install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
   mkdir -p $pkgdir/usr/share/doc/pptpd
   cp -a samples $pkgdir/usr/share/doc/pptpd/
 }
diff --git a/community/pptpd/pptpd.service b/community/pptpd/pptpd.service
new file mode 100644
index 000000000..739508b60
--- /dev/null
+++ b/community/pptpd/pptpd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=PPTP Server
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid -f
+StandardOutput=null
+
+[Install]
+WantedBy=multi-user.target