Thu Jul 7 04:59:01 UTC 2011

25 files changed, 156 insertions, 111 deletions

diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD
index e9f8b7189..5cdab4d99 100644
--- a/extra/apr-util/PKGBUILD
+++ b/extra/apr-util/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 125819 2011-05-30 09:26:18Z jgc $
+# $Id: PKGBUILD 129453 2011-06-28 01:17:42Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apr-util
 pkgver=1.3.12
-pkgrel=1
+pkgrel=2
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64')
 url="http://apr.apache.org/"
@@ -20,5 +20,9 @@ build() {
     --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \
     --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap
   make
+}
+
+package() {
+  cd "${srcdir}/apr-util-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/archboot/PKGBUILD b/extra/archboot/PKGBUILD
index fd2534453..8bc5854a3 100644
--- a/extra/archboot/PKGBUILD
+++ b/extra/archboot/PKGBUILD
@@ -1,14 +1,19 @@
-# $Id: PKGBUILD 102962 2010-12-13 17:55:11Z tpowa $
+# $Id: PKGBUILD 130388 2011-07-06 10:05:42Z tpowa $
 # Maintainer : Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=archboot
-pkgver=2010.12
+pkgver=2011.06
 pkgrel=1
 pkgdesc="Advanced, modular arch boot/install image creation utility"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.archlinux.org/"
-depends=('mkinitcpio>=0.6.7-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2010.07-2' 'subversion>=1.6.13-1' 'wget>=1.12-2' 'bash>=4.1.009-3' 'coreutils>=8.7-1' 'cryptsetup>=1.1.3-1' 'dialog>=1.1_20100428-2' 'e2fsprogs>=1.41.12-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20100214-2' 'jfsutils>=1.1.14-2' 'less>=436-2' 'lvm2>=2.02.77-1' 'mdadm>=3.1.4-1' 'module-init-tools>=3.12-1' 'nano>=2.2.6-1' 'ncurses>=5.7-4' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2.0.0-4' 'pcmciautils>=017-1' 'procps>=3.2.8-2' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.1-1' 'sysvinit>=2.88-2' 'tar>=1.25-1' 'util-linux-ng>=2.18-3' 'which>=2.20-4' 'kbd>=1.15.2-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.4-1' 'dnsutils>=9.7.1.P2-1' 'hdparm>=9.36-1' 'memtest86+>=4.10-1' 'grub>=0.97-17' 'inetutils>=1.8-2' 'openssh>=5.6p1-1' 'hwdetect>=2010.08-1' 'shadow>=4.1.4.2-3' 'bridge-utils>=1.4-3' 'ifenslave>=1.1.0-5' 'cpufrequtils>=008-1' 'links>=2.2-4' 'tcp_wrappers>=7.6-12' 'dosfstools>=3.0.10-1' 'glibc>=2.12.1-4' 'linux-api-headers>=2.6.34-1' 'kernel26>=2.6.36.2-1' 'kernel26-lts>=2.6.32.27-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-2' 'ppp>=2.4.5-1' 'rp-pppoe>=3.10-5' 'lilo>=23.1-2' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2010.10.2-1' 'pciutils>=3.1.7-1' 'usbutils>=0.91-4' 'vpnc>=0.5.3-3' 'openvpn>=2.1.4-1' 'b43-fwcutter>=013-2' 'wpa_supplicant>=0.7.3-1' 'rsync>=3.0.7-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.77-1' 'screen>=4.0.3-10' 'elfutils>=0.149-2' 'pam>=1.1.1-2' 'cracklib>=2.8.16-1' 'nfs-utils>=1.2.2-4' 'nfsidmap>=0.23-4' 'readline>=6.1.002-2' 'acl>=2.2.49-1' 'attr>=2.4.44-2' 'pcre>=8.11-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.69-2' 'lzo2>=2.04-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.23-1' 'gpm>=1.20.6-6' 'libevent>=1.4.14b-2' 'gcc-libs>=4.5.1-2' 'sdparm>=1.06-1' 'licenses>=2.6-1' 'pptpclient>=1.7.2-3' 'ndiswrapper>=1.56-6' 'ndiswrapper-utils>=1.56-2' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.6-1' 'bittorrent>=5.2.2-3' 'dhcpcd>=5.2.9-1' 'openssl>=1.0.0.c-1' 'git>=1.7.3.3-1' 'dmraid>=1.0.0.rc16+CVS-2' 'linux-atm>=2.5.1-1' 'netcfg>=2.5.4-1' 'tiacx>=20080210-18' 'tiacx-firmware>=2-3' 'parted>=2.3-1' 'tzdata>=2010o-1' 'ntp>=4.2.6.p2-1' 'libgcrypt>=1.4.6-1' 'iw>=0.9.20-1' 'crda>=1.1.1-1' 'libnl>=1.1-2' 'iproute2>=2.6.35-4' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.9-11' 'dhclient>=4.2.0.1-1' 'syslinux>=4.03-1' 'mtools>=4.0.14-1' 'fsarchiver>=0.6.10-2' 'xz>=5.0.0-1' 'libtirpc>=0.2.1-2' 'librpcsecgss>=0.19-3' 'rpcbind>=0.2.0-2' 'testdisk>=6.11.3-3' 'wipe>=2.3.0-1' 'clamav>=0.96.5-1' 'ddrescue>=1.13-1' 'udev>=164-3' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-1' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-1' 'libgssglue>=0.1-3' 'mkinitcpio-nfs-utils>=0.2-1' 'gdisk>=0.6.13-1' 'nilfs-utils>=2.0.20-1' 'btrfs-progs-unstable>=0.19.20100607-3' 'ndiswrapper-lts>=1.56-3' 'nouveau-drm-lts>=0.0.16_20100313-4' 'linux-firmware>=20101108-1' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1')
+depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'tcp_wrappers>=7.6-12' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-1')
+optdepends=('grub2-bios: for grub2 support'
+            'grub2-efi-i386: for grub2 support'
+            'grub2-efi-x86_64: for grub2 support'
+            'efibootmgr: for grub2 support'
+)
 source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$pkgrel.tar.bz2 vmware-detect.c)
 backup=('etc/archboot/allinone.conf'
         'etc/archboot/allinone-lts.conf'
@@ -39,5 +44,5 @@ build()
   gcc -o vmware-detect vmware-detect.c
   install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect
 }
-md5sums=('c122578bfa40e4d11f570ab066a98abf'
+md5sums=('eac77ae13bf2e6b5a92317b9885c69dd'
          '7e2b03463747cb22ab388e79a09fa0cb')
diff --git a/extra/archboot/archboot.install b/extra/archboot/archboot.install
index 25d9c88d4..315f97d7e 100644
--- a/extra/archboot/archboot.install
+++ b/extra/archboot/archboot.install
@@ -18,7 +18,3 @@ EOF
 post_upgrade() {
   post_install $1
 }
-
-op=$1
-shift
-$op $*
diff --git a/extra/bogofilter/PKGBUILD b/extra/bogofilter/PKGBUILD
index d973643f2..860895cf9 100644
--- a/extra/bogofilter/PKGBUILD
+++ b/extra/bogofilter/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 110357 2011-02-18 23:42:09Z allan $
+# $Id: PKGBUILD 127873 2011-06-19 06:22:51Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Low Kian Seong <fastmail_low@speedymail.org>
 
 pkgname=bogofilter
 pkgver=1.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A fast Bayesian spam filtering tool"
 arch=('i686' 'x86_64')
-license=(GPL3)
+license=('GPL3')
 url="http://bogofilter.sourceforge.net"
 depends=('db' 'perl' 'gsl')
-backup=(etc/bogofilter/bogofilter.cf)
+backup=('etc/bogofilter/bogofilter.cf')
 source=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}-current/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('4bcabdf8c5e7efefcb508eda7e80eebc')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
               --sysconfdir=/etc/bogofilter  \
               --localstatedir=/var \
@@ -24,11 +24,11 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
-  mv ${pkgdir}/etc/bogofilter/bogofilter.cf.example ${pkgdir}/etc/bogofilter/bogofilter.cf
+  mv "${pkgdir}/etc/bogofilter/bogofilter.cf.example" "${pkgdir}/etc/bogofilter/bogofilter.cf"
 
-  install -dm755 ${pkgdir}/usr/share/${pkgname}/contrib
-  install -m644 contrib/* ${pkgdir}/usr/share/${pkgname}/contrib/
+  install -dm755 "${pkgdir}/usr/share/${pkgname}/contrib"
+  install -m644 contrib/* "${pkgdir}/usr/share/${pkgname}/contrib/"
 }
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index 09a8564f2..b48969b16 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124918 2011-05-25 08:15:13Z ibiru $
+# $Id: PKGBUILD 127579 2011-06-16 17:10:43Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=claws-mail
 pkgver=3.7.9
-pkgrel=3
+pkgrel=4
 pkgdesc="A GTK+ based e-mail client."
 arch=('i686' 'x86_64')
 license=('GPL3')
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index 040385490..d7303a1eb 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124640 2011-05-23 17:24:46Z ibiru $
+# $Id: PKGBUILD 129456 2011-06-28 01:27:57Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
 pkgver=3.0.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop"
 arch=('i686' 'x86_64')
 depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD
index c494c1fba..a04bdc13b 100644
--- a/extra/evolution-exchange/PKGBUILD
+++ b/extra/evolution-exchange/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124646 2011-05-23 18:11:32Z ibiru $
+# $Id: PKGBUILD 129506 2011-06-28 14:23:10Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-exchange
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Ximian Connector Exchange plugin for Evolution"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/libetpan/PKGBUILD b/extra/libetpan/PKGBUILD
index f28bf561b..107264bc4 100644
--- a/extra/libetpan/PKGBUILD
+++ b/extra/libetpan/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 96521 2010-10-22 00:32:21Z allan $
+# $Id: PKGBUILD 127576 2011-06-16 17:03:09Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libetpan
 pkgver=1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A portable middleware for email access"
 arch=('i686' 'x86_64')
 url="http://www.etpan.org/"
 license=("custom:etpan")
-depends=('db>=5.1' 'libsasl>=2.1.23' 'curl>=7.19.5' 'expat>=2.0.1-1')
+depends=('db>=5.2.28' 'libsasl>=2.1.23' 'curl>=7.21.' 'expat>=2.0.1-1')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('5addc766141a0b1d29ee1ca4ba1b6808')
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 4ec3d5b00..74b940110 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 129540 2011-06-28 18:38:58Z andyrtr $
+# $Id: PKGBUILD 130106 2011-07-02 19:39:19Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -26,7 +26,7 @@ pkgname=('libreoffice' 'libreoffice-sdk'
 	'libreoffice-extension-wiki-publisher')
 _LOver=3.4.1.3
 pkgver=3.4.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
 _OFFICEUPD="340"
diff --git a/extra/libreoffice/libreoffice.install b/extra/libreoffice/libreoffice.install
index 27f3173ae..177f0d4e6 100644
--- a/extra/libreoffice/libreoffice.install
+++ b/extra/libreoffice/libreoffice.install
@@ -4,7 +4,7 @@ gtk-update-icon-cache -f -q /usr/share/icons/hicolor
 update-desktop-database -q
 update-mime-database usr/share/mime > /dev/null 2>&1
 
-echo " * see http://wiki.archlinux.org/index.php/Openoffice"
+echo " * see https://wiki.archlinux.org/index.php/LibreOffice"
 echo " * you may want to pacman -Ss libreoffice-extensions"
 echo "   to see what extensions are prepared to install"
 echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg for spell checking"
diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD
index 535afc1a5..d782e1b0f 100644
--- a/extra/moc/PKGBUILD
+++ b/extra/moc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 126916 2011-06-08 17:30:45Z eric $
+# $Id: PKGBUILD 127443 2011-06-15 03:16:57Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=moc
 pkgver=20110528
-pkgrel=2
+pkgrel=3
 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats"
 arch=('i686' 'x86_64')
 url="http://moc.daper.net/"
diff --git a/extra/mod_perl/PKGBUILD b/extra/mod_perl/PKGBUILD
index 96719acbb..9f3595deb 100644
--- a/extra/mod_perl/PKGBUILD
+++ b/extra/mod_perl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 129570 2011-06-28 22:45:51Z angvp $
+# $Id: PKGBUILD 129799 2011-06-28 23:07:22Z angvp $
 # Maintainer: Firmicus <francois.archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=mod_perl
 pkgver=2.0.5
-pkgrel=6
+pkgrel=7
 pkgdesc="Apache module that embeds the Perl interpreter within the server"
 url="http://search.cpan.org/dist/${pkgname}/"
 depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid')
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index 639fd702c..2d61cac2e 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 126056 2011-06-01 08:38:57Z andrea $
+# $Id: PKGBUILD 130378 2011-07-06 07:48:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.13
+pkgver=5.5.14
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@ options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
         'mysqld'
         'my.cnf')
-md5sums=('f0e519e90ee7c00fceb0730edf859d7b'
+md5sums=('19f43bb9c72b1b5f7ff86a7f921c9244'
          '2234207625baa29b2ff7d7b4f088abce'
          '1c949c0dbea5206af0db14942d9927b6')
 
@@ -103,7 +103,7 @@ package_mysql(){
   pkgdesc="A fast SQL database server"
   backup=('etc/mysql/my.cnf')
   install=mysql.install
-  depends=('mysql-clients')
+  depends=('mysql-clients' 'net-tools')
   optdepends=('perl-dbi' 'perl-dbd-mysql')
 
   cd "${srcdir}"/build
diff --git a/extra/openldap/PKGBUILD b/extra/openldap/PKGBUILD
index 7e6266083..44029b398 100644
--- a/extra/openldap/PKGBUILD
+++ b/extra/openldap/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 109957 2011-02-14 13:18:22Z andrea $
+# $Id: PKGBUILD 127879 2011-06-19 07:32:04Z andrea $
 # Maintainer:
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=openldap
 pkgver=2.4.24
-pkgrel=1
+pkgrel=2
 pkgdesc="LDAP Server"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.openldap.org/"
 backup=('etc/openldap/slapd.conf' 'etc/default/slapd' 'etc/conf.d/slapd')
-depends=("libldap>=${pkgver}" 'db' 'tcp_wrappers' 'libfetch' 'util-linux-ng')
+depends=("libldap>=${pkgver}" 'tcp_wrappers' 'libfetch' 'util-linux-ng')
 provides=('openldap-clients')
 replaces=('openldap-clients')
 source=("ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgname}-${pkgver}.tgz"
@@ -19,9 +19,10 @@ source=("ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgname}-${pkgve
 md5sums=('116fe1e23a7b67686d5e62274367e6c0'
          '832354417c495f29affd2c772808959d'
          '6be69f6b7e522cb64cce8703da81ed32')
+options=('emptydirs')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}"/${pkgname}-${pkgver}
    
   export LIBS=-ldb
   ./configure --prefix=/usr \
@@ -71,36 +72,36 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}"/${pkgname}-${pkgver}
   
   cd servers
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 
   cd ../clients
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 
   cd ../doc/man
   for dir in man{1,5,8}; do
     pushd ${dir}
-    make DESTDIR=${pkgdir} install
+    make DESTDIR="${pkgdir}" install
     popd
   done
-  rm ${pkgdir}/usr/share/man/man5/ldap.conf.5
+  rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5
 
   cd ../..
 
-  install -dm700 ${pkgdir}/etc/openldap/slapd.d
-  install -Dm755 ${srcdir}/slapd ${pkgdir}/etc/rc.d/slapd
-  install -Dm644 ${srcdir}/slapd.default ${pkgdir}/etc/conf.d/slapd
-  install -dm700 ${pkgdir}/var/lib/openldap
+  install -dm700 "${pkgdir}"/etc/openldap/slapd.d
+  install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd
+  install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd
+  install -dm700 "${pkgdir}"/var/lib/openldap
   
   # get rid of duplicate default conf files
-  rm ${pkgdir}/etc/openldap/*.default
+  rm "${pkgdir}"/etc/openldap/*.default
 
   # hack to fix screwed up dirs
   sed -e 's|^pidfile[[:space:]].*$|pidfile   /var/run/slapd.pid|g' \
       -e 's|^argsfile[[:space:]].*$|argsfile  /var/run/slapd.args|g' \
-      -i ${pkgdir}/etc/openldap/slapd.conf
+      -i "${pkgdir}"/etc/openldap/slapd.conf
       
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index ccbaae0cd..4e7f515cd 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 126095 2011-06-01 12:12:00Z pierre $
+# $Id: PKGBUILD 127446 2011-06-15 08:33:01Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -24,7 +24,7 @@ pkgname=('php'
          'php-tidy'
          'php-xsl')
 pkgver=5.3.6
-pkgrel=4
+pkgrel=5
 _suhosinver=${pkgver}-0.9.10
 arch=('i686' 'x86_64')
 license=('PHP')
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index d22a45cfd..7ae08c572 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 124325 2011-05-19 16:07:15Z bisson $
+# $Id: PKGBUILD 127765 2011-06-18 08:12:47Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=postfix
 pkgver=2.8.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)'
 url='http://www.postfix.org/'
 arch=('i686' 'x86_64')
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index f1c56f85d..e0c363027 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -1,31 +1,27 @@
-# $Id: PKGBUILD 127261 2011-06-12 03:23:25Z stephane $
+# $Id: PKGBUILD 129895 2011-06-29 15:22:59Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributer: Allan McRae <allan@archlinux.org>
 # Contributer: Jason Chu <jason@archlinux.org>
 
 pkgname=python2
 pkgver=2.7.2
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
 license=('PSF')
 url="http://www.python.org/"
-depends=('db' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
 makedepends=('tk')
 optdepends=('tk: for IDLE')
 conflicts=('python<3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
-        python-2.7-db51.patch)
-sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53'
-         '9667a2a2f8594902b352793e649f78696a77bd13')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
+sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
 
-  patch -Np1 -i ../python-2.7-db51.patch
-
   # Temporary workaround for FS#22322
   # See http://bugs.python.org/issue10835 for upstream report
   sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
@@ -33,7 +29,7 @@ build() {
   # Enable built-in SQLite3 module to load extensions (fix FS#22122)
   sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
 
-  # FS#2399
+  # FS#23997
   sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
 
   # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD
index 684da1bf2..58b3a41d0 100644
--- a/extra/raptor/PKGBUILD
+++ b/extra/raptor/PKGBUILD
@@ -1,22 +1,31 @@
-# $Id: PKGBUILD 126317 2011-06-04 16:06:41Z andyrtr $
+# $Id: PKGBUILD 130397 2011-07-06 11:19:50Z andrea $
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=raptor
 pkgver=2.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
 arch=('i686' 'x86_64')
 url="http://librdf.org/raptor"
-depends=('libxml2>=2.7.8' 'curl>=7.21.2' 'zlib>=1.2.5' 'libxslt>=1.1.26')
+depends=('libxml2>=2.7.8' 'curl>=7.21.7' 'zlib>=1.2.5' 'libxslt>=1.1.26')
 license=('LGPL')
 options=('!libtool')
-source=(http://librdf.org/dist/source/raptor2-$pkgver.tar.gz)
-md5sums=('46eff4b20f8752d1146a3e0c8b2168dd')
+source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz"
+        'fix-soprano-bug.patch')
+md5sums=('46eff4b20f8752d1146a3e0c8b2168dd'
+         'fd63150d1e9f83bb59af0d86c373c8fa')
 
 build() {
   cd ${srcdir}/raptor2-${pkgver}
+
+  # see http://bugs.librdf.org/mantis/view.php?id=451
+  patch -p1 -i "${srcdir}"/fix-soprano-bug.patch
+
+  # fix build with curl >= 7.21.2
+  sed -i '/#include <curl\/types.h>/d' src/raptor_internal.h
+
   ./configure --prefix=/usr --disable-static
   make
 }
diff --git a/extra/raptor/fix-soprano-bug.patch b/extra/raptor/fix-soprano-bug.patch
new file mode 100644
index 000000000..ec7f087e0
--- /dev/null
+++ b/extra/raptor/fix-soprano-bug.patch
@@ -0,0 +1,20 @@
+diff --git a/src/turtle_lexer.l b/src/turtle_lexer.l
+index c2f249b..f133747 100644
+--- a/src/turtle_lexer.l
++++ b/src/turtle_lexer.l
+@@ -381,9 +381,13 @@ EXPONENT [eE][+-]?[0-9]+
+                while(1) {
+                   int c = yytext[yyleng - 1];
+                   if(c == '{' || c == ' ' || c=='\t' || c == '\v' || c == '\n' ||
+-                     c == ':' || c == '-') {
++                     c == '=' ) {
+                     yyleng--;
+-                  } else
++                  } 
++                  else if ( yyleng >= 2 && ( c == '-' && yytext[yyleng - 2] == ':' ) ) { 
++                    yyleng -= 2;
++                  }
++                  else
+                     break;
+                 }
+                 yytext[yyleng] = '\0';
diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD
index 1ae150d37..949804063 100644
--- a/extra/redland/PKGBUILD
+++ b/extra/redland/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 120965 2011-04-27 19:29:40Z andrea $
+# $Id: PKGBUILD 129914 2011-06-29 19:31:01Z andrea $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Francois Charette <francois.archlinux.org> 
 
 pkgbase=redland
 epoch=1
 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite')
-pkgver=1.0.12
-pkgrel=1
+pkgver=1.0.13
+pkgrel=4
 url="http://librdf.org/"
 license=("GPL")
 arch=('i686' 'x86_64')
-makedepends=('rasqal>=0.9.21' 'raptor1' 'db>=5.1' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
+makedepends=('rasqal>=0.9.26' 'raptor>=2.0.3' 'db>=5.2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
 options=('!libtool')
 source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz
         rpath.diff)
-md5sums=('40f37a5ad97fdfbf984f78dcea0c6115'
+md5sums=('96c15f36f842ad7e1c9d225e4ca97b68'
          'acc85e784f01a656bd56777f95880787')
 
 build() {
@@ -34,9 +34,7 @@ build() {
 
 package_redland() {
  pkgdesc="Library that provides a high-level interface to RDF data"
- depends=('rasqal>=0.9.21' 'raptor1' 'libtool')
- replaces=('redland-compat' 'redland-compat-devel')
- conflicts=('redland-compat' 'redland-compat-devel')
+ depends=('rasqal>=0.9.26' 'raptor>=2.0.3' 'libtool')
  
   cd ${srcdir}/${pkgbase}-${pkgver}
   make DESTDIR=${pkgdir} install
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 0cbf5438b..a829449da 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125918 2011-05-31 21:19:50Z andrea $
+# $Id: PKGBUILD 127449 2011-06-15 09:33:37Z eric $
 # Maintainer:
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
@@ -7,13 +7,13 @@
 pkgbase=ruby
 pkgname=('ruby' 'ruby-docs')
 pkgver=1.9.2_p180
-pkgrel=2
+pkgrel=3
 pkgdesc="An object-oriented language for quick and easy programming"
 arch=('i686' 'x86_64')
 url="http://www.ruby-lang.org/en/"
 license=('custom')
 makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz')
-options=('!emptydirs')
+options=('!emptydirs' '!makeflags')
 source=("ftp://ftp.ruby-lang.org/pub/${pkgbase}/1.9/${pkgbase}-${pkgver//_/-}.tar.bz2")
 md5sums=('68510eeb7511c403b91fe5476f250538')
 sha1sums=('10824b44c8060c7b9b5afc0b3519a1e9f02f7fe5')
@@ -44,6 +44,6 @@ package_ruby-docs() {
   depends=('ruby')
 
   cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
-  make -j1 DESTDIR="${pkgdir}" install-doc install-capi
+  make DESTDIR="${pkgdir}" install-doc install-capi
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 6bd883503..09284b3d3 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 122577 2011-05-04 17:48:52Z ibiru $
+# $Id: PKGBUILD 130383 2011-07-06 08:32:50Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
 pkgname=('smbclient' 'samba')
-pkgver=3.5.8
+pkgver=3.5.9
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.5.8
-pkgrel=3
+_realver=3.5.9
+pkgrel=2
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
@@ -79,7 +79,6 @@ backup=(etc/logrotate.d/samba
         etc/conf.d/samba)
 depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'fam' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
   cd ${srcdir}/samba-${_realver}/source3
-  mkdir -p ${pkgdir}/var/log/samba
   mkdir -p ${pkgdir}/etc/samba/private
   chmod 700 ${pkgdir}/etc/samba/private
   make DESTDIR=${pkgdir} install
@@ -130,8 +129,8 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-md5sums=('355b4530c20997e94aebc74cd6ea5307'
-         '891b9be03e7adf65c9a00319c76d33e5'
+md5sums=('fc3fe1103cf9d71abe12a8c604f31c76'
+         'a3da19515a234c703876cf850c44e996'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
          '96f82c38f3f540b53f3e5144900acf17'
diff --git a/extra/samba/samba b/extra/samba/samba
index 1b222d6cc..458eb8e2b 100755
--- a/extra/samba/samba
+++ b/extra/samba/samba
@@ -13,6 +13,9 @@ case "$1" in
 		if [ ! -x /var/run/samba ] ; then
 			install -m755 -g 81 -o 81 -d /var/run/samba
 		fi
+                if [ ! -x /var/log/samba ] ; then
+                        install -m755 -g 81 -o 81 -d /var/log/samba
+                fi
 		for d in ${SAMBA_DAEMONS[@]}; do
 			PID=`pidof -o %PPID /usr/sbin/$d`
 			[ -z "$PID" ] && /usr/sbin/$d -D
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 19cb12294..8f8e8adbe 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,26 +1,34 @@
-# $Id: PKGBUILD 127222 2011-06-11 09:32:25Z andrea $
+# $Id: PKGBUILD 130071 2011-07-01 21:53:41Z stephane $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
 pkgver=1.6.17
-pkgrel=4
-pkgdesc="Replacement for CVS, another versioning system (SVN)"
+pkgrel=6
+pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64')
 license=('apache' 'bsd')
 depends=('neon' 'apr-util' 'sqlite3')
+optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion')
 makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 
              'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
-source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2
-        svnserve svn svnserve.conf svnmerge.py
-        subversion.rpath.fix.patch
-        subversion.suppress.deprecation.warnings.patch)
-
 backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
 url="http://subversion.apache.org/"
 provides=('svn')
 options=('!makeflags' '!libtool')
-optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion')
+source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2
+        svnserve svn svnserve.conf svnmerge.py
+        subversion.rpath.fix.patch
+        subversion.suppress.deprecation.warnings.patch
+        subversion-perl-bindings.patch)
+md5sums=('81e5dc5beee4b3fc025ac70c0b6caa14'
+         'a2b029e8385007ffb99b437b30521c90'
+         'a0db6dd43af33952739b6ec089852630'
+         'c459e299192552f61578f3438abf0664'
+         'a6371baeda7e224504629ecdda2749b4'
+         '6b4340ba9d8845cd8497e013ae01be3f'
+         '1166f3b7413d7e7450299b3525680bbe'
+         '0591aa39837931161b4d61ff35c7b147')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
@@ -30,12 +38,13 @@ build() {
    # apply patches
    patch -Np0 -i ../subversion.rpath.fix.patch
    patch -Np1 -i ../subversion.suppress.deprecation.warnings.patch
+   patch -Np1 -i ../subversion-perl-bindings.patch
 
    # configure
    autoreconf
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
                --with-zlib=/usr --with-neon=/usr --with-apxs \
-               --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.1 \
+               --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.2 \
                --enable-javahl --with-gnome-keyring --with-kwallet
 
    # build
@@ -89,10 +98,3 @@ package() {
    install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \
                ${pkgdir}/etc/bash_completion.d/subversion
 }
-md5sums=('81e5dc5beee4b3fc025ac70c0b6caa14'
-         'a2b029e8385007ffb99b437b30521c90'
-         'a0db6dd43af33952739b6ec089852630'
-         'c459e299192552f61578f3438abf0664'
-         'a6371baeda7e224504629ecdda2749b4'
-         '6b4340ba9d8845cd8497e013ae01be3f'
-         '1166f3b7413d7e7450299b3525680bbe')
diff --git a/extra/subversion/subversion-perl-bindings.patch b/extra/subversion/subversion-perl-bindings.patch
new file mode 100644
index 000000000..3c34daa47
--- /dev/null
+++ b/extra/subversion/subversion-perl-bindings.patch
@@ -0,0 +1,12 @@
+diff -Naur subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in
+--- subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in	2010-11-24 20:42:16.000000000 +0000
++++ subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in	2011-07-01 20:16:16.520892074 +0000
+@@ -43,7 +43,7 @@
+ my %config = (
+     ABSTRACT => 'Perl bindings for Subversion',
+     DEFINE => $cppflags,
+-    CCFLAGS => $cflags,
++    CCFLAGS => $Config{ccflags},
+     INC  => join(' ',$apr_cflags, $apu_cflags, 
+                  " -I$swig_srcdir/perl/libsvn_swig_perl",
+                  " -I$svnlib_srcdir/include",