Tue Jun 28 23:10:22 UTC 2011

6 files changed, 134 insertions, 20 deletions

diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD
index bcfd44008..790948675 100644
--- a/testing/binutils/PKGBUILD
+++ b/testing/binutils/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 126772 2011-06-07 07:37:01Z allan $
+# $Id: PKGBUILD 129398 2011-06-27 11:06:48Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=binutils
-pkgver=2.21
-pkgrel=9
-_date=20110605
+pkgver=2.21.1
+pkgrel=1
+_date=20110627
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/binutils/"
 license=('GPL')
 groups=('base')
 depends=('glibc>=2.14' 'zlib')
-makedepends=('dejagnu')
+checkdepends=('dejagnu')
 options=('!libtool' '!distcc' '!ccache')
 install=binutils.install
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2)
-md5sums=('a2e7784d5d66c1d692a0a1fa248ea66c')
+md5sums=('2face559e80d649ba148e42bb2d1fb0f')
 
 mksource() {
   mkdir ${pkgname}-${_date}
@@ -40,7 +40,7 @@ build() {
     --enable-plugins --enable-threads \
     --enable-shared $CONFIGFLAG
 
-  # This checks the host environment and makes sure all the necessary tools are available to compile Binutils.
+  # check the host environment and makes sure all the necessary tools are available
   make configure-host
 
   make tooldir=${pkgdir}/usr
diff --git a/testing/git/PKGBUILD b/testing/git/PKGBUILD
index 713c5dd11..e4ae40280 100644
--- a/testing/git/PKGBUILD
+++ b/testing/git/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 126224 2011-06-02 19:12:58Z dan $
+# $Id: PKGBUILD 129435 2011-06-27 17:14:23Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.5.4
+pkgver=1.7.6
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
 url="http://git-scm.com/"
 license=('GPL2')
-depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.12.2')
+depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0')
 makedepends=('python2' 'emacs')
 optdepends=('tk: gitk and git gui'
             'perl-libwww: git svn'
@@ -47,7 +47,7 @@ package() {
     INSTALLDIRS=vendor DESTDIR="$pkgdir" install 
 
   # bash completion
-  mkdir -p $pkgdir/etc/bash_completion.d/
+  mkdir -p "$pkgdir"/etc/bash_completion.d/
   install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git 
   # more contrib stuff
   cp -a ./contrib $pkgdir/usr/share/git/ 
@@ -75,11 +75,11 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-md5sums=('4985b774db84d3bbcc2b8d90952552a3'
-         '7a74ef1c64395a07301359a8707c828a'
+md5sums=('9e0a438eb71e89eedb61f89470ed32a0'
+         'a017935cf9e90d9f056b6547c318fd15'
          '8e2648910fd5dd4f1c41d3c7fa9e9156'
          '2e42bf97779a1c6411d89043334c9e78')
-sha256sums=('fed9a6c7d07b063cfba9e3eb40fbd0d8120785225289fcf2fb56bee18dffd5ee'
-            '87d612195426fedfe4ee5274d9903e8f85aa16c410b4a3ba41610c23ed9211d7'
+sha256sums=('778795cece63cd758192378f3a999870cea290181b3a4c9de573c77192561082'
+            'a0ffd7e16997262ef741db5e2dd8eabf44b6767cf1a213753c7d8a268b4553ad'
             '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598'
             'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68')
diff --git a/testing/perl-xml-parser/PKGBUILD b/testing/perl-xml-parser/PKGBUILD
index 46ffa0923..021aa1b05 100644
--- a/testing/perl-xml-parser/PKGBUILD
+++ b/testing/perl-xml-parser/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124562 2011-05-22 23:45:41Z andrea $
+# $Id: PKGBUILD 129383 2011-06-27 06:10:42Z andrea $
 # Maintainer:
 # Contributor: firmicus <francois@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
@@ -6,8 +6,8 @@
 
 pkgname=perl-xml-parser
 _realname=XML-Parser
-pkgver=2.40
-pkgrel=3
+pkgver=2.41
+pkgrel=1
 pkgdesc="Expat-based XML parser module for perl"
 arch=('i686' 'x86_64')
 license=('GPL' 'PerlArtistic')
@@ -16,8 +16,8 @@ depends=('perl' 'expat')
 replaces=('perlxml')
 provides=("perlxml=${pkgver}")
 options=('!emptydirs')
-source=("http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/${_realname}-${pkgver}.tar.gz")
-md5sums=('c66e9adba003d0667cc40115ccd837a5')
+source=("http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/${_realname}-${pkgver}.tar.gz")
+md5sums=('c320d2ffa459e6cdc6f9f59c1185855e')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
diff --git a/testing/readline/PKGBUILD b/testing/readline/PKGBUILD
new file mode 100644
index 000000000..765b76685
--- /dev/null
+++ b/testing/readline/PKGBUILD
@@ -0,0 +1,61 @@
+# $Id: PKGBUILD 129370 2011-06-27 05:49:47Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=readline
+_basever=6.2
+_patchlevel=001 #prepare for some patches
+pkgver=$_basever.$_patchlevel
+pkgrel=2
+pkgdesc="GNU readline library"
+arch=('i686' 'x86_64')
+url="http://tiswww.case.edu/php/chet/readline/rltop.html"
+license=('GPL')
+depends=('glibc' 'ncurses')
+backup=('etc/inputrc')
+options=('!emptydirs')
+install=readline.install
+source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz
+        inputrc)
+if [ $_patchlevel -gt 00 ]; then
+    for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
+        source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p))
+    done
+fi
+md5sums=('67948acb2ca081f23359d0256e9a271c'
+         '58d54966c1191db45973cb3191ac621a'
+         '83287d52a482f790dfb30ec0a8746669')
+
+build() {
+  cd ${srcdir}/${pkgname}-$_basever
+  for p in ../readline${_basever//./}-*; do
+    [ -e "$p" ] || continue
+    msg "applying patch ${p}"
+    patch -Np0 -i ${p}
+  done
+
+  # Remove RPATH from shared objects (FS#14366)
+  sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
+
+  # build with -fPIC for x86_64 (FS#15634)
+  [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC"
+
+  ./configure --prefix=/usr --libdir=/lib
+  make SHLIB_LIBS=-lncurses
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-$_basever
+  make DESTDIR=${pkgdir} install
+  
+  install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc
+
+  # FHS recommends only shared libs in /lib
+  install -dm755 $pkgdir/usr/lib
+  mv $pkgdir/lib/*.a $pkgdir/usr/lib
+
+  # to make the linker find the shared lib and fix compile issues
+  cd ${pkgdir}/usr/lib
+  ln -sv /lib/libreadline.so .
+  ln -sv /lib/libhistory.so .
+}
diff --git a/testing/readline/inputrc b/testing/readline/inputrc
new file mode 100644
index 000000000..fd13a673b
--- /dev/null
+++ b/testing/readline/inputrc
@@ -0,0 +1,36 @@
+# do not bell on tab-completion
+#set bell-style none
+
+set meta-flag on
+set input-meta on
+set convert-meta off
+set output-meta on
+
+$if mode=emacs
+
+# for linux console and RH/Debian xterm
+"\e[1~": beginning-of-line
+"\e[4~": end-of-line
+"\e[5~": beginning-of-history
+"\e[6~": end-of-history
+"\e[7~": beginning-of-line
+"\e[3~": delete-char
+"\e[2~": quoted-insert
+"\e[5C": forward-word
+"\e[5D": backward-word
+"\e\e[C": forward-word
+"\e\e[D": backward-word
+"\e[1;5C": forward-word
+"\e[1;5D": backward-word
+
+# for rxvt
+"\e[8~": end-of-line
+
+# for non RH/Debian xterm, can't hurt for RH/DEbian xterm
+"\eOH": beginning-of-line
+"\eOF": end-of-line
+
+# for freebsd console
+"\e[H": beginning-of-line
+"\e[F": end-of-line
+$endif
diff --git a/testing/readline/readline.install b/testing/readline/readline.install
new file mode 100644
index 000000000..06b646f23
--- /dev/null
+++ b/testing/readline/readline.install
@@ -0,0 +1,17 @@
+infodir=usr/share/info
+filelist=(history.info readline.info rluserman.info)
+
+post_upgrade() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+