Wed Aug 17 23:14:29 UTC 2011

10 files changed, 90 insertions, 112 deletions

diff --git a/community/amaya/PKGBUILD b/community/amaya/PKGBUILD
index e22c16a49..b054eb7ad 100644
--- a/community/amaya/PKGBUILD
+++ b/community/amaya/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 26069 2010-09-13 04:35:31Z bfanella $
+# $Id: PKGBUILD 54286 2011-08-16 07:11:40Z bfanella $
 # Mantainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Zerial <fernando@zerial.org>
 # Contributor: Dalius <dagis@takas.lt>
@@ -6,12 +6,12 @@
 
 pkgname=amaya
 pkgver=11.3.1
-pkgrel=7
+pkgrel=8
 pkgdesc="W3C's Editor/Browser"
 arch=('i686' 'x86_64')
 url="http://www.w3.org/Amaya/"
 license=('Custom/BSD')
-depends=('wxgtk' 'libgl' 'raptor')
+depends=('wxgtk' 'libgl' 'raptor1' 'libxt')
 makedepends=('imake' 'chrpath')
 options=('!makeflags')
 install=$pkgname.install
diff --git a/community/binutils-avr/PKGBUILD b/community/binutils-avr/PKGBUILD
index 6976cd203..f9e1a176d 100644
--- a/community/binutils-avr/PKGBUILD
+++ b/community/binutils-avr/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 37177 2011-01-12 01:51:26Z bfanella $
+# $Id: PKGBUILD 54281 2011-08-16 06:29:48Z bfanella $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: danst0 <danst0@west.de>
 
 pkgname=binutils-avr
-pkgver=2.21
+pkgver=2.21.1
 pkgrel=1
 pkgdesc="A set of programs to assemble and manipulate binary and object files for the avr architecture"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/binutils/"
 license=('GPL')
-depends=('glibc>=2.12.1-5' 'zlib')
+depends=('glibc>=2.12-5' 'zlib')
 options=('!libtool' '!distcc' '!ccache')
 source=(http://ftp.gnu.org/gnu/${pkgname/-avr}/${pkgname/-avr}-${pkgver}.tar.bz2)
-md5sums=('c84c5acc9d266f1a7044b51c85a823f5')
+md5sums=('a22801a9cad45c85e9ff6afc10537d72')
 
 build() {
 	cd ${srcdir}/${pkgname/-avr}-${pkgver}
diff --git a/community/elinks/PKGBUILD b/community/elinks/PKGBUILD
index 672b111f0..6c69a2021 100644
--- a/community/elinks/PKGBUILD
+++ b/community/elinks/PKGBUILD
@@ -1,4 +1,5 @@
-# $Id: PKGBUILD 52641 2011-07-26 16:47:26Z spupykin $
+# $Id: PKGBUILD 54327 2011-08-17 00:58:33Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
@@ -6,32 +7,54 @@
 
 pkgname=elinks
 pkgver=0.13
-_commit="eb4e5d7e0ddae63f28ec90d155846a2456e4a413"
-pkgrel=7
+_commit="30c485af4c4ba128d82171a6066594f3cfaeae5d"
+pkgrel=8
 pkgdesc="An advanced and well-established feature-rich text mode web browser."
 arch=("i686" "x86_64")
 url="http://elinks.or.cz"
 license=('GPL')
 depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua>=5.1.1' 'libidn' 'js'
 	 'gc' 'tre')
-source=("http://arch.p5n.pp.ru/~sergej/dl/elinks-$pkgver-${_commit}.tar.gz")
-md5sums=('71227b25ad05b719e4a549a26d958379')
+makedepends=('git')
+source=()
+md5sums=()
+
+__gitroot="http://elinks.cz/elinks.git"
+__gitname="elinks"
 
 build() {
-  cd "$srcdir/elinks"
+  cd "$srcdir"
+  msg "Connecting to GIT server...."
+ 
+  if [ -d $__gitname ] ; then
+    cd $__gitname && git pull origin
+    msg "The local files are updated."
+  else
+    git clone $__gitroot
+  fi
+ 
+  msg "GIT checkout done or server timeout"
+  msg "Starting make..."
+ 
+  rm -rf "$srcdir/$__gitname-build"
+  git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build"
+  cd "$srcdir/$__gitname-build"
+  git checkout "$_commit"
+
   [ -x configure ] || sh autogen.sh
   ./configure --prefix=/usr --mandir=/usr/share/man \
               --sysconfdir=/etc \
-              --disable-smb --without-x --enable-cgi \
+              --enable-smb --without-x --enable-cgi \
               --enable-leds --enable-256-colors --enable-html-highlight \
               --with-zlib
   make
 }
 
 package() {
-  cd "$srcdir/elinks"
+  cd "$srcdir/$__gitname-build"
   make DESTDIR="$pkgdir" install
   rm -f "$pkgdir/usr/share/locale/locale.alias"
+
   install -D -m644 "contrib/debian/$pkgname.desktop" \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
 }
diff --git a/community/fswebcam/PKGBUILD b/community/fswebcam/PKGBUILD
index 797cca000..73d890c07 100644
--- a/community/fswebcam/PKGBUILD
+++ b/community/fswebcam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 37156 2011-01-11 17:12:18Z ttopper $
+# $Id: PKGBUILD 54317 2011-08-16 18:16:02Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Philipp Robbel <robbel@gmail.com>
 
 pkgname=fswebcam
-pkgver=20101118
+pkgver=20110717
 pkgrel=1
 pkgdesc="Tiny and flexible webcam app."
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('gd')
 backup=("etc/$pkgname.conf")
 source=("$url/files/$pkgname-$pkgver.tar.gz")
-md5sums=('b4be05ed7c728c68424e947ed452b29f')
+md5sums=('6e09f1f31cf7cd0ac1d4d688a0acbe41')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gogglesmm/PKGBUILD b/community/gogglesmm/PKGBUILD
index 450be248d..333bd4455 100644
--- a/community/gogglesmm/PKGBUILD
+++ b/community/gogglesmm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 49064 2011-06-10 08:43:11Z spupykin $
+# $Id: PKGBUILD 54297 2011-08-16 14:25:26Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sander Jansen <sander@knology.net>
 
 pkgname=gogglesmm
-pkgver=0.12.2
+pkgver=0.12.3
 pkgrel=1
 pkgdesc="Music Manager and Player"
 arch=('i686' 'x86_64')
@@ -11,10 +11,11 @@ url="http://code.google.com/p/gogglesmm/"
 license=('GPL3')
 install=gogglesmm.install
 depends=('fox>=1.6.0' 'xine-lib>=1.0' 'sqlite3>=3.4.0' 'taglib' 'dbus-core' 'curl' 'expat' 'libgcrypt')
+makedepends=('pkgconfig' 'glproto' 'dri2proto')
 replaces=('musicmanager')
 conflicts=('musicmanager')
 source=(http://gogglesmm.googlecode.com/files/gogglesmm-$pkgver.tar.bz2)
-md5sums=('2fc5c90dc3feeacd857913c48c65771c')
+md5sums=('77cfc3cb158673193251c85713ac7a4d')
 
 build() {
   cd $srcdir/gogglesmm-$pkgver
diff --git a/community/obconf/PKGBUILD b/community/obconf/PKGBUILD
index 63755ce33..5ccebd7d5 100644
--- a/community/obconf/PKGBUILD
+++ b/community/obconf/PKGBUILD
@@ -1,35 +1,29 @@
-# $Id: PKGBUILD 49029 2011-06-09 21:05:36Z andrea $
+# $Id: PKGBUILD 54302 2011-08-16 14:38:12Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=obconf
-pkgver=2.0.3
-pkgrel=4
+pkgver=2.0.3git20100309
+pkgrel=1
 pkgdesc="A GTK2 based configuration tool for the Openbox windowmanager"
 arch=('i686' 'x86_64')
-url="http://icculus.org/openbox/index.php/ObConf:About"
+url="http://openbox.org/wiki/ObConf:About"
 license=('GPL')
 depends=('openbox' 'gtk2' 'libglade' 'desktop-file-utils' 'libsm')
 install=${pkgname}.install
-source=("http://icculus.org/openbox/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'http://icculus.org/openbox/mw/images/8/80/Obconf-72.png')
-md5sums=('b22e273721851dedad72acbc77eefb68'
-         '340ae4732e76731d2838473541eb8d4e')
+source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('122f2c46a2843175e4c3a27c3e6b8ed5')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
-
+  ./bootstrap
   ./configure --prefix=/usr
   make
-  sed -i 's/=openbox/=obconf/' obconf.desktop
 }
 
 package() {
   cd "${srcdir}"/${pkgname}-${pkgver}
-
   make DESTDIR="${pkgdir}" install
-  install -Dm644 ../Obconf-72.png \
-    "${pkgdir}"/usr/share/pixmaps/obconf.png
 }
diff --git a/community/obconf/obconf.install b/community/obconf/obconf.install
index 3121bf3ea..6735f2dbe 100644
--- a/community/obconf/obconf.install
+++ b/community/obconf/obconf.install
@@ -1,6 +1,6 @@
 post_install() {
     update-desktop-database -q
-    update-mime-database /usr/share/mime 1> /dev/null
+    update-mime-database /usr/share/mime &> /dev/null
 }
 
 post_upgrade() {
diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD
index d980675be..1e21d2200 100644
--- a/community/openbox/PKGBUILD
+++ b/community/openbox/PKGBUILD
@@ -1,47 +1,49 @@
-# $Id: PKGBUILD 49029 2011-06-09 21:05:36Z andrea $
+# $Id: PKGBUILD 54322 2011-08-16 21:46:14Z bfanella $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 
 pkgname=openbox
-pkgver=3.4.11.2
+pkgver=3.5.0
 pkgrel=2
 pkgdesc="A window manager for the X11 windowing system"
 arch=('i686' 'x86_64')
 url="http://openbox.org"
 license=('GPL')
 depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
-	'libxcursor' 'pango')
+         'libxcursor' 'pango' 'imlib2')
 optdepends=('pyxdg: for the xdg-autostart script')
 groups=('lxde')
 install=${pkgname}.install
 options=('!libtool')
 backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml')
-source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz
+source=("http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz"
         'which-2.20.patch')
-md5sums=('30e669134fa81df810fe7d1dc59cd931'
-         'ec5e3d4d74779b0ca576a053ae54124d')
+md5sums=('00441b53cf14c03566c8e82643544ff9'
+         '7ca3b5244bb092d46f5bcf1e2bdf4a18')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  	cd "${srcdir}"/${pkgname}-${pkgver}
 
-  # FS#11455
-  patch -Np1 -i ${srcdir}/which-2.20.patch
-  sed -i 's#python#python2#' tools/xdg-autostart/xdg-autostart
-  ./configure --prefix=/usr \
-    --with-x \
-    --enable-startup-notification \
-    --sysconfdir=/etc
-  make
+  	# FS#11455
+  	patch -p1 -i "${srcdir}"/which-2.20.patch
+  	sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+  	  data/autostart/openbox-xdg-autostart
+  
+	./configure --prefix=/usr \
+    		--with-x \
+    		--enable-startup-notification \
+    		--sysconfdir=/etc
+  
+	make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  	cd "${srcdir}"/${pkgname}-${pkgver}
+  	make DESTDIR="${pkgdir}" install
 
-  make DESTDIR=${pkgdir} install
-
-  sed -i "s:startkde:/usr/bin/\0:" \
-    ${pkgdir}/usr/share/xsessions/openbox-kde.desktop
-  sed -i "s:=gnome-session:=/usr/bin/gnome-session:" \
-    ${pkgdir}/usr/share/xsessions/openbox-gnome.desktop
+  	sed -i "s:startkde:/usr/bin/\0:" \
+  	  "${pkgdir}"/usr/share/xsessions/openbox-kde.desktop
+  	sed -i "s:=gnome-session:=/usr/bin/gnome-session:" \
+    	  "${pkgdir}"/usr/share/xsessions/openbox-gnome.desktop
 }
diff --git a/community/openbox/which-2.20.patch b/community/openbox/which-2.20.patch
index 7f663ae49..f947d6a98 100644
--- a/community/openbox/which-2.20.patch
+++ b/community/openbox/which-2.20.patch
@@ -1,53 +1,11 @@
---- openbox-3.4.11.1/data/autostart.sh.in	2010-03-14 09:40:37.000000000 -0500
-+++ openbox-3.4.11.1/data/autostart.sh.in	2010-03-26 14:44:36.000000000 -0500
-@@ -3,13 +3,13 @@
+--- openbox-3.5.0/data/autostart/autostart.in~	2011-08-02 15:50:01.963531310 +0000
++++ openbox-3.5.0/data/autostart/autostart.in	2011-08-02 15:51:57.277879458 +0000
+@@ -8,7 +8,7 @@
+ #
+ #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
+ #  @libexecdir@/gnome-settings-daemon &
+-#elif which gnome-settings-daemon >/dev/null; then
++#elif which gnome-settings-daemon >/dev/null 2>&1; then
+ #  gnome-settings-daemon &
+ #fi
  
- # Set a background color
- BG=""
--if which hsetroot >/dev/null; then
-+if which hsetroot >/dev/null 2>&1; then
-     BG=hsetroot
- else
--    if which esetroot >/dev/null; then
-+    if which esetroot >/dev/null 2>&1; then
- 	BG=esetroot
-     else
--	if which xsetroot >/dev/null; then
-+	if which xsetroot >/dev/null 2>&1; then
- 	    BG=xsetroot
- 	fi
-     fi
-@@ -17,28 +17,28 @@
- test -z $BG || $BG -solid "#303030"
- 
- # D-bus
--if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-+if which dbus-launch >/dev/null 2>&1 && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-        eval `dbus-launch --sh-syntax --exit-with-session`
- fi
- 
- # Make GTK apps look and behave how they were set up in the gnome config tools
- if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
-   @libexecdir@/gnome-settings-daemon &
--elif which gnome-settings-daemon >/dev/null; then
-+elif which gnome-settings-daemon >/dev/null 2>&1; then
-   gnome-settings-daemon &
- # Make GTK apps look and behave how they were set up in the XFCE config tools
--elif which xfce-mcs-manager >/dev/null; then
-+elif which xfce-mcs-manager >/dev/null 2>&1; then
-   xfce-mcs-manager n &
- fi
- 
- # Preload stuff for KDE apps
--if which start_kdeinit >/dev/null; then
-+if which start_kdeinit >/dev/null 2>&1; then
-   LD_BIND_NOW=true start_kdeinit --new-startup +kcminit_startup &
- fi
- 
- # Run XDG autostart things.  By default don't run anything desktop-specific
- # See xdg-autostart --help more info
- DESKTOP_ENV="OPENBOX"
--if which @secretbindir@/xdg-autostart >/dev/null; then
-+if which @secretbindir@/xdg-autostart >/dev/null 2>&1; then
-   @secretbindir@/xdg-autostart $DESKTOP_ENV
- fi
diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD
index cebd387e0..8e7f8dc7c 100644
--- a/community/springlobby/PKGBUILD
+++ b/community/springlobby/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 53068 2011-07-30 16:48:24Z svenstaro $
+# $Id: PKGBUILD 54276 2011-08-16 04:26:01Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: DuGi <dugi@irc.pl>
 
 pkgname=springlobby
-pkgver=0.135
+pkgver=0.136
 pkgrel=1
 pkgdesc="A free cross-platform lobby client for the Spring RTS project."
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('boost' 'asio' 'cmake')
 source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 
         springlobby.desktop
         springlobby.png)
-md5sums=('6d02bc0d91a112591460ac86e6a9baaa'
+md5sums=('b08d209ab8b338112ca46ac959ca6d1b'
          '45f8b59d033931d02e734fe3bd7777dd'
          '1f388187539aeb0358b51995e26ed890')