Wed Jul 13 23:12:30 UTC 2011

14 files changed, 90 insertions, 72 deletions

diff --git a/community/addresses/PKGBUILD b/community/addresses/PKGBUILD
index ef2790765..af9eec5e9 100644
--- a/community/addresses/PKGBUILD
+++ b/community/addresses/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 50653 2011-06-29 11:36:38Z spupykin $
+# $Id: PKGBUILD 51616 2011-07-12 10:59:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=addresses
 pkgver=0.4.6
-pkgrel=7
+pkgrel=8
 pkgdesc="A versatile address book application for GNUstep"
 arch=('i686' 'x86_64')
 url="http://giesler.biz/bjoern/en/sw_addr.html"
@@ -20,19 +20,18 @@ build() {
   . /etc/profile.d/GNUstep.sh
   cd $srcdir/Addresses-$pkgver
   sed -i -e 's|Versions/A|Versions/0|g' {Test,AddressManager}/GNUmakefile
-
-  export PATH=$startdir/gcc-objc/src/gcc-4.2.1/build/qwe/usr/bin:$PATH
-
   make
 }
 
 package() {
   . /etc/profile.d/GNUstep.sh
   cd $srcdir/Addresses-$pkgver
-  make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System INSTALL_ROOT_DIR=$pkgdir install
-
+  make GNUSTEP_INSTALLATION_DIR=$pkgdir/usr/lib/GNUstep INSTALL_ROOT_DIR=$pkgdir install
   # buggy install scripts
-  cd $pkgdir/opt/GNUstep/System/Library/Headers/
+  cd $pkgdir/usr/lib/GNUstep/Library/Headers/
   rm AddressBook
   ln -sf Addresses AddressBook
+  cd $pkgdir/usr/lib/GNUstep/Library/
+  mv * ..
+  cd .. && rmdir Library
 }
diff --git a/community/gnumail/PKGBUILD b/community/gnumail/PKGBUILD
index 79044c6cd..9f64c23b1 100644
--- a/community/gnumail/PKGBUILD
+++ b/community/gnumail/PKGBUILD
@@ -1,29 +1,33 @@
-# $Id: PKGBUILD 46065 2011-05-03 10:03:55Z spupykin $
+# $Id: PKGBUILD 51621 2011-07-12 11:00:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnumail
 pkgver=1.2.0pre3
-pkgrel=5
+pkgrel=6
 pkgdesc="A complete and fast mail application for GNUstep"
 arch=('i686' 'x86_64')
 url="http://www.collaboration-world.com/gnumail"
 license=('GPL')
-depends=('pantomime' 'addresses' 'gcc' 'gnustep-gui')
+depends=('pantomime' 'addresses' 'gnustep-gui')
+makedepends=('gcc-objc')
 options=('!makeflags')
-source=(GNUMail-$pkgver.tar.gz::http://www.collaboration-world.com/cgi-bin/project/download.cgi/GNUMail-$pkgver.tar.gz?rid=103)
+source=("GNUMail-$pkgver.tar.gz::http://www.collaboration-world.com/cgi-bin/project/download.cgi/GNUMail-$pkgver.tar.gz?rid=103")
 md5sums=('0f91fe0c32ef369ea843a2ab3909fb2b')
 
 build() {
   cd $srcdir/GNUMail
   . /etc/profile.d/GNUstep.sh
   make \
-	ADDITIONAL_OBJCFLAGS=-I/opt/GNUstep/System/Library/Headers \
-	ADDITIONAL_GUI_LIBS="-L/opt/GNUstep/System/Library/Libraries -lGNUMail -lPantomime -lAddresses -lAddressView"
+	ADDITIONAL_OBJCFLAGS=-I/usr/lib/GNUstep/Headers \
+	ADDITIONAL_GUI_LIBS="-L/usr/lib/GNUstep/Libraries -lGNUMail -lPantomime -lAddresses -lAddressView"
 }
 
 package() {
   cd $srcdir/GNUMail
-  make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System install
+  make GNUSTEP_INSTALLATION_DIR=$pkgdir/usr/lib/GNUstep install
+  cd $pkgdir/usr/lib/GNUstep/Library/
+  mv * ..
+  cd .. && rmdir Library
 }
diff --git a/community/gnustep-back/PKGBUILD b/community/gnustep-back/PKGBUILD
index 4755f9e02..dcea5faa8 100644
--- a/community/gnustep-back/PKGBUILD
+++ b/community/gnustep-back/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 45208 2011-04-18 12:44:31Z spupykin $
+# $Id: PKGBUILD 51626 2011-07-12 11:01:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnustep-back
 pkgver=0.20.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNUstep GUI Backend"
 arch=('i686' 'x86_64')
 url="http://www.gnustep.org/"
@@ -22,5 +22,15 @@ build() {
   . /etc/profile.d/GNUstep.sh
   ./configure --prefix=/usr --sysconfdir=/etc/GNUstep
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  . /etc/profile.d/GNUstep.sh
   make DESTDIR=$pkgdir install
+  mkdir -p $pkgdir/etc/ld.so.conf.d
+  cat >$pkgdir/etc/ld.so.conf.d/gnustep.conf <<EOF
+/opt/GNUstep/System/Library/Libraries
+/usr/lib/GNUstep/Libraries
+EOF
 }
diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD
index 30705c693..235eb1b0c 100644
--- a/community/myodbc/PKGBUILD
+++ b/community/myodbc/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 42568 2011-03-17 15:04:00Z spupykin $
+# $Id: PKGBUILD 51657 2011-07-12 14:22:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=myodbc
 pkgver=5.1.8
-pkgrel=1
+pkgrel=2
 pkgdesc="ODBC driver/connector for MySQL"
 arch=(i686 x86_64)
 url="http://dev.mysql.com/downloads/connector/odbc/"
 depends=('unixodbc' 'libmysqlclient')
 license=('GPL')
-options=('!libtool')
 source=("http://mysql.cce.usp.br/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-${pkgver}.tar.gz"
 	myodbc-64bit.patch
 	myodbc-add-mysys.patch
@@ -23,16 +22,17 @@ md5sums=('c64d8cec9de453bdf48fcb168643b943'
 
 build() {
   cd $srcdir/mysql-connector-odbc-${pkgver}
-
   [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-64bit.patch
   [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-add-mysys.patch
   [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-my-free.patch
   [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-shutdown.patch
-
-  [ $NOEXTRACT -eq 1 ] || CFLAGS=-DTHREAD LDFLAGS=-lmysqld ./configure --prefix=/usr --sysconfdir=/etc --with-unixODBC=/usr \
-    --with-mysql-path=/usr --without-samples --enable-thread-safe \
-    --without-x --without-qt --disable-gui --enable-shared \
-    --disable-static --disable-test
+  [ -f Makefile ] || CFLAGS="$CFLAGS -DTHREAD" \
+	./configure --prefix=/usr --sysconfdir=/etc --with-unixODBC=/usr --with-odbc-ini=/etc/odbc.ini \
+		--with-mysql-path=/usr --without-x --disable-gui --disable-test
   make
+}
+
+package() {
+  cd $srcdir/mysql-connector-odbc-${pkgver}
   make DESTDIR=$pkgdir install
 }
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index 6fd5e2b2b..c8db06edd 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 48812 2011-06-06 11:51:15Z spupykin $
+# $Id: PKGBUILD 51647 2011-07-12 14:13:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
 
@@ -12,7 +12,7 @@ _group=http
 
 pkgname=nginx
 pkgver=1.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
 arch=('i686' 'x86_64')
 depends=('pcre' 'zlib' 'openssl')
@@ -28,7 +28,7 @@ backup=("etc/nginx/conf/nginx.conf"
 source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz
 	nginx)
 md5sums=('d23f6e6b07b57ac061e790b1ed64bb98'
-         '837b010afcbdfe82d8e65ef00c4e14ba')
+         '7e7cafa43a59762b81c4da64e49eca69')
 
 build() {
 	cd $srcdir/nginx-${pkgver}
diff --git a/community/nginx/nginx b/community/nginx/nginx
index 2d5a02a47..811656eed 100644
--- a/community/nginx/nginx
+++ b/community/nginx/nginx
@@ -41,12 +41,16 @@ case "$1" in
     ;;
   stop)
     stat_busy "Stopping Nginx"
-    kill -QUIT `cat /var/run/nginx.pid` &>/dev/null
+    NGINX_PID=`cat /var/run/nginx.pid`
+    kill -QUIT $NGINX_PID &>/dev/null
     if [ $? -ne 0 ]; then
       stat_fail
     else
-      rm_daemon nginx
-      stat_done
+      for i in `seq 1 10`; do
+        [ -d /proc/$NGINX_PID ] || { stat_done; rm_daemon nginx; exit 0; }
+        sleep 1
+      done
+      stat_fail
     fi
     ;;
   restart)
diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD
index 06ba09d60..5f5f3c55b 100644
--- a/community/nut/PKGBUILD
+++ b/community/nut/PKGBUILD
@@ -2,14 +2,14 @@
 # Contributor: Slash <demodevil5 [at] yahoo [dot] com>
 
 pkgname=nut
-pkgver=16.12
+pkgver=16.13
 pkgrel=1
 pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.'
 url='http://nut.sourceforge.net/'
 license=('GPL')
 arch=('i686' 'x86_64')
 source=("http://downloads.sourceforge.net/project/nut/nut/${pkgver}/nut-${pkgver}.tar.gz")
-md5sums=('12b33ddad0e04ce1e3846fdcdd927dde')
+md5sums=('58f29a4510438ce4bd0622cd5971959c')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD
index c32d7c8e8..2225fcaa6 100644
--- a/community/oolite/PKGBUILD
+++ b/community/oolite/PKGBUILD
@@ -2,30 +2,23 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lone_Wolf <lonewolf@xs4all.nl>
 pkgname=oolite
-pkgver=1.75.2
-pkgrel=2
+pkgver=1.75.3
+pkgrel=1
 pkgdesc="A space-sim based on the classic Elite"
 arch=('i686' 'x86_64')
 url="http://oolite-linux.berlios.de"
 license=('GPL2')
 depends=('gnustep-gui' 'sdl_mixer' 'mesa' 'espeak' 'nspr' 'python2' 'icu')
 makedepends=('gcc-objc' 'gnustep-make' 'curl' 'zip')
+options=(!makeflags)
 source=(oolite http://download2.berlios.de/oolite-linux/oolite-dev-source-${pkgver}.tar.bz2)
-md5sums=('d4b3fdc553fbd4aa4418864eebd21ede'
-         '926720981d94fd09c9e2824dbc102d5e')
+md5sums=('b182976fade9b64a3b3702e2a8c72bf0'
+         'e6c3d1e41f60f8cf410f766a3ecadcc7')
 
 build() {
     cd $srcdir
     cp -r ${srcdir}/oolite-dev-source-${pkgver} ${srcdir}/${pkgname}-build
 
-# running 'make -f libjs.make debug=no' and/or 'make -f Makefile release'
-# works from commandline, but gives errors that cause makepkg to abort
-    cd ${srcdir}/${pkgname}-build/deps/Cocoa-deps/scripts
-    ./update-mozilla.sh
-    mkdir -p ${srcdir}/${pkgname}-build/deps/Cross-platform-deps/mozilla/js/src/build-release
-    cd ${srcdir}/${pkgname}-build/deps/Cross-platform-deps/mozilla/js/src/build-release
-    ../configure --disable-shared-js --enable-threadsafe --with-system-nspr --disable-tests --enable-trace-jscalls
-# end of lines needed to avoid makepkg aborting
     cd ${srcdir}/${pkgname}-build
     make -f libjs.make debug=no
     make -f Makefile release
diff --git a/community/oolite/oolite b/community/oolite/oolite
index d20e28545..6c9de2446 100755
--- a/community/oolite/oolite
+++ b/community/oolite/oolite
@@ -3,5 +3,4 @@ source /usr/share/GNUstep/Makefiles/GNUstep.sh
 if [ ! -d ~/.Oolite/AddOns ]; then
       mkdir -p ~/.Oolite/AddOns
 fi
-/usr/share/oolite/oolite
-
+/usr/share/oolite/oolite $@
diff --git a/community/pantomime/PKGBUILD b/community/pantomime/PKGBUILD
index 1d3654d74..88875acfb 100644
--- a/community/pantomime/PKGBUILD
+++ b/community/pantomime/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 46068 2011-05-03 10:04:36Z spupykin $
+# $Id: PKGBUILD 51631 2011-07-12 11:02:36Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=pantomime
 pkgver=1.2.0pre3
-pkgrel=3
+pkgrel=4
 pkgdesc="A set of Objective-C classes that model a mail system"
 arch=('i686' 'x86_64')
 url="http://www.collaboration-world.com/pantomime"
@@ -27,6 +27,9 @@ build() {
 
 package() {
   cd $srcdir/Pantomime
-  make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System install
+  make GNUSTEP_INSTALLATION_DIR=$pkgdir/usr/lib/GNUstep install
   install -D -m644 Documentation/LICENSE.elm $pkgdir/usr/share/licenses/$pkgname/LICENSE.elm
+  cd $pkgdir/usr/lib/GNUstep/Library/
+  mv * ..
+  cd .. && rmdir Library
 }
diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD
index 93fdbfd05..eedade19e 100644
--- a/community/scite/PKGBUILD
+++ b/community/scite/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=scite
-pkgver=2.26
+pkgver=2.27
 pkgrel=1
 pkgdesc='A generally useful editor with facilities for building and running programs.'
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ install=scite.install
 source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver/\./}.tgz"
         'SciTE.desktop'
         'makefile.patch')
-md5sums=('328865585758aca73292083ab4552af4'
+md5sums=('ac5aafa1b47da3792a56d5fd9f383fda'
          '48526532ef677982a4b156ae90f25b6f'
          '87005d4c7262a1a698cde0628dc7e2a2')
 
diff --git a/community/synce-librapi/PKGBUILD b/community/synce-librapi/PKGBUILD
index 0ffbe301f..639321737 100644
--- a/community/synce-librapi/PKGBUILD
+++ b/community/synce-librapi/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 26407 2010-09-15 11:58:40Z schuay $
+# $Id: PKGBUILD 51603 2011-07-12 06:27:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zhukov Pavel <gelios@gmail.com>
 
 pkgname=synce-librapi
-pkgver=0.15
-pkgrel=2
+pkgver=0.15.2
+pkgrel=1
 pkgdesc="provide a means of communication with a Windows CE device - libraries and tools for making remote calls to pocket pc"
 arch=('i686' 'x86_64')
 url="http://synce.sourceforge.net/"
 license=('GPL')
-depends=('synce-libsynce')
+depends=('synce-libsynce' 'hal')
 makedepends=('pyrex')
 source=(http://downloads.sourceforge.net/sourceforge/synce/librapi2-$pkgver.tar.gz)
-md5sums=('7341571d6f6b583bb4837bae42fb5d1c')
+md5sums=('0a15bc22ee02794ca4714799611b4746')
 
 build() {
   cd $srcdir/librapi2-$pkgver
diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD
index 05cd3340e..0eff3b5ae 100644
--- a/community/tracker/PKGBUILD
+++ b/community/tracker/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 51237 2011-07-06 10:22:55Z spupykin $
+# $Id: PKGBUILD 51608 2011-07-12 08:24:26Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=tracker
 pkgver=0.10.19
-pkgrel=1
+pkgrel=2
 pkgdesc="Powerful object database, tag/metadata database, search tool and indexer"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/projects/tracker/"
 license=('GPL')
 depends=('upower' 'poppler-glib' 'gstreamer0.10-base' 'libgee'  'gnome-desktop' 'libnotify' 'xdg-utils' 'gtkhtml'
 	 'libgsf' 'gnome-panel-bonobo' 'exempi' 'networkmanager')
-makedepends=('intltool' 'gnome-panel' 'nautilus' 'evolution' 'totem-plparser' 'icu')
+makedepends=('intltool' 'gnome-panel' 'evolution' 'totem-plparser' 'icu')
+# 'nautilus'
 optdepends=('nautilus'
 	    'enca'
 	    'gtkhtml'
@@ -39,7 +40,7 @@ build() {
 
   ./configure --prefix=/usr --sysconfdir=/etc  --libexecdir=/usr/lib/$pkgname \
     --enable-video-extractor=gstreamer --disable-hal \
-    --disable-miner-evolution
+    --disable-miner-evolution --disable-nautilus-extension
   make
 }
 
diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD
index 5bfced05d..ab0ee832e 100644
--- a/community/usb_modeswitch/PKGBUILD
+++ b/community/usb_modeswitch/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 42961 2011-03-22 21:16:11Z spupykin $
+# $Id: PKGBUILD 51652 2011-07-12 14:14:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=usb_modeswitch
-pkgver=1.1.7
+pkgver=1.1.8
 pkgrel=1
-_pkgdata=20110227
+_pkgdata=20110705
 pkgdesc="Activating switchable USB devices on Linux."
 arch=('i686' 'x86_64')
 url="http://www.draisberghof.de/usb_modeswitch/"
@@ -13,26 +13,31 @@ depends=('libusb-compat' 'tcl')
 makedepends=('gcc' 'make')
 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")
-md5sums=('b75e42b7b2d30e9d4cbd5c159f925247'
-         '2f5e5bfa21a97b705a22f95bec367793')
+	"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')
 
 build() {
-  cd $srcdir
+  cd $srcdir/usb-modeswitch-$pkgver/
+  make clean
+  make
+}
 
+package() {
   cd $srcdir/usb-modeswitch-$pkgver/
+
   mkdir -p $pkgdir/lib/udev/usb_modeswitch
   mkdir -p $pkgdir/etc
   mkdir -p $pkgdir/usr/share/man/man1
 
-  make clean
-  make
   make DESTDIR=${pkgdir} install
 
   mv ${pkgdir}/lib/udev/usb_modeswitch/usb_modeswitch.sh ${pkgdir}/lib/udev/usb_modeswitch.sh
   rmdir ${pkgdir}/lib/udev/usb_modeswitch
   mv ${pkgdir}/lib/udev/usb_modeswitch.sh ${pkgdir}/lib/udev/usb_modeswitch
-  cp device_reference.txt $pkgdir/etc/usb_modeswitch.setup
+  cp $srcdir/device_reference.txt $pkgdir/etc/usb_modeswitch.setup
 
   cd $srcdir/usb-modeswitch-data-${_pkgdata}
   make DESTDIR=$pkgdir install