Fri Jun 24 23:06:35 UTC 2011

15 files changed, 343 insertions, 56 deletions

diff --git a/community/distcc/PKGBUILD b/community/distcc/PKGBUILD
index bd278b623..8aeb60fd5 100644
--- a/community/distcc/PKGBUILD
+++ b/community/distcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 59085 2009-11-20 06:29:43Z giovanni $
+# $Id: PKGBUILD 50002 2011-06-23 09:01:13Z spupykin $
 # Maintainer: Judd Vinet <jvinet@zeroflux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
@@ -22,12 +22,16 @@ md5sums=('a1a9d3853df7133669fffec2a9aab9f3'
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
+  [ -f Makefile ] || ./configure --prefix=/usr \
               --with-gtk \
               --sysconfdir=/etc \
-              --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}/" install || return 1
+              --mandir=/usr/share/man
+  make WERROR_CFLAGS= INCLUDESERVER_PYTHON=/usr/bin/python2
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}/" INCLUDESERVER_PYTHON=/usr/bin/python2 install
   install -D -m644 ${srcdir}/distccd.conf.d ${pkgdir}/etc/conf.d/distccd
   install -D -m755 ${srcdir}/distccd ${pkgdir}/etc/rc.d/distccd
 
diff --git a/community/freecol/PKGBUILD b/community/freecol/PKGBUILD
index edff300d7..cfebf4ac5 100644
--- a/community/freecol/PKGBUILD
+++ b/community/freecol/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 30919 2010-10-23 14:21:56Z svenstaro $
+# $Id: PKGBUILD 49898 2011-06-22 11:19:02Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: TDY <tdy@gmx.com>
 # Contributor: Nelson Menon <nelsonmenon@gmail.com insanatorium.wordpress.com>
 
 pkgname=freecol
-pkgver=0.9.5
+pkgver=0.10.0
 pkgrel=1
 pkgdesc="A turn-based strategy game based on Colonization"
 arch=('i686' 'x86_64')
 url="http://www.freecol.org/"
 license=('GPL')
 depends=('java-runtime')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.zip
         fc.desktop fc.sh)
-md5sums=('6d5cb3b18cede24196f360b225ff7ccc'
+md5sums=('281c27b6222fa586823db7cad4a8ea3a'
          '55594d770904af3e3e3852d375085357'
          'ae473cd1d86f8f764250ee00b6fda90b')
 
diff --git a/community/hsolink/PKGBUILD b/community/hsolink/PKGBUILD
index 260717406..0f496da75 100644
--- a/community/hsolink/PKGBUILD
+++ b/community/hsolink/PKGBUILD
@@ -1,21 +1,28 @@
+# $Id: PKGBUILD 50013 2011-06-23 12:34:22Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
 
 pkgname=hsolink
 pkgver=1.0.118
-pkgrel=6
+pkgrel=7
 pkgdesc="HSO command line connection utility"
 arch=('i686' 'x86_64')
 url="http://www.pharscape.org/hsolinkcontrol.html"
 license=('GPL2')
-depends=('ozerocdoff')
+depends=('ozerocdoff' 'net-tools')
 install=hsolink.install
 source=("http://www.pharscape.org/downloads1.html/$pkgname-$pkgver.tar.gz")
 md5sums=('8b5b179c487b7ad95112fe74dea7e302')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr || return 1
-  make DESTDIR="$pkgdir/" install || return 1
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
   chgrp network "$pkgdir"/usr/bin/hsolinkcontrol
   chmod ug+s "$pkgdir"/usr/bin/hsolinkcontrol
 }
diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD
index c942a6761..3e784e39e 100644
--- a/community/libmicrohttpd/PKGBUILD
+++ b/community/libmicrohttpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 47393 2011-05-22 11:59:43Z jelle $
+# $Id: PKGBUILD 50018 2011-06-23 13:20:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Norberto Lopes <shelika@mail.telepac.pt>
 # Contributor: Kao Dome <kaodome@gmail.com>
@@ -6,7 +6,7 @@
 # Contributor: Mathias Rohnstock <linksoft@gmx.de>
 
 pkgname=libmicrohttpd
-pkgver=0.9.11
+pkgver=0.9.12
 pkgrel=1
 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ options=('!libtool')
 depends=('gnutls')
 install=libmicrohttpd.install
 source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz)
-md5sums=('69b97b11437e53863e92d5f0221f339b')
+md5sums=('35b000cd7d201ace2b071d53a02b2c0d')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD
index f6d6bd0b3..383fa7e12 100644
--- a/community/lilypond/PKGBUILD
+++ b/community/lilypond/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 28189 2010-10-03 15:28:38Z foutrelis $
+# $Id: PKGBUILD 50008 2011-06-23 09:20:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
-# Contributor: Andrea `BaSh` Scarpino <bash.lnx@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 
 pkgname=lilypond
-pkgver=2.12.3
-pkgrel=7
+pkgver=2.14.1
+pkgrel=1
 pkgdesc="An automated music engraving system"
 arch=('i686' 'x86_64')
 url="http://lilypond.org"
 license=('GPL')
 depends=('guile' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig')
-makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils' 'gsfonts')
+makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils'
+	     'gsfonts' 'texi2html')
 options=('emptydirs')
-source=(http://download.linuxaudio.org/lilypond/sources/v2.12/$pkgname-$pkgver.tar.gz
-	lilypond-gcc45.patch)
-md5sums=('2303bf5f2ea8d4628f33a68f016f3866'
-         '023636ea13dc6eb2de379e5ef369b218')
+source=(http://download.linuxaudio.org/lilypond/sources/v2.14/$pkgname-$pkgver.tar.gz
+	texlive-workaround.patch)
+md5sums=('262cc7f92c907a7b479b55b3b37a9302'
+         'ff32863f3eed67ac744e50bc4fc67a87')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -29,12 +29,14 @@ build() {
     sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
 
-#  libtoolize --force --copy
-#  aclocal
-#  autoconf
-#  automake
-  ./configure --prefix=/usr --disable-gui
-  patch -p1 <$srcdir/lilypond-gcc45.patch
+  rm -rf python/out/
+  patch -p1 <$srcdir/texlive-workaround.patch
+
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/lilypond/texlive-workaround.patch b/community/lilypond/texlive-workaround.patch
new file mode 100644
index 000000000..1eb262863
--- /dev/null
+++ b/community/lilypond/texlive-workaround.patch
@@ -0,0 +1,88 @@
+diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf
+index d5cbb7f..b25c4bc 100644
+--- a/mf/feta-autometric.mf
++++ b/mf/feta-autometric.mf
+@@ -149,7 +149,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) =
+ 			& to_bp (w) & " "
+ 			& to_bp (h);
+ 		special "% MF2PT1: font_size " & decimal designsize;
+-		special "% MF2PT1: font_slant " & decimal font_slant_;
+ 
+ 		for fvar = "font_identifier",
+ 			   "font_coding_scheme",
+@@ -175,9 +174,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) =
+ 			fi;
+ 		endfor;
+ 
+-		special "% MF2PT1: font_fixed_pitch "
+-			& (if font_fixed_pitch_: "1" else: "0" fi);
+-
+ 		% this must come after the `font_size' special
+ 		special "% MF2PT1: charwd " & decimal charwd;
+ 	fi;
+diff --git a/mf/mf2pt1.mp b/mf/mf2pt1.mp
+index a8b45aa..c935628 100644
+--- a/mf/mf2pt1.mp
++++ b/mf/mf2pt1.mp
+@@ -61,7 +61,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) =
+     def to_bp (expr num) = decimal (ceiling (num*bp_per_pixel)) enddef;
+     special "% MF2PT1: glyph_dimensions 0 " & to_bp (-d) & " " & to_bp(w) & " " & to_bp(h);
+     special "% MF2PT1: font_size " & decimal designsize;
+-    special "% MF2PT1: font_slant " & decimal font_slant_;
+     special "% MF2PT1: charwd " & decimal charwd;   % Must come after the |font_size| |special|
+     for fvar = "font_identifier", "font_coding_scheme", "font_version",
+       "font_comment", "font_family", "font_weight", "font_unique_id",
+@@ -76,8 +75,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) =
+           scantokens ("decimal " & fvar & "_");
+       fi;
+     endfor;
+-    special "% MF2PT1: font_fixed_pitch " &
+-            (if font_fixed_pitch_: "1" else: "0" fi);
+ enddef;
+ 
+ 
+@@ -91,19 +88,6 @@ enddef;
+ 
+ 
+ %% \begin{explaincode}
+-%%   Store the value of \mfcomment
+-%    |font_slant_|, so we can recall it at each |beginchar|.
+-%% \end{explaincode}
+-
+-font_slant_ := 0;
+-
+-def font_slant expr x =
+-  font_slant_ := x;
+-  fontdimen 1: x
+-enddef;
+-
+-
+-%% \begin{explaincode}
+ %%   Redefine \mfcomment
+ %    |bpppix_|, the number of ``big'' points per pixel. \mfcomment
+ %    This in turn redefines |mm|, |in|, |pt|, and other derived units.
+@@ -141,11 +125,6 @@ forsuffixes fvar = font_underline_position, font_underline_thickness:
+   scantokens ("def " & str fvar & " expr x = " & str fvar & "_ := x enddef;");
+ endfor;
+ 
+-boolean font_fixed_pitch_;
+-font_fixed_pitch_ := false;
+-def font_fixed_pitch expr x = font_fixed_pitch_ := x enddef;
+-
+-
+ %% \begin{explaincode}
+ %%   We'd like to be able to use calligraphic pens.  Normally, MetaPost's
+ %%   output routine does all the work for us of converting these to filled
+diff --git a/scripts/build/mf2pt1.pl b/scripts/build/mf2pt1.pl
+index 95df0f8..20f410b 100644
+--- a/scripts/build/mf2pt1.pl
++++ b/scripts/build/mf2pt1.pl
+@@ -427,7 +427,7 @@ ENDHEADER
+ sub get_bboxes ($)
+ {
+     execute_command 1, ("mpost", "-mem=mf2pt1", "-progname=mpost",
+-                        "\\mode:=localfont; mag:=$mag; bpppix $bpppix; input $mffile");
++                        "\\mode:=localfont; mag:=$mag; bpppix:=$bpppix; input $mffile");
+     opendir (CURDIR, ".") || die "${progname}: $! ($filedir)\n";
+     @charfiles = sort
+                    { ($a=~ /\.(\d+)$/)[0] <=> ($b=~ /\.(\d+)$/)[0] }
diff --git a/community/lxtask/PKGBUILD b/community/lxtask/PKGBUILD
index b933fc7c1..d88df457e 100644
--- a/community/lxtask/PKGBUILD
+++ b/community/lxtask/PKGBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr>
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 pkgname=lxtask
-pkgver=0.1.3
+pkgver=0.1.4
 pkgrel=1
 pkgdesc="Task manager of the LXDE Desktop"
 arch=('i686' 'x86_64')
@@ -11,12 +11,15 @@ groups=('lxde')
 depends=('gtk2')
 makedepends=('pkgconfig' 'intltool')
 source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
-md5sums=('eccfb69ee1a209248b22a5f0a34a4734')
+md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	autoreconf || return 1
-	./configure --sysconfdir=/etc --prefix=/usr || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
+	autoreconf
+	./configure --sysconfdir=/etc --prefix=/usr
+	make
+}
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
 }
diff --git a/community/pari/PKGBUILD b/community/pari/PKGBUILD
index e9b0334ac..ec9c6f80b 100644
--- a/community/pari/PKGBUILD
+++ b/community/pari/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=pari
-pkgver=2.3.5
-pkgrel=3
+pkgver=2.5.0
+pkgrel=1
 pkgdesc='Computer algebra system designed for fast computations in number theory'
 arch=('i686' 'x86_64')
 url='http://pari.math.u-bordeaux.fr/'
@@ -12,7 +12,7 @@ makedepends=('perl' 'texlive-core')
 optdepends=('perl: gphelp, tex2mail'
             'libx11: high precision plots')
 source=("${url}pub/pari/unix/$pkgname-$pkgver.tar.gz")
-sha1sums=('f211ccfe42a4b18dbcde832dfd1ece6f477f4966')
+sha1sums=('d96250cd8b3e426f548a832f2f44fdfd30fd32b6')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -20,11 +20,14 @@ build() {
 	make all
 }
 
-package() {
+check() {
 	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir/" install
+	make bench
+}
 
-	install -m 644 -t "$pkgdir/usr/include/$pkgname/" Olinux-$CARCH/*.h
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
 
 	# symlink pointing to a symlink that is going to be moved by zipman
 	rm "$pkgdir"/usr/share/man/man1/pari.1
diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD
index 14791d62b..55008944c 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 48094 2011-05-28 15:09:58Z giovanni $
+# $Id: PKGBUILD 49923 2011-06-22 14:26:41Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=pcsclite
-pkgver=1.7.2
-pkgrel=2
+pkgver=1.7.3
+pkgrel=1
 pkgdesc="PC/SC Architecture smartcard middleware library"
 arch=('i686' 'x86_64')
 url="https://alioth.debian.org/projects/pcsclite/"
@@ -12,9 +12,9 @@ license=('BSD')
 depends=('udev')
 makedepends=('pkgconfig')
 options=('!libtool' '!docs')
-source=(https://alioth.debian.org/frs/download.php/3533/pcsc-lite-${pkgver}.tar.bz2
+source=(https://alioth.debian.org/frs/download.php/3591/pcsc-lite-${pkgver}.tar.bz2
         pcscd)
-md5sums=('47e7055cfc14399fdaa1b7a4aa06e5aa'
+md5sums=('0dfc1639e4020fb3c04ab37425abbb12'
          '80d90388e4d2a551cb7aefe3bd5147bd')
 
 build() {
diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD
index ff0b66901..a313aeb8c 100644
--- a/community/qlandkartegt/PKGBUILD
+++ b/community/qlandkartegt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 47374 2011-05-22 09:38:33Z jlichtblau $
+# $Id: PKGBUILD 50065 2011-06-23 20:33:39Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Matthias Maennich <arch@maennich.net>
 # Contributor: <boenki@gmx.de>
 
 pkgname=qlandkartegt
-pkgver=1.1.2
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="Use your GPS with Linux"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
         $pkgname-mimetypes.xml)
-sha256sums=('8eedc414b4f89c9519e4b15c2ac7e5986b8e0834d237cde5fedc619c61ad0175'
+sha256sums=('f28b37340a773e466434988e64929b6282e445dc43612fb6c1d991d2d5ff995f'
             'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0')
 
 build() {
diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog
index d7fb41e6f..f2cfbb448 100644
--- a/community/qlandkartegt/qlandkartegt.changelog
+++ b/community/qlandkartegt/qlandkartegt.changelog
@@ -1,3 +1,6 @@
+2011-06-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.2.0-1
+
 2011-05-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* qlandkartegt 1.1.2-1
 
diff --git a/community/scrotwm/LICENSE b/community/scrotwm/LICENSE
new file mode 100644
index 000000000..24c04f3a0
--- /dev/null
+++ b/community/scrotwm/LICENSE
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
+ * Copyright (c) 2009 Ryan McBride <mcbride@countersiege.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+/*
+ * Much code and ideas taken from dwm under the following license:
+ * MIT/X Consortium License
+ *
+ * 2006-2008 Anselm R Garbe <garbeam at gmail dot com>
+ * 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * 2006-2007 Jukka Salmi <jukka at salmi dot ch>
+ * 2007 Premysl Hruby <dfenze at gmail dot com>
+ * 2007 Szabolcs Nagy <nszabolcs at gmail dot com>
+ * 2007 Christof Musik <christof at sendfax dot de>
+ * 2007-2008 Enno Gottox Boland <gottox at s01 dot de>
+ * 2007-2008 Peter Hartlich <sgkkr at hartlich dot com>
+ * 2008 Martin Hurton <martin dot hurton at gmail dot com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
diff --git a/community/scrotwm/PKGBUILD b/community/scrotwm/PKGBUILD
new file mode 100644
index 000000000..3d1d7b6cc
--- /dev/null
+++ b/community/scrotwm/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=scrotwm
+pkgver=0.9.32
+pkgrel=1
+pkgdesc="A minimalistic dynamic tiling window manager that tries to stay out of the way."
+arch=('i686' 'x86_64')
+url="http://www.scrotwm.org"
+license=('custom:ISC')
+depends=('dmenu' 'libxrandr' 'profont')
+makedepends=('libxt')
+optdepends=('scrot: screenshots' 'xlockmore: screenlocking' 'terminus-font: great font')
+backup=(etc/scrotwm.conf)
+source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \
+	LICENSE \
+        baraction.sh)
+md5sums=('43053b82962f6629ffa487bfb1c3195d'
+         'a67cfe51079481e5b0eab1ad371379e3'
+         '6132ba773ee00f39d8f67ac0347a9814')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  
+  # it is like a patch, only less fragile
+  sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' scrotwm.c
+  sed -i 's/# modkey = Mod1/modkey = Mod4/' scrotwm.conf
+  sed -i 's/-\*-terminus-medium-\*-\*-\*-\*-\*-\*-\*-\*-\*-\*-\*/-*-profont-*-*-*-*-12-*-*-*-*-*-*-*/' scrotwm.conf
+
+  cd linux
+  make PREFIX="/usr"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver/linux"
+  make PREFIX="/usr" DESTDIR="$pkgdir" install
+  install -Dm644 scrotwm.desktop "$pkgdir/usr/share/xsessions/scrotwm.desktop"
+  cd ..
+  install -Dm644 scrotwm.conf "$pkgdir/etc/scrotwm.conf"
+  install -Dm755 screenshot.sh "$pkgdir/usr/share/scrotwm/screenshot.sh"
+  #cd ../..
+  cd "$srcdir"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm755 baraction.sh "$pkgdir/usr/share/scrotwm/baraction.sh"
+
+  ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0"
+  ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so"
+}
diff --git a/community/scrotwm/baraction.sh b/community/scrotwm/baraction.sh
new file mode 100755
index 000000000..9c4600adc
--- /dev/null
+++ b/community/scrotwm/baraction.sh
@@ -0,0 +1,82 @@
+#!/bin/bash
+# baraction.sh for scrotwm status bar
+# From http://wiki.archlinux.org/index.php/Scrotwm
+
+SLEEP_SEC=5
+#loops forever outputting a line every SLEEP_SEC secs
+while :; do
+
+ 	eval $(cat /proc/acpi/battery/BAT0/state | awk '/charging state/ {printf "BAT_CHGSTATE=%s;", $3}; /remaining capacity/ {printf "BAT_REMNG=%s;",$3}; /present rate/ {printf "BAT_RATE=%s;",$3};' -)
+ 	eval $(cat /proc/acpi/battery/BAT0/info | awk '/present/ {printf "BAT_PRESENT=%s;", $2}; /last full capacity/ {printf "BAT_LASTFULL=%s;",$4};' -)
+ 
+	BAT_REMNG_WH=`echo "scale=1; a=($BAT_REMNG+50)/1000; print a" | bc -l`
+	BAT_RATE_W=`echo "scale=1; a=($BAT_RATE+50)/1000; print a" | bc -l`
+	BCSCRIPT="scale=0; a=(100*$BAT_REMNG / $BAT_LASTFULL); print a"
+	BAT_PCT=`echo $BCSCRIPT | bc -l`%
+
+	case $BAT_PRESENT in
+		no)
+		POWER_STR="AC, NO BATTERY"
+		;;
+		yes)
+
+		case $BAT_CHGSTATE in
+			charged)
+			#on ac
+			AC_STATUS="ON AC"
+			TIME_REMNG="N/A"
+			POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT"
+			;;
+			charging)
+			#on ac
+			AC_STATUS="ON AC"
+			BCSCRIPT="scale=1; a=(60*($BAT_LASTFULL - $BAT_REMNG) / $BAT_RATE); print a"
+			TIMETOFULL_MIN=`echo $BCSCRIPT | bc -l`
+			POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT C="$BAT_REMNG_WH"Wh Rate="$BAT_RATE_W"W TTF="$TIMETOFULL_MIN"min"
+			;;
+			discharging)
+			AC_STATUS="ON BATT"
+			TIME_REMNG_MIN=`echo "scale=0; a=(60*$BAT_REMNG / $BAT_RATE); print a" | bc -l`
+			TIME_REMNG_HH=`echo "scale=0; a=($BAT_REMNG / $BAT_RATE); if (a<10) {print "0"; print a} else {print a}" | bc -l`
+
+			TIME_REMNG_MM=`echo "scale=0; a=($TIME_REMNG_MIN-60*$TIME_REMNG_HH); if (a<10) {print "0"; print a} else {print a}" | bc -l`
+			POWER_STR="$AC_STATUS $BAT_PCT C="$BAT_REMNG_WH"Wh P="$BAT_RATE_W"W R="$TIME_REMNG_HH":"$TIME_REMNG_MM
+			;;
+			*)
+			POWER_STR=$BAT_CHGSTATE
+			;;
+		esac
+
+		;;
+		*)
+		POWER_STR="error"
+		;;
+	esac
+
+	#scrotwm bar_print can't handle UTF-8 characters, such as degree symbol
+	#Core 0:      +67.0°C  (crit = +100.0°C)
+	eval $(sensors 2>/dev/null | sed s/[°+]//g | awk '/^Core 0/ {printf "CORE0TEMP=%s;", $3}; /^Core 1/ {printf "CORE1TEMP=%s;",$3}; /^fan1/ {printf "FANSPD=%s;",$2};' -)
+	TEMP_STR="Tcpu=$CORE0TEMP,$CORE1TEMP F=$FANSPD"
+
+	WLAN_ESSID=$(iwconfig wlan0 | awk -F "\"" '/wlan0/ { print $2 }')
+	eval $(cat /proc/net/wireless | sed s/[.]//g | awk '/wlan0/ {printf "WLAN_QULTY=%s; WLAN_SIGNL=%s; WLAN_NOISE=%s", $3,$4,$5};' -)
+	BCSCRIPT="scale=0;a=100*$WLAN_QULTY/70;print a"
+	WLAN_QPCT=`echo $BCSCRIPT | bc -l`
+	WLAN_POWER=`iwconfig 2>/dev/null| grep "Tx-Power"| awk {'print $4'}|sed s/Tx-Power=//`
+	WLAN_STR="$WLAN_ESSID: Q=$WLAN_QPCT% S/N="$WLAN_SIGNL"/"$WLAN_NOISE"dBm T="$WLAN_POWER"dBm"
+
+	CPUFREQ_STR=`echo "Freq:"$(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;')`
+	CPULOAD_STR="Load:$(uptime | sed 's/.*://; s/,//g')"
+
+	eval $(awk '/^MemTotal/ {printf "MTOT=%s;", $2}; /^MemFree/ {printf "MFREE=%s;",$2}' /proc/meminfo)
+	MUSED=$(( $MTOT - $MFREE ))
+	MUSEDPT=$(( ($MUSED * 100) / $MTOT ))
+	MEM_STR="Mem:${MUSEDPT}%"
+
+	echo -e "$POWER_STR  $TEMP_STR  $CPUFREQ_STR  $CPULOAD_STR  $MEM_STR  $WLAN_STR"
+        #alternatively if you prefer a different date format
+        #DATE_STR=`date +"%H:%M %a %d %b`
+	#echo -e "$DATE_STR   $POWER_STR  $TEMP_STR  $CPUFREQ_STR  $CPULOAD_STR  $MEM_STR  $WLAN_STR"
+
+	sleep $SLEEP_SEC
+done
diff --git a/community/ushare/PKGBUILD b/community/ushare/PKGBUILD
index b579056d8..0ed1b484c 100644
--- a/community/ushare/PKGBUILD
+++ b/community/ushare/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 49823 2011-06-21 09:38:58Z spupykin $
+# $Id: PKGBUILD 49979 2011-06-22 19:57:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
 # Contributor: kastor <kastor@fobos.org.ar>
 
 pkgname=ushare
 pkgver=1.1a
-pkgrel=12
+pkgrel=13
 pkgdesc="A free UPnP A/V Media Server for Linux"
 url="http://ushare.geexbox.org"
 license=('GPL2')
 arch=('i686' 'x86_64')
-depends=('libupnp' 'libdlna')
+depends=('libupnp' 'libdlna' 'sudo')
 backup=('etc/ushare/ushare.conf'
 	'etc/conf.d/ushare')
 install=ushare.install