Sat Feb 23 00:05:17 PST 2013

3 files changed, 20 insertions, 18 deletions

diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD
index fbe672432..ec818c4fb 100644
--- a/extra/dosfstools/PKGBUILD
+++ b/extra/dosfstools/PKGBUILD
@@ -1,23 +1,20 @@
-# $Id: PKGBUILD 174137 2013-01-02 14:44:16Z tpowa $
+# $Id: PKGBUILD 178443 2013-02-22 11:41:58Z tpowa $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 pkgname=dosfstools
-pkgver=3.0.13
-pkgrel=2
+pkgver=3.0.15
+pkgrel=1
 pkgdesc="DOS filesystem utilities"
 arch=(i686 x86_64)
 depends=('glibc')
 #source=(http://www.daniel-baumann.ch/software/dosfstools/$pkgname-$pkgver.tar.xz)
 # using debian source, main page is down since quite some time
-source=(http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.13.orig.tar.xz
-        dosfstools-3.0.12-fix-alloc-rootdir-entry.patch)
+source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz)
 url="http://www.daniel-baumann.ch/software/dosfstools/"
 license=('GPL2')
 
 build() {
    cd $srcdir/$pkgname-$pkgver
-   # fix https://bugs.archlinux.org/task/33248
-   patch -Np1 -i ${srcdir}/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch
    make
 }
 
@@ -25,5 +22,4 @@ package () {
    cd $srcdir/$pkgname-$pkgver
    make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install
 }
-md5sums=('c1d851e3fc065a935c7cf919545d239f'
-         'c2be6f2cd1d47297b2d6a8ba237e04eb')
+md5sums=('64d2020bd8e92105dfad30feee72a3ec')
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index d2f473817..2388f17f5 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178365 2013-02-20 22:51:19Z bisson $
+# $Id: PKGBUILD 178429 2013-02-22 00:30:19Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
 pkgver=2.30.0
-pkgrel=3
+pkgrel=5
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('custom:EPL')
@@ -43,10 +43,10 @@ build() {
 	export PYTHON=python2
 	export LUA=lua5.1
 
-	./configure \
-		--prefix=/usr \
-		--with-cgraph=false # apps need porting to that new api first
+	# install the graph and cgraph api alongside
+	sed 's/@WITH_CGRAPH_FALSE@//g' -i lib/graph/Makefile.in
 
+	./configure --prefix=/usr
 	make || sed '/caml_array_length/d' -i tclpkg/gv/gv_ocaml.cpp # swig goes wonky
 	make
 }
@@ -57,4 +57,7 @@ package() {
 
 	# http://www.graphviz.org/License.php
 	install -Dm644 ../LICENSE "${pkgdir}"/usr/share/licenses/graphviz/LICENSE
+
+	# everything has been built against cgraph, but use graph as default api
+	sed '/#define WITH_CGRAPH 1/d' -i "${pkgdir}"/usr/include/graphviz/types.h
 }
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 802054263..505ecf882 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175873 2013-01-23 00:13:10Z eric $
+# $Id: PKGBUILD 178435 2013-02-22 07:43:22Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,8 +21,8 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.4.11
-pkgrel=2
+pkgver=5.4.12
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
@@ -33,7 +33,7 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('9975e68c22b86b013b934743ad2d2276'
+md5sums=('5c7b614242ae12e9cacca21c8ab84818'
          '0b0bc7a917fc592bdf11dcd3c5c255e9'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          '5c1f4c967b66ce3eaf819b46951dcbf5'
@@ -124,6 +124,9 @@ build() {
 	patch -p0 -i ${srcdir}/php.ini.patch
 	patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
 
+	# workaround for pkg-config 0.28
+	sed 's/ && test -n "$OPENSSL_INCS"//g' -i configure
+
 	# php
 	mkdir ${srcdir}/build-php
 	cd ${srcdir}/build-php