Mon Feb 13 23:15:14 UTC 2012

1 files changed, 14 insertions, 20 deletions

diff --git a/core/ncurses/PKGBUILD b/core/ncurses/PKGBUILD
index fdf6a0343..b55c21040 100644
--- a/core/ncurses/PKGBUILD
+++ b/core/ncurses/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142072 2011-11-04 23:36:06Z 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.9
-pkgrel=2
+pkgrel=3
 pkgdesc="System V Release 4.0 curses emulation library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/ncurses/"
@@ -21,7 +21,8 @@ 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 
+     --with-install-prefix=${pkgdir} --enable-widec \
+     --enable-pc-files
   # add --enable-ext-colors with next soname bump
   make
 
@@ -38,34 +39,27 @@ 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
+  for lib in ncurses form panel menu; do
     echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib/lib${lib}.so
-    ln -sf lib${lib}w.a ${pkgdir}/usr/lib/lib${lib}.a
+    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}