Thu Sep 1 23:14:36 UTC 2011

13 files changed, 253 insertions, 44 deletions

diff --git a/community/courier-mta/PKGBUILD b/community/courier-mta/PKGBUILD
index 7b4722108..d4ceae821 100644
--- a/community/courier-mta/PKGBUILD
+++ b/community/courier-mta/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=courier-mta
 pkgver=0.66.3
-pkgrel=3
+pkgrel=4
 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -34,6 +34,7 @@ source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/couri
 		courier-mta.conf.d
         esmtpd.rc.d
         esmtpd-ssl.rc.d
+        esmtpd-msa.rc.d
         imapd.rc.d
         imapd-ssl.rc.d
         pop3d.rc.d
@@ -45,6 +46,7 @@ md5sums=('3b28f14afe3db09b74b4845323c3e982'
          'f3ff70b40c7a1f7a017e8c4cc4d92f4f'
          'caabce8c7b66296b602316aa5af5d4c5'
          '1c8b1b66ebafa4ff09ffc0106a9dc82c'
+         'dae6c7d5ff0cce0fba5729fedf2a9051'
          'd0cc5eab5d3e0ec33dadd0392421f63e'
          '5873a96aa149edda281730010fb4db34'
          'faa09e06a5dc41ee89ab1f8fa6886b63'
@@ -123,6 +125,7 @@ package() {
   install -D -m 755 ${srcdir}/pop3d-ssl.rc.d ${pkgdir}/etc/rc.d/pop3d-ssl
   install -D -m 755 ${srcdir}/esmtpd.rc.d ${pkgdir}/etc/rc.d/esmtpd
   install -D -m 755 ${srcdir}/esmtpd-ssl.rc.d ${pkgdir}/etc/rc.d/esmtpd-ssl
+  install -D -m 755 ${srcdir}/esmtpd-msa.rc.d ${pkgdir}/etc/rc.d/esmtpd-msa
   install -D -m 755 ${srcdir}/webmaild.rc.d ${pkgdir}/etc/rc.d/webmaild
    #install -Dm 655 ${srcdir}/courier-webmail-cleancache.cron.hourly \
    # ${pkgdir}/etc/cron.hourly/courier-webmail-cleancache
diff --git a/community/courier-mta/esmtpd-msa.rc.d b/community/courier-mta/esmtpd-msa.rc.d
new file mode 100644
index 000000000..31458aca8
--- /dev/null
+++ b/community/courier-mta/esmtpd-msa.rc.d
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+
+    [ -d /var/run/courier ] || mkdir -p /var/run/courier
+	chown courier:courier /var/run/courier
+    
+    if ck_daemon authdaemond; then
+      echo "ERROR: authdaemond is not running"
+      stat_fail
+      exit 1
+    fi
+
+    stat_busy "Starting Courier esmtpd-msa"
+    /usr/sbin/esmtpd-msa start
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon esmtpd-msa
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Courier esmtpd-msa"
+    /usr/sbin/esmtpd-msa stop > /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon esmtpd-msa
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/community/distcc/PKGBUILD b/community/distcc/PKGBUILD
index 8aeb60fd5..842d04da9 100644
--- a/community/distcc/PKGBUILD
+++ b/community/distcc/PKGBUILD
@@ -1,34 +1,42 @@
-# $Id: PKGBUILD 50002 2011-06-23 09:01:13Z spupykin $
+# $Id: PKGBUILD 55020 2011-08-31 13:12:35Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Judd Vinet <jvinet@zeroflux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=distcc
 pkgver=3.1
-pkgrel=3
+pkgrel=5
 pkgdesc="A distributed C, C++, Obj C compiler"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/distcc/"
 license=('GPL')
 depends=('gcc' 'popt')
-makedepends=('gtk2' 'pkgconfig')
-optdepends=('gtk2: for distccmon-gnome')
+makedepends=('gtk2' 'pkgconfig' 'python2')
+optdepends=('gtk2: for distccmon-gnome'
+	    'python2')
 backup=(etc/conf.d/distccd)
-source=(http://distcc.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 
-        distccd 
+source=(http://distcc.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
+        distccd
         distccd.conf.d)
-md5sums=('a1a9d3853df7133669fffec2a9aab9f3' 
+md5sums=('a1a9d3853df7133669fffec2a9aab9f3'
          '1c918474372c09304772c20c4de484fa'
          '89aaf6e9072092e283465a14e83f0f94')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  [ -f Makefile ] || ./configure --prefix=/usr \
+
+  [ -f Makefile ] || PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
               --with-gtk \
               --sysconfdir=/etc \
               --mandir=/usr/share/man
   make WERROR_CFLAGS= INCLUDESERVER_PYTHON=/usr/bin/python2
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+#  make TEST_PYTHON=/usr/bin/python2 check
+}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}/" INCLUDESERVER_PYTHON=/usr/bin/python2 install
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index c014840e9..237acf780 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 54994 2011-08-29 20:55:17Z spupykin $
+# $Id: PKGBUILD 55022 2011-08-31 13:26:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
 
@@ -12,18 +12,21 @@ _group=http
 
 pkgname=nginx
 pkgver=1.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
 arch=('i686' 'x86_64')
 depends=('pcre' 'zlib' 'openssl')
 url="http://nginx.org"
 license=('custom')
-backup=("etc/nginx/conf/nginx.conf"
+backup=("etc/nginx/conf/fastcgi.conf"
+	"etc/nginx/conf/fastcgi_params"
 	"etc/nginx/conf/koi-win"
 	"etc/nginx/conf/koi-utf"
-	"etc/nginx/conf/win-utf"
 	"etc/nginx/conf/mime.types"
-	"etc/nginx/conf/fastcgi_params"
+	"etc/nginx/conf/nginx.conf"
+	"etc/nginx/conf/scgi_params"
+	"etc/nginx/conf/uwsgi_params"
+	"etc/nginx/conf/win-utf"
 	"etc/logrotate.d/nginx"
 	"etc/conf.d/nginx")
 changelog=changelog
diff --git a/community/qconf/PKGBUILD b/community/qconf/PKGBUILD
new file mode 100644
index 000000000..771a74430
--- /dev/null
+++ b/community/qconf/PKGBUILD
@@ -0,0 +1,22 @@
+# $Id: PKGBUILD 55030 2011-08-31 16:23:53Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: DsTr <kostindima@gmail.com>
+
+pkgname=qconf
+pkgver=1.4
+pkgrel=2
+pkgdesc="QConf allows you to have a nice configure script for your qmake-based project."
+arch=(i686 x86_64)
+url="http://delta.affinix.com/qconf/"
+license=('GPL')
+depends=('qt')
+makedepends=()
+source=(http://delta.affinix.com/download/qconf-$pkgver.tar.bz2)
+md5sums=(e0080044f88c31e032008d5a5682a112)
+
+build() {
+  cd $srcdir/qconf-$pkgver
+  ./configure --prefix=/usr
+  make
+  make INSTALL_ROOT="$pkgdir" install
+}
diff --git a/community/speed-dreams/PKGBUILD b/community/speed-dreams/PKGBUILD
index 3686c44c2..63c8dbe13 100644
--- a/community/speed-dreams/PKGBUILD
+++ b/community/speed-dreams/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 54835 2011-08-26 20:12:54Z svenstaro $
+# $Id: PKGBUILD 55048 2011-09-01 02:59:17Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Adrián Chaves Fernández, aka Gallaecio <adriyetichaves@gmail.com>
 # Contributor: Shahar Weiss <sweiss4@gmx.net> (build() code from his TORCS' PKGBUILD)
 pkgname=speed-dreams
 pkgver=2.0.0a3
 _pkgver=2.0.0-a3-r3412
-pkgrel=2
+pkgrel=4
 pkgdesc="A racing simulator with rich graphics and physics"
 arch=('i686' 'x86_64')
 url="http://speed-dreams.sourceforge.net/"
@@ -45,7 +45,8 @@ package() {
   install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/speed-dreams.desktop"
 
   mkdir -p "${pkgdir}/usr/share/doc/${pkgname}"
-  cp -r doc "${pkgdir}/usr/share/doc/${pkgname}/"
+  cp -r doc/* "${pkgdir}/usr/share/doc/${pkgname}/"
+  rm -r "${pkgdir}/usr/share/doc/${pkgname}/man"
 
   mkdir -p "${pkgdir}/usr/share/man/man6/${pkgname}"
   rm doc/man/speed-dreams.es.6
diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD
index c5c34f94e..8c3abd375 100644
--- a/community/systemd/PKGBUILD
+++ b/community/systemd/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 54794 2011-08-25 17:29:00Z dreisner $
+# $Id: PKGBUILD 55043 2011-09-01 00:45:34Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=systemd
-pkgver=34
+pkgver=35
 pkgrel=1
 pkgdesc="Session and Startup manager"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2')
 depends=('dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172')
-makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'intltool' 'libnotify' 'gperf')
+makedepends=('docbook-xsl' 'gperf' 'libxslt' 'cryptsetup' 'gtk2' 'intltool' 'libnotify')
 optdepends=('cryptsetup: required for encrypted block devices'
             'dbus-python: systemd-analyze'
             'gtk2: systemadm'
@@ -31,7 +31,7 @@ backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
 install=systemd.install
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2"
         "os-release")
-md5sums=('35761c50d5fe8fa8d15a3c651ab8bace'
+md5sums=('6b37b385d22f28c184a04a4e6c3c69b4'
          '752636def0db3c03f121f8b4f44a63cd')
 
 build() {
@@ -44,7 +44,7 @@ build() {
 
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
-              --libexecdir=/usr/lib \
+              --libexecdir=/usr/lib/systemd \
               --libdir=/usr/lib \
               --localstatedir=/var \
               --with-rootdir= \
@@ -74,5 +74,4 @@ package() {
   for manpage in telinit halt reboot poweroff runlevel shutdown; do
     mv {,systemd.}"$manpage.8"
   done
-
 }
diff --git a/community/uqm/PKGBUILD b/community/uqm/PKGBUILD
index e4991fbe8..4d82315d6 100644
--- a/community/uqm/PKGBUILD
+++ b/community/uqm/PKGBUILD
@@ -1,41 +1,59 @@
+# Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Maintainer : Daenyth <Daenyth+Arch _AT_ gmail _DOT_ com>
 # Contributor : wizzomafizzo <wizzomafizzo@gmail.com>
 # Contributor: tochiro@no.spam.mail.berlios.de
 # Contributor: sh__
 
 pkgname=uqm
-pkgver=0.6.2
-pkgrel=5
+pkgver=0.7.0
+pkgrel=1
 pkgdesc="The Ur-Quan Masters is a port of Star Control 2"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://sc2.sf.net/"
 license=('GPL')
 depends=('libmikmod' 'libvorbis' 'sdl_image' 'libgl')
-makedepends=('imagemagick')
+makedepends=('imagemagick' 'mesa' 'namcap')
 optdepends=('uqm-sound: For extra music and conversation audio')
 source=(http://downloads.sourceforge.net/sourceforge/sc2/uqm-${pkgver}-source.tgz
-        http://downloads.sourceforge.net/sourceforge/sc2/uqm-0.6.0-content.uqm
-        config.state uqm)
-md5sums=('ba4ee595b62349873d510b9827e7648d' '7e8f0ed8490e24231431420ea2ba6a03'
-         '07f0a0e74a0b1c706940cc43d5a4160c' '07e64632fce6323a14ab558d0214b885')
+        http://downloads.sourceforge.net/sourceforge/sc2/uqm-${pkgver}-content.uqm
+        config.state
+        uqm
+        uqm.desktop
+        uqm.png)
+noextract=(uqm-${pkgver}-content.uqm)
+md5sums=('f9018ea0493d7dac6a9e1006b00af7df'
+         '2f36dcb15274dbbcb5e266f2ed84d5b2'
+         '07f0a0e74a0b1c706940cc43d5a4160c'
+         '07e64632fce6323a14ab558d0214b885'
+         '44c83b9b9d102b99210af0036749a318'
+         '06d0a72aa18e7edce6cd3c7a3a747c44')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver/sc2
+  cd $srcdir/$pkgname-$pkgver
   
   cp $srcdir/config.state .
   sed -e "/INPUT_install_prefix/ s|replaceme|$pkgdir/usr|" \
       -i config.state
 
-  echo | ./build.sh uqm config || return 1
+  echo | ./build.sh uqm config
+
+  ./build.sh uqm
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
 
-  ./build.sh uqm || return 1
   ./build.sh uqm install
 
-  install -Dm644 $srcdir/$pkgname-0.6.0-content.uqm \
-     $pkgdir/usr/share/uqm/content/packages/$pkgname-0.6.0-content.uqm
+  install -Dm644 $srcdir/$pkgname-$pkgver-content.uqm \
+     $pkgdir/usr/share/uqm/content/packages/$pkgname-$pkgver-content.uqm
+
+  # stolen from fedora!
+  install -Dm644 $srcdir/uqm.desktop \
+     $pkgdir/usr/share/applications/uqm.desktop
+  install -Dm644 $srcdir/uqm.png \
+     $pkgdir/usr/share/pixmaps/uqm.png
 
   rm $pkgdir/usr/bin/uqm
   install -Dm755 $srcdir/uqm $pkgdir/usr/bin/uqm
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/uqm/uqm.desktop b/community/uqm/uqm.desktop
new file mode 100644
index 000000000..7a0e46882
--- /dev/null
+++ b/community/uqm/uqm.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=The Ur-Quan Masters
+Comment=An epic space adventure
+Comment[fi]=Eeppinen avaruusseikkailu
+Exec=uqm
+Icon=uqm
+Terminal=false
+Type=Application
+Encoding=UTF-8
+Categories=Application;Game;ArcadeGame;StrategyGame;
diff --git a/community/uqm/uqm.png b/community/uqm/uqm.png
new file mode 100644
index 000000000..64765a43b
--- /dev/null
+++ b/community/uqm/uqm.png
diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD
index ab0ee832e..b829246a6 100644
--- a/community/usb_modeswitch/PKGBUILD
+++ b/community/usb_modeswitch/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 51652 2011-07-12 14:14:50Z spupykin $
+# $Id: PKGBUILD 55016 2011-08-31 09:35:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=usb_modeswitch
-pkgver=1.1.8
+pkgver=1.1.9
 pkgrel=1
-_pkgdata=20110705
+_pkgdata=20110805
 pkgdesc="Activating switchable USB devices on Linux."
 arch=('i686' 'x86_64')
 url="http://www.draisberghof.de/usb_modeswitch/"
@@ -15,9 +15,9 @@ backup=("etc/$pkgname.conf")
 source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2"
 	"http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2"
 	"http://www.draisberghof.de/usb_modeswitch/device_reference.txt")
-md5sums=('1aaaa45e0465843e4973d7778bfbafbb'
-         '5046e7be8d10d2fe699f9af21a0c3769'
-         'c441eb16a3901052ce882ca844be2a20')
+md5sums=('76f6978f18cac41f269a346a5d0f1052'
+         '0ed8a28f8efd3177a128ecd46fc8bf9f'
+         'e8e39e52e3cf7a38e483e7a80d382927')
 
 build() {
   cd $srcdir/usb-modeswitch-$pkgver/
diff --git a/community/xml2/01_use_libxml2_instead_of_libxml.patch b/community/xml2/01_use_libxml2_instead_of_libxml.patch
new file mode 100644
index 000000000..975060ed3
--- /dev/null
+++ b/community/xml2/01_use_libxml2_instead_of_libxml.patch
@@ -0,0 +1,70 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_use_libxml2_instead_of_libxml.dpatch by Daniel Leidert
+## <daniel.leidert@wgdd.de>
+##
+## DP: Make use of libxml2 instead of libxml
+
+@DPATCH@
+diff -urNad xml2-0.4~/2xml.c xml2-0.4/2xml.c
+--- xml2-0.4~/2xml.c	2003-12-24 21:28:48.000000000 +0100
++++ xml2-0.4/2xml.c	2008-03-12 09:32:17.345380803 +0100
+@@ -24,7 +24,7 @@
+ #include <assert.h>
+ #include <ctype.h>
+ 
+-#include <HTMLparser.h>
++#include <libxml/HTMLparser.h>
+ 
+ int do_html;
+ int in_tag = 0;
+@@ -104,7 +104,7 @@
+ 			fputs("/>",stdout);
+ 		else {
+ 			const htmlElemDesc *elem = NULL;
+-			if (do_html) elem = htmlTagLookup(name);
++			if (do_html) elem = htmlTagLookup((xmlChar *) name);
+ 			finish_tag();
+ 			if (NULL == elem || (!elem->endTag && !elem->empty)) {
+ 				fputs("</",stdout);
+diff -urNad xml2-0.4~/Makefile.am xml2-0.4/Makefile.am
+--- xml2-0.4~/Makefile.am	2008-02-07 16:58:13.000000000 +0100
++++ xml2-0.4/Makefile.am	2008-03-12 09:32:17.345380803 +0100
+@@ -1,9 +1,9 @@
+-AM_CPPFLAGS = $(XML_CFLAGS)
++AM_CFLAGS = $(XML_CFLAGS)
+ bin_PROGRAMS = xml2 2xml csv2 2csv
+ xml2_SOURCES = xml2.c
+-xml2_LDADD = -lxml
++xml2_LDADD = $(XML_LIBS)
+ 2xml_SOURCES = 2xml.c
+-2xml_LDADD = -lxml
++2xml_LDADD = $(XML_LIBS)
+ csv2_SOURCES = csv2.c
+ 2csv_SOURCES = 2csv.c
+ 
+diff -urNad xml2-0.4~/configure.ac xml2-0.4/configure.ac
+--- xml2-0.4~/configure.ac	2008-02-07 17:11:54.000000000 +0100
++++ xml2-0.4/configure.ac	2008-03-12 09:32:17.345380803 +0100
+@@ -11,7 +11,7 @@
+ AC_PROG_CC
+ 
+ # Checks for libraries.
+-PKG_CHECK_MODULES(XML, libxml)
++PKG_CHECK_MODULES(XML, libxml-2.0)
+ AC_SUBST(XML_LIBS)
+ AC_SUBST(XML_CFLAGS)
+ 
+diff -urNad xml2-0.4~/xml2.c xml2-0.4/xml2.c
+--- xml2-0.4~/xml2.c	2001-10-28 05:29:46.000000000 +0100
++++ xml2-0.4/xml2.c	2008-03-12 09:32:17.345380803 +0100
+@@ -24,8 +24,8 @@
+ #include <string.h>
+ #include <ctype.h>
+ 
+-#include <parser.h>
+-#include <HTMLparser.h>
++#include <libxml/parser.h>
++#include <libxml/HTMLparser.h>
+ 
+ struct node
+ {
diff --git a/community/xml2/PKGBUILD b/community/xml2/PKGBUILD
new file mode 100644
index 000000000..ab1fdd7fc
--- /dev/null
+++ b/community/xml2/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 55027 2011-08-31 14:49:55Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Orivej Desh <masecretaire@gmx.fr>
+# Maintainer: Orivej Desh <masecretaire@gmx.fr>
+
+pkgname=xml2
+pkgver=0.4
+pkgrel=2
+pkgdesc="XML/Unix Processing Tools to convert XML and HTML to and from a line-oriented format more amenable to processing by classic Unix pipeline processing tools"
+arch=("i686" "x86_64")
+url="http://www.ofb.net/~egnor/xml2/"
+license=("GPL")
+depends=("libxml2")
+source=("http://download.ofb.net/gale/$pkgname-$pkgver.tar.gz"
+        "01_use_libxml2_instead_of_libxml.patch")
+md5sums=('8a0ef16fe0b3e1495307318c590c1ec0'
+         '9e810be33d2abbc8aabd8203db1f9654')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i ../01_use_libxml2_instead_of_libxml.patch
+  autoreconf
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="$pkgdir" install
+  cd "$pkgdir/usr/bin"
+  rm html2 2html
+  ln -s xml2 html2
+  ln -s 2xml 2html
+}