Wed Oct 26 23:15:38 UTC 2011

6 files changed, 95 insertions, 44 deletions

diff --git a/extra/allegro/PKGBUILD b/extra/allegro/PKGBUILD
index 5ea51ee5d..dfded5632 100644
--- a/extra/allegro/PKGBUILD
+++ b/extra/allegro/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 140688 2011-10-18 03:46:08Z eric $
+# $Id: PKGBUILD 141200 2011-10-25 22:29:00Z eric $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: arjan <arjan@archlinux.org>
 
 pkgname=allegro
 pkgver=5.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Portable library mainly aimed at video game and multimedia programming"
 arch=('i686' 'x86_64')
 url="http://alleg.sourceforge.net/"
 license=('custom')
 depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg')
-makedepends=('cmake' 'mesa')
+makedepends=('cmake' 'mesa' 'freetype2')
 source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz)
 md5sums=('e2e314ee7116c7efddd0497d6c885e46')
 
diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD
index 6ae24ea26..f81d854d0 100644
--- a/extra/conky/PKGBUILD
+++ b/extra/conky/PKGBUILD
@@ -1,32 +1,33 @@
-# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $
+# $Id: PKGBUILD 141204 2011-10-26 00:39:40Z bisson $
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: James Rayner <james@archlinux.org>
 # Contributor: Partha Chowdhury <kira.laucas@gmail.com>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=conky
-pkgver=1.8.1
-pkgrel=3
-pkgdesc='An advanced, highly configurable system monitor for X based on torsmo'
-arch=('i686' 'x86_64')
+pkgver=1.8.2git20111026
+pkgrel=1
+pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
-license=('custom')
-replaces=('torsmo')
-makedepends=('pkg-config')
+license=('BSD' 'GPL')
+arch=('i686' 'x86_64')
+options=('!emptydirs')
+makedepends=('pkg-config' 'docbook2x')
 depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2')
 backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'current-power.patch')
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('735861b284ad4feb86a9febaf4e457a4fcc7b39b')
 
-sha1sums=('06bbe9b7eed8603fa7a971b27c5c61f38424ac6f'
-          '2eeef0cc5a0b612826b2a7f0b43b7a3b7e10bf0b')
+# git clone git://git.omp.am/conky.git; cd conky; git archive --prefix=${pkgname}-${pkgver}/ origin/1.8.2 | xz > ../${pkgname}-${pkgver}.tar.xz
+
+replaces=('torsmo')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	patch -p1 < ../current-power.patch # See FS#21984
+	sh autogen.sh
 
-	./configure \
+	CPPFLAGS="$CXXFLAGS" LIBS="$LDFLAGS" ./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--enable-ibm \
diff --git a/extra/conky/PKGBUILD.cmake b/extra/conky/PKGBUILD.cmake
new file mode 100644
index 000000000..7f980868f
--- /dev/null
+++ b/extra/conky/PKGBUILD.cmake
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: James Rayner <james@archlinux.org>
+# Contributor: Partha Chowdhury <kira.laucas@gmail.com>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=conky
+pkgver=1.8.2git20111021
+pkgrel=1
+pkgdesc='Lightweight system monitor for X'
+url='http://conky.sourceforge.net/'
+license=('BSD' 'GPL')
+arch=('i686' 'x86_64')
+makedepends=('pkg-config' 'cmake' 'git' 'docbook2x')
+depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'libxdamage' 'imlib2' 'lua')
+
+replaces=('torsmo')
+
+build() {
+	cd "${srcdir}"
+
+	cd conky && { git pull origin; cd ..; } || git clone git://git.omp.am/conky.git
+	rm -fr build; mkdir build; cd build
+
+	cmake \
+		-D CMAKE_BUILD_TYPE:STRING="Release" \
+		-D MAINTAINER_MODE:BOOL=ON \
+		-D BUILD_CURL:BOOL=ON \
+		-D BUILD_IMLIB2:BOOL=ON \
+		-D BUILD_LUA_IMLIB2:BOOL=OFF \
+		-D BUILD_MYSQL:BOOL=OFF \
+		-D BUILD_RSS:BOOL=ON \
+		-D BUILD_WEATHER_METAR:BOOL=ON \
+		-D BUILD_WEATHER_XOAP:BOOL=ON \
+		-D BUILD_WLAN:BOOL=ON \
+		-D CMAKE_INSTALL_PREFIX:PATH=/usr \
+		../conky
+
+	make
+}
+
+package() {
+	cd "${srcdir}/build"
+	make DESTDIR="${pkgdir}" install
+	install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+	install -m644 ../conky/{COPYING,LICENSE}* "${pkgdir}/usr/share/licenses/${pkgname}"
+}
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index 2d93ebfe8..b420652a8 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 136958 2011-09-03 21:03:54Z bisson $
+# $Id: PKGBUILD 141172 2011-10-25 11:07:35Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
+# Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=postfix
-pkgver=2.8.5
+pkgver=2.8.6
 pkgrel=1
-pkgdesc='Secure, fast, easy to administer alternative to Sendmail'
+pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
-arch=('i686' 'x86_64')
 license=('custom')
+arch=('i686' 'x86_64')
 depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db')
 backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \
         'aliases.patch' \
         'rc.d')
-sha1sums=('49ef711c80b5a3434258ab24ae00940932503e80'
+sha1sums=('32613ad01cad10ae04aad626f9a69ac9126b3d28'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
           '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
 
@@ -60,5 +60,5 @@ package() {
 	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
 	cd "${pkgdir}"
-	patch -p0 < "${srcdir}"/aliases.patch
+	patch -p0 -i "${srcdir}"/aliases.patch
 }
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index 8a655a36a..cbfc104ad 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140532 2011-10-16 19:26:18Z ibiru $
+# $Id: PKGBUILD 141174 2011-10-25 11:30:46Z ibiru $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 
 pkgname=telepathy-glib
-pkgver=0.16.0
+pkgver=0.16.1
 pkgrel=1
 pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 depends=('dbus-glib')
 makedepends=('libxslt' 'vala' 'gobject-introspection')
 source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('071ed1b34ace45109188df73933609e4')
+md5sums=('22dd16bdf4f987c602c719a1efc3d268')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/truecrypt/PKGBUILD b/extra/truecrypt/PKGBUILD
index ac08317d4..4e831e6b3 100644
--- a/extra/truecrypt/PKGBUILD
+++ b/extra/truecrypt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130364 2011-07-06 02:01:03Z paul $
+# $Id: PKGBUILD 141202 2011-10-25 22:33:47Z eric $
 # Maintainer: Paul Mattal <paul.archlinux.org>
 
 pkgname=truecrypt
-pkgver=7.0a
-pkgrel=3
+pkgver=7.1
+pkgrel=1
 pkgdesc="Free open-source cross-platform disk encryption software"
 url="http://www.truecrypt.org/"
 arch=('i686' 'x86_64')
@@ -15,33 +15,36 @@ conflicts=('truecrypt-utils')
 replaces=('truecrypt-utils')
 # N.B. Truecrypt's web-based source download is incompatible with
 # makepkg. Source has been placed on ftp.archlinux.org instead
-source=('ftp://ftp.archlinux.org/other/tc/truecrypt-7.0a.tar.gz' \
+source=(ftp://ftp.archlinux.org/other/tc/truecrypt-${pkgver}.tar.gz{,.sig} \
         'ftp://ftp.archlinux.org/other/tc/pkcs-2.20.tar.gz' \
         "${pkgname}.desktop" \
 	"${pkgname}-arch-detection.patch") 
+md5sums=('a8268630a870faff07af940f63fb29eb'
+         'ddee7c4b2419ecb44b02c8294a08fbed'
+         'ce6a707b79411e82e8e558aa03e764b0'
+         '183b9bf04a943454d4e216130bcbac01'
+         '00ea70fa8437de877b31b027ac2b4060')
 
 build() {
-  export PKCS11_INC="${srcdir}/pkcs-2.20"
-
-  cd ${srcdir}/${pkgname}-${pkgver}-source || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}-source"
 
   # Work around buggy CPU type detection
-  patch -Np1 -i ../${pkgname}-arch-detection.patch || return 1
+  patch -Np1 -i ../${pkgname}-arch-detection.patch
   
   # Build
-  make || return 1
+  make PKCS11_INC="${srcdir}/pkcs-2.20"
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}-source"
 
   # Install Binary
-  install -D -m755 Main/${pkgname} ${pkgdir}/usr/bin/${pkgname} || return 1
+  install -D -m755 Main/${pkgname} "${pkgdir}/usr/bin/${pkgname}"
 
   # Install Desktop file and Icon
-  install -D -m644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop || return 1
-  install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm ${pkgdir}/usr/share/pixmaps/truecrypt.xpm || return 1
+  install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm "${pkgdir}/usr/share/pixmaps/truecrypt.xpm"
 
   # Install License
-  install -D -m644 License.txt ${pkgdir}/usr/share/licenses/${pkgname}/License.txt || return 1
+  install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt"
 }
-md5sums=('0a61616bc5c5ad90e876b4014c004ac9'
-         'ce6a707b79411e82e8e558aa03e764b0'
-         '183b9bf04a943454d4e216130bcbac01'
-         '00ea70fa8437de877b31b027ac2b4060')