Sat Sep 29 00:54:37 PDT 2012

7 files changed, 96 insertions, 49 deletions

diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD
index cfce909ce..f294fb7e1 100644
--- a/community/geany/PKGBUILD
+++ b/community/geany/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72665 2012-06-18 19:58:17Z arodseth $
+# $Id: PKGBUILD 76751 2012-09-28 23:09:27Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Ionut Biru  <ibiru@archlinux.ro>
@@ -7,14 +7,14 @@
 
 pkgname=geany
 pkgver=1.22
-pkgrel=1
-pkgdesc="Fast and lightweight IDE"
+pkgrel=2
+pkgdesc='Fast and lightweight IDE'
 arch=('x86_64' 'i686')
 url="http://www.geany.org/"
 license=('GPL')
-depends=('gtk2' 'hicolor-icon-theme' 'desktop-file-utils' 'python2')
-makedepends=('perlxml' 'intltool')
-optdepends=("vte: for terminal support")
+depends=('gtk2' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('perlxml' 'setconf' 'intltool')
+optdepends=('vte: for terminal support' 'python2')
 install=geany.install
 source=("http://download.geany.org/$pkgname-$pkgver.tar.bz2")
 options=('!libtool')
@@ -30,9 +30,9 @@ build() {
   msg2 "Python2 fix..."
 	sed -i '0,/on/s//on2/' data/templates/files/main.py
   msg2 "Fixing FS#10318..."
-  sed -i 's|MimeType=text/plain;|MimeType=|' geany.desktop
+  setconf geany.desktop MimeType ''
   msg2 "Enabling colors for PKGBUILD files..."
-  sed -i 's|Sh=|Sh=PKGBUILD;|' data/filetype_extensions.conf
+  setconf data/filetype_extensions.conf Sh PKGBUILD
 }
 
 package() {
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index 7b9c24ce0..1bb6e6868 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72888 2012-06-24 13:42:51Z arodseth $
+# $Id: PKGBUILD 76749 2012-09-28 22:40:14Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Rémy Oudompheng  <remy@archlinux.org>
@@ -9,8 +9,8 @@
 # Contributor: Daniel YC Lin <dlin.tw@gmail.com>
 
 pkgname=go
-pkgver=1.0.2
-pkgrel=2
+pkgver=1.0.3
+pkgrel=1
 epoch=2
 pkgdesc='Google Go compiler and tools'
 arch=('x86_64' 'i686')
@@ -23,16 +23,22 @@ install=go.install
 backup=('usr/lib/go/bin')
 source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz"
         "$pkgname.sh")
-sha256sums=('70fcfb455087c14cc59b7a65c78003fcd1323d73f9b991c1e52db535d6bc95a8'
+sha256sums=('7fba3533d172f13629d3d8a79e57c620632b0bd075abe11d7698b338be0ae3df'
             'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892')
 
 build() {
-  cd "$srcdir/$pkgname"
+  if [ "$CARCH" == 'x86_64' ]; then
+    export GOARCH=amd64
+  fi
+  if [ "$CARCH" == 'i686' ]; then
+    export GOARCH=386
+  fi
+
+  # Set GOARCH to arm for crosscompilation (currently doesn't work)
 
+  cd "$srcdir/$pkgname"
   export GOROOT_FINAL="/usr/lib/go"
   export GOOS=linux
-  export GOARCH=arm
-
   cd src
   bash make.bash
 }
@@ -72,12 +78,12 @@ package() {
 
   cp -r doc misc -t "$pkgdir/usr/share/go"
   ln -s /usr/share/go/doc "$pkgdir/usr/lib/go/doc"
-  cp -r --preserve=timestamps bin "$pkgdir/usr"
-  cp -r --preserve=timestamps pkg "$pkgdir/usr/lib/go"
-  cp -r --preserve=timestamps $GOROOT/src/pkg "$pkgdir/usr/lib/go/src/"
-  cp -r --preserve=timestamps $GOROOT/src/cmd "$pkgdir/usr/lib/go/src/cmd"
-  cp -r --preserve=timestamps $GOROOT/src/lib9 "$pkgdir/usr/lib/go/src/"
-  cp -r --preserve=timestamps $GOROOT/lib "$pkgdir/usr/lib/go/"
+  cp -a bin "$pkgdir/usr"
+  cp -a pkg "$pkgdir/usr/lib/go"
+  cp -a $GOROOT/src/pkg "$pkgdir/usr/lib/go/src/"
+  cp -a $GOROOT/src/cmd "$pkgdir/usr/lib/go/src/cmd"
+  cp -a $GOROOT/src/lib9 "$pkgdir/usr/lib/go/src/"
+  cp -a $GOROOT/lib "$pkgdir/usr/lib/go/"
 
   install -Dm644 src/Make.* "$pkgdir/usr/lib/go/src"
 
diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD
index ced1b0de5..213ebbbda 100644
--- a/community/gpsdrive/PKGBUILD
+++ b/community/gpsdrive/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 73996 2012-07-18 01:07:11Z ibiru $
+# $Id: PKGBUILD 76745 2012-09-28 20:24:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: damir <damir@archlinux.org>
 
 pkgname=gpsdrive
 pkgver=2.11
-_pkgver=20120711
-pkgrel=13
+_pkgver=20120928
+pkgrel=14
 pkgdesc="A car (bike, ship, plane) navigation system"
 arch=("i686" "x86_64")
 url="http://www.gpsdrive.de/"
@@ -17,8 +17,8 @@ depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' '
 makedepends=('cmake>=2.4.4' 'boost' 'cfitsio')
 install="gpsdrive.install"
 #source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz")
-source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.xz")
-md5sums=('48fe20e111c10d0826d9f05746c9cf74')
+source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.gz")
+md5sums=('bc53792529788b81c291a32d628a4850')
 
 build() {
   cd "$srcdir"
@@ -34,6 +34,7 @@ build() {
   cd build
 
   sed -i 's|GdkGC \*kontext_map;|extern GdkGC *kontext_map;|' $srcdir/gpsdrive-${_pkgver}/src/gpsdrive.c
+  sed -i '22,1i#include <mapnik/graphics.hpp>' $srcdir/gpsdrive-${_pkgver}/src/mapnik.cpp
 
   export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/
   export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/
diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD
index 550d0d2be..c37ca0408 100644
--- a/community/mapnik/PKGBUILD
+++ b/community/mapnik/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 74816 2012-08-06 08:20:52Z spupykin $
+# $Id: PKGBUILD 76741 2012-09-28 19:41:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Dent <thewinch@gmail.com>
 # Contributor: orbisvicis <orbisvicis@gmail.com>
 
 pkgname=mapnik
-pkgver=2.0.2
+pkgver=2.1.0
 pkgrel=1
 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps"
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ optdepends=('libxslt:         Web Map Service'
 makedepends=('scons' 'boost')
 install="mapnik.install"
 source=("https://github.com/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2")
-md5sums=('c00f4fa2d5f3c344d93d71afdfce3a5e')
+md5sums=('d580c558a957444873bec9e24526b0a0')
 
 build() {
   cd "$srcdir/$pkgname-v$pkgver"
diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD
index 62c4f17c0..d2234a0ff 100644
--- a/community/pinot/PKGBUILD
+++ b/community/pinot/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 76182 2012-09-12 19:21:50Z jlichtblau $
+# $Id: PKGBUILD 76755 2012-09-28 23:44:46Z arodseth $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=pinot
 pkgver=1.01
-pkgrel=1
+pkgrel=2
 pkgdesc='Personal search and metasearch tool'
 arch=('i686' 'x86_64')
 url='http://code.google.com/p/pinot-search/'
@@ -29,22 +30,31 @@ source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz)
 sha256sums=('a2a82009db05ca7abb4ffbd8baafa8fb820a7e961fd3cdcb21af46bb05eb57d4')
 
 build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat_conf.txt
+  cd $srcdir/$pkgname-$pkgver
+  x='/usr/share/libtextcat/'
   sed -i 's|/LM/russian.lm|/LM/russian-windows1251.lm|' textcat_conf.txt
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat3_conf.txt
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat31_conf.txt
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat32_conf.txt
-  sed -i -e "s|.*russian$|/usr/share/libtextcat/LM/russian-iso8859_5.lm   russian-iso8859_5\n\
-/usr/share/libtextcat/LM/russian-koi8_r.lm      russian-koi8_r\n\
-/usr/share/libtextcat/LM/russian-windows1251.lm russian-windows1251|" textcat3_conf.txt
+  sed -i "s|$x|${x}LM/|" \
+    textcat_conf.txt \
+    textcat3_conf.txt \
+    textcat31_conf.txt \
+    textcat32_conf.txt
+  sed -i -e "s|.*russian$|${x}LM/russian-iso8859_5.lm   russian-iso8859_5\n\
+${x}LM/russian-koi8_r.lm      russian-koi8_r\n\
+${x}LM/russian-windows1251.lm russian-windows1251|" textcat3_conf.txt
 
-  LIBS="-lboost_system" ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --enable-gtkmm3=yes
+  LIBS="-lboost_system" ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --enable-gtkmm3=yes \
+    --enable-mempool=no
   make
 }
 
 package() {
-  cd "${srcdir}/$pkgname-$pkgver"
+  cd $srcdir/$pkgname-$pkgver
 
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR=$pkgdir install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/pinot/pinot.changelog b/community/pinot/pinot.changelog
index ab865bc42..4cf1a68a2 100644
--- a/community/pinot/pinot.changelog
+++ b/community/pinot/pinot.changelog
@@ -1,3 +1,6 @@
+2012-09-29 Alexander Rødseth <rodseth@gmail.com>
+	* fix FS#31510, adding --enable-mempool=no
+
 2012-09-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* pinot 1.01-1
 
diff --git a/community/vile/PKGBUILD b/community/vile/PKGBUILD
index 1d7b359f8..3b3043fb1 100644
--- a/community/vile/PKGBUILD
+++ b/community/vile/PKGBUILD
@@ -1,25 +1,52 @@
-# $Id: PKGBUILD 76396 2012-09-17 08:49:52Z spupykin $
+# $Id: PKGBUILD 76743 2012-09-28 19:43:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=vile
-pkgver=9.8
-pkgrel=2
+pkgver=9.8_i
+_basever=9.8
+pkgrel=1
 pkgdesc="vi like emacs"
 arch=('i686' 'x86_64')
 url="http://invisible-island.net/vile/vile.html"
 depends=('ncurses')
 license=('custom')
 options=(!libtool)
-source=(ftp://invisible-island.net/vile/vile-$pkgver.tgz)
-md5sums=('b5a0d89165f633a662cdb4b5c57f2e2f')
+source=("ftp://invisible-island.net/vile/vile-${_basever}.tgz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}a.patch.gz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}b.patch.gz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}c.patch.gz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}d.patch.gz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}e.patch.gz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}f.patch.gz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}g.patch.gz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}h.patch.gz"
+	"ftp://invisible-island.net/vile/patches/vile-${_basever}i.patch.gz")
+md5sums=('b5a0d89165f633a662cdb4b5c57f2e2f'
+         '685cb681943e9315a1689a6a6f4734cb'
+         'f3842ea427c635d0ee96f6da8566fa56'
+         '69cfdbb0b84a51802455bbe44a5ce32e'
+         '5d675193bc02ac4cab72452bf0051489'
+         '1e6317a15d7b2cd99f921f3af312b977'
+         '7f8a38272395f07e1377cc1943d37e7f'
+         '26ab76a7305b7ec97b22855810911ceb'
+         '6ea4cf22e29f5418f26ba6632985c70e'
+         '908e8f9cf3c9a681c3ef76a3cd04a0c3')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname-${_basever}
+
+  for i in $srcdir/vile-${_basever}?.patch; do
+    patch -p1 <$i
+  done
   sed -i 's|FLEX_BETA|FLEX_NOBETA|g' filters/filters.h
+
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-${_basever}
   make install DESTDIR=$pkgdir
-  mv $pkgdir/usr/man $pkgdir/usr/share/
 
   mkdir -p $pkgdir/usr/share/licenses/$pkgname
   cat <<EOF >$pkgdir/usr/share/licenses/$pkgname/license