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

Conflicts:
	community/perl-package-stash-xs/PKGBUILD
	extra/mesa/PKGBUILD

1 files changed, 11 insertions, 9 deletions

diff --git a/core/ncurses/PKGBUILD b/core/ncurses/PKGBUILD
index 48d2dd65d..dd9889019 100644
--- a/core/ncurses/PKGBUILD
+++ b/core/ncurses/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 177037 2013-02-05 00:36:51Z allan $
+# $Id: PKGBUILD 180326 2013-03-20 13:37:40Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=ncurses
 pkgver=5.9
-pkgrel=4
+pkgrel=5
 pkgdesc="System V Release 4.0 curses emulation library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/ncurses/"
@@ -25,7 +25,7 @@ build() {
   # add --enable-ext-colors and --enable-ext-mouse with next soname bump
   make
 
-  # libncurses.so.5 for external binary support 
+  # libraries for external binary support 
   cd ${srcdir}/ncurses-build
   [ $CARCH = "x86_64" ] && CONFIGFLAG="--with-chtype=long"
   ../${pkgname}-${pkgver}/configure --prefix=/usr \
@@ -37,7 +37,7 @@ package() {
   cd ${srcdir}/ncursesw-build
   make DESTDIR=${pkgdir} install
 
-  # Fool packages looking to link to non-wide-character ncurses libraries
+  # fool packages looking to link to non-wide-character ncurses libraries
   for lib in ncurses form panel menu; do
     echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib/lib${lib}.so
     ln -s lib${lib}w.a ${pkgdir}/usr/lib/lib${lib}.a
@@ -48,16 +48,18 @@ package() {
     ln -s ${lib}w.pc ${pkgdir}/usr/lib/pkgconfig/${lib}.pc
   done
 
-  # Some packages look for -lcurses during build
+  # some packages look for -lcurses during build
   echo "INPUT(-lncursesw)" >${pkgdir}/usr/lib/libcursesw.so
   ln -s libncurses.so ${pkgdir}/usr/lib/libcurses.so
   ln -s libncursesw.a ${pkgdir}/usr/lib/libcursesw.a
   ln -s libncurses.a ${pkgdir}/usr/lib/libcurses.a
 
-  # non-widec compatibility library
-  cd ${srcdir}/ncurses-build        
-  install -Dm755 lib/libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.${pkgver}
-  ln -s libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.5
+  # non-widec compatibility libraries
+  cd ${srcdir}/ncurses-build
+  for lib in ncurses form panel menu; do
+    install -Dm755 lib/lib${lib}.so.${pkgver} ${pkgdir}/usr/lib/lib${lib}.so.${pkgver}
+    ln -s lib${lib}.so.${pkgver} ${pkgdir}/usr/lib/lib${lib}.so.5
+  done
 
   # install license, rip it from the readme
   cd ${srcdir}/${pkgname}-${pkgver}