9 files changed, 130 insertions, 47 deletions
diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD
index 2b34f225f..68629172d 100644
--- a/extra/fcitx/PKGBUILD
+++ b/extra/fcitx/PKGBUILD
@@ -1,27 +1,64 @@
-# $Id: PKGBUILD 103288 2010-12-17 09:19:33Z andrea $
+# $Id: PKGBUILD 136943 2011-09-03 10:34:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
+# Contributor: csslayer <wengxt AT gmail com>
 
-pkgname=fcitx
-pkgver=4.0.1
+pkgbase=fcitx
+pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
+pkgver=4.1.0
 pkgrel=1
-pkgdesc="Free Chinese Input Toy of X, a collection of Simplified Chinese input methods for Linux"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/fcitx/"
 license=('GPL')
-depends=('dbus-core' 'pango')
-makedepends=('intltool')
-options=('!libtool')
-source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('22d48cd65ae6ee36e49c0ed07761a3cb2f7e2669')
+makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu')
+source=("http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('d6aa9ce3344582ba92e850940c20dd28bf98e264')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_OPENCC=OFF \
+    -DENABLE_GTK3_IM_MODULE=ON \
+    -DENABLE_QT_IM_MODULE=ON
   make
 }
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+package_fcitx() {
+  pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system"
+  depends=('dbus-core' 'pango')
+  install=fcitx.install
+
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+
+  rm -r "${pkgdir}"/usr/lib/{gtk-2.0,gtk-3.0,qt}
+}
+
+package_fcitx-gtk2() {
+  pkgdesc='GTK2 IM Module for fcitx'
+  depends=('gtk2' 'dbus-glib' 'fcitx')
+  install=fcitx-gtk2.install
+
+  cd "${srcdir}"/build/src/frontend/gtk2
+  make DESTDIR="${pkgdir}" install
+}
+
+package_fcitx-gtk3() {
+  pkgdesc='GTK3 IM Module for fcitx'
+  depends=('gtk3' 'dbus-glib' 'fcitx')
+  install=fcitx-gtk3.install
+
+  cd "${srcdir}"/build/src/frontend/gtk3
+  make DESTDIR="${pkgdir}" install
+}
+
+package_fcitx-qt() {
+  pkgdesc='QT IM Module for fcitx'
+  depends=('qt' 'icu' 'fcitx')
+
+  cd "${srcdir}"/build/src/frontend/qt
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/fcitx/fcitx-gtk2.install b/extra/fcitx/fcitx-gtk2.install
new file mode 100644
index 000000000..7503c05eb
--- /dev/null
+++ b/extra/fcitx/fcitx-gtk2.install
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/fcitx/fcitx-gtk3.install b/extra/fcitx/fcitx-gtk3.install
new file mode 100644
index 000000000..b44958797
--- /dev/null
+++ b/extra/fcitx/fcitx-gtk3.install
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-3.0 --update-cache
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/fcitx/fcitx.install b/extra/fcitx/fcitx.install
new file mode 100644
index 000000000..316bccffe
--- /dev/null
+++ b/extra/fcitx/fcitx.install
@@ -0,0 +1,12 @@
+post_install() {
+  [[ -x usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor || true
+  [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD
index bfbeec073..d969c256c 100644
--- a/extra/geoip/PKGBUILD
+++ b/extra/geoip/PKGBUILD
@@ -1,25 +1,36 @@
-# $Id: PKGBUILD 123437 2011-05-11 11:45:24Z juergen $
+# $Id: PKGBUILD 136949 2011-09-03 12:23:55Z foutrelis $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Manolis Tzanidakis <manolis@archlinux.org>
 
 pkgname=geoip
-pkgver=1.4.7
+pkgver=1.4.8
 pkgrel=1
 pkgdesc="Non-DNS IP-to-country resolver C library & utils"
-arch=(i686 x86_64)
-license=('GPL')
+arch=('i686' 'x86_64')
 url="http://www.maxmind.com/app/c"
+license=('GPL')
 depends=('zlib')
-backup=(etc/geoip/GeoIP.conf)
+backup=('etc/geoip/GeoIP.conf')
 options=('!libtool')
 source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-${pkgver}.tar.gz)
-md5sums=('a802175d5b7e2b57b540a7dd308d9205')
+md5sums=('05b7300435336231b556df5ab36f326d')
 
 build() {
-  cd ${startdir}/src/GeoIP-${pkgver}
+  cd "${srcdir}/GeoIP-${pkgver}"
+
+  autoreconf -i
   ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc/geoip
-  make || return 1
-  make check || return 1
-  make DESTDIR=${startdir}/pkg install
+  make
+}
+
+check() {
+  cd "${srcdir}/GeoIP-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/GeoIP-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD
index 03075191b..030f74f2d 100644
--- a/extra/imlib2/PKGBUILD
+++ b/extra/imlib2/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 79752 2010-05-06 13:39:04Z ronald $
+# $Id: PKGBUILD 136939 2011-09-03 09:44:35Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Arjan Timmerman <arjan.archlinux.org>
 # Contributor: Tom Newsom <Jeepster.gmx.co.uk>
 
 pkgname=imlib2
-pkgver=1.4.4
+pkgver=1.4.5
 pkgrel=1
 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
 url="http://sourceforge.net/projects/enlightenment/"
 arch=('i686' 'x86_64')
 license=('BSD')
-depends=('libtiff>=3.9.2-2' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng>=1.4.0' 'libid3tag' 'libjpeg>=8')
+depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2")
-sha1sums=('aca2cf5d40ddcd8a3acfde605f319fccce7c2a2b')
+sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -25,9 +25,13 @@ build() {
   # Configure and Build
   ./configure --prefix=/usr \
               --sysconfdir=/etc/imlib2 \
-              --x-libraries=/usr/lib $EXTRAOPTS || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+              --x-libraries=/usr/lib $EXTRAOPTS
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
 
   # Install License
   install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
diff --git a/extra/kdiff3/PKGBUILD b/extra/kdiff3/PKGBUILD
index 0bf620978..456888917 100644
--- a/extra/kdiff3/PKGBUILD
+++ b/extra/kdiff3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 100978 2010-11-27 05:30:04Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 136960 2011-09-03 21:15:57Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=kdiff3
-pkgver=0.9.95
-pkgrel=2
+pkgver=0.9.96
+pkgrel=1
 pkgdesc="A KDE file comparator/merge tool"
 arch=('i686' 'x86_64')
 url="http://kdiff3.sourceforge.net/"
@@ -12,14 +12,12 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml')
 optdepends=('kdebase-lib: for the plugin')
 install=kdiff3.install
-source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz docbook.patch)
-md5sums=('652a98bf79ba762a8a646d4a0fddb323' '7a91d1ab6f62c41dc65082ae99bdeff0')
-sha1sums=('1fb27e8b42463ea23ad0169e20819352c1c476b7' '96a856fc7d9829f64bb59853a6dffba8a70d794e')
+source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
+md5sums=('46b96befddf3448a3cb673f018c6f6f9')
+sha1sums=('d7efdacdfd7ea3c7ec9f7dee32aba5962c1709a5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../docbook.patch
-  sed -i 's|kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3|kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3part|' src-QT4/CMakeLists.txt
   mkdir release
   cd release
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index e48ce2510..2d93ebfe8 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 130701 2011-07-07 21:12:32Z bisson $
+# $Id: PKGBUILD 136958 2011-09-03 21:03:54Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=postfix
-pkgver=2.8.4
+pkgver=2.8.5
 pkgrel=1
-pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)'
+pkgdesc='Secure, fast, easy to administer alternative to Sendmail'
 url='http://www.postfix.org/'
 arch=('i686' 'x86_64')
 license=('custom')
@@ -15,7 +15,7 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \
         'aliases.patch' \
         'rc.d')
-sha1sums=('48d077ad2614098f39411cb965a74d8ce2f3e5be'
+sha1sums=('49ef711c80b5a3434258ab24ae00940932503e80'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
           '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
 
diff --git a/extra/postfix/install b/extra/postfix/install
index f5d81a565..c276e0919 100644
--- a/extra/postfix/install
+++ b/extra/postfix/install
@@ -18,11 +18,10 @@ post_install() {
 post_upgrade() {
 	post_install
 
-	if [ `vercmp $2 2.8` = -1 ]; then cat <<EOF
+	if [ `vercmp $2 2.8.3` = -1 ]; then cat <<EOF
 
 ==> You must now execute "/etc/rc.d/postfix reload" (or restart).
-==> This is needed because the queue manager to delivery agent
-==> protocol has changed.
+==> This is needed because of an inter-daemon protocol change.
 
 EOF
 	fi