Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	core/sed/PKGBUILD
	extra/tcl/PKGBUILD
	extra/transmission/PKGBUILD

1 files changed, 10 insertions, 6 deletions

diff --git a/core/sed/PKGBUILD b/core/sed/PKGBUILD
index 994ff8a2b..bbc9a1078 100644
--- a/core/sed/PKGBUILD
+++ b/core/sed/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142078 2011-11-04 23:36:15Z allan $
+# $Id: PKGBUILD 173887 2012-12-27 05:05:41Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=sed
-pkgver=4.2.1
-pkgrel=4.2
+pkgver=4.2.2
+pkgrel=1
 pkgdesc="GNU stream editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/sed"
@@ -14,12 +14,12 @@ depends=('acl' 'sh')
 makedepends=('gettext')
 install=sed.install
 source=(ftp://ftp.gnu.org/pub/gnu/sed/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('f0fd4d7da574d4707e442285fd2d3b86'
-         '91871b227dbf0916e019ba1fb0fbfdf3')
+md5sums=('4111de4faa3b9848a0686b2f260c5056'
+         '86a5ab72f414d4cb38126e8e27cf0101')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --bindir=/bin --without-included-regex
+  ./configure --prefix=/usr
   make
 }
 
@@ -31,4 +31,8 @@ check() {
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
+  
+  mkdir $pkgdir/bin
+  ln -s ../usr/bin/sed $pkgdir/bin
+  
 }