3 files changed, 22 insertions, 44 deletions
diff --git a/abs/core/ncurses/ChangeLog b/abs/core/ncurses/ChangeLog
deleted file mode 100644
index f52c19c..0000000
--- a/abs/core/ncurses/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2008-11-15  Allan McRae <allan@archlinux.org>
-	* ncurses-5.7-2
-	* fix installation of non-wide charater libraries (FS#12124)
-
-2008-11-03  Allan McRae <allan@archlinux.org>
-	* ncurses-5.7-1
-	* upstream update
-	* remove coverity patch (included upstream)
-	* enable makeflags
diff --git a/abs/core/ncurses/PKGBUILD b/abs/core/ncurses/PKGBUILD
index 017e900..b55c210 100644
--- a/abs/core/ncurses/PKGBUILD
+++ b/abs/core/ncurses/PKGBUILD
@@ -1,27 +1,30 @@
-# $Id: PKGBUILD 77821 2010-04-18 09:29:42Z allan $
+# $Id: PKGBUILD 150103 2012-02-12 13:47:59Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=ncurses
-pkgver=5.7
+pkgver=5.9
 pkgrel=3
 pkgdesc="System V Release 4.0 curses emulation library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/ncurses/"
 license=('MIT')
 depends=('glibc')
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('cce05daf61a64501ef6cd8da1f727ec6')
+source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
+md5sums=('8cb9c412e5f2d96bc6f459aa8c6282a1'
+         '014ffdbbfec6d41a9a89d6cbe6434638')
 
 build() {
   cd ${srcdir}/
   mkdir ncurses{,w}-build
-  
+
   cd ${srcdir}/ncursesw-build
   ../${pkgname}-${pkgver}/configure --prefix=/usr --mandir=/usr/share/man \
      --with-shared --with-normal --without-debug --without-ada \
-     --with-install-prefix=${pkgdir} --enable-widec 
-  make || return 1
+     --with-install-prefix=${pkgdir} --enable-widec \
+     --enable-pc-files
+  # add --enable-ext-colors with next soname bump
+  make
 
   # libncurses.so.5 for external binary support 
   cd ${srcdir}/ncurses-build
@@ -29,41 +32,34 @@ build() {
   ../${pkgname}-${pkgver}/configure --prefix=/usr \
     --with-shared --with-normal --without-debug --without-ada \
     --with-install-prefix=${pkgdir} $CONFIGFLAG
-  make || return 1
+  make
 }
 
 package() {
   cd ${srcdir}/ncursesw-build
   make install
 
-  # move libraries needed for boot to /lib (we call tput in initscripts)
-  install -dm755 ${pkgdir}/lib
-  mv ${pkgdir}/usr/lib/libncursesw.so.5* ${pkgdir}/lib
-  ln -sf ../../lib/libncursesw.so.5 ${pkgdir}/usr/lib/libncursesw.so
-
   # Fool packages looking to link to non-wide-character ncurses libraries
-  for lib in curses ncurses form panel menu ; do \
-    rm -f ${pkgdir}/usr/lib/lib${lib}.so ; \
-    echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib/lib${lib}.so ; \
-    ln -sf lib${lib}w.a ${pkgdir}/usr/lib/lib${lib}.a ; \
+  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
   done
-  ln -sf libncurses++w.a ${pkgdir}/usr/lib/libncurses++.a
+  ln -s libncurses++w.a ${pkgdir}/usr/lib/libncurses++.a
 
-  # install tput to /bin
-  install -dm755 ${pkgdir}/bin/
-  mv ${pkgdir}/usr/bin/tput ${pkgdir}/bin/tput
+  for lib in ncurses ncurses++ form panel menu; do
+    ln -s ${lib}w.pc ${pkgdir}/usr/lib/pkgconfig/${lib}.pc
+  done
 
   # Some packages look for -lcurses during build
-  rm -f ${pkgdir}/usr/lib/libcursesw.so
   echo "INPUT(-lncursesw)" >${pkgdir}/usr/lib/libcursesw.so
-  ln -sf libncurses.so ${pkgdir}/usr/lib/libcurses.so
-  ln -sf libncursesw.a ${pkgdir}/usr/lib/libcursesw.a
-  ln -sf libncurses.a ${pkgdir}/usr/lib/libcurses.a
+  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 -sf libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.5
+  ln -s libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.5
 
   # install license, rip it from the readme
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/abs/core/ncurses/ncurses.install b/abs/core/ncurses/ncurses.install
deleted file mode 100644
index 6b5a1dc..0000000
--- a/abs/core/ncurses/ncurses.install
+++ /dev/null
@@ -1,9 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  echo ">> You can safely ignore any \"cannot open shared object\" errors you see above"
-}
-
-op=$1
-shift
-$op $*