5.9-2

2 files changed, 18 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa9cd448c6f0..517153bcd5e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libx32-ncurses
 	pkgdesc = System V Release 4.0 curses emulation library (x32 ABI)
 	pkgver = 5.9
-	pkgrel = 1.1
+	pkgrel = 2
 	url = http://www.gnu.org/software/ncurses/
 	arch = x86_64
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index f60563d2ea7e..8cb462d91737 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
+# $Id: PKGBUILD 96305 2013-08-24 19:57:20Z bluewind $
 # Upstream Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Maintainer: Fantix King <fantix.king at gmail.com>
@@ -6,7 +6,7 @@
 _pkgbasename=ncurses
 pkgname=libx32-${_pkgbasename}
 pkgver=5.9
-pkgrel=1.1
+pkgrel=2
 pkgdesc="System V Release 4.0 curses emulation library (x32 ABI)"
 arch=('x86_64')
 url="http://www.gnu.org/software/ncurses/"
@@ -26,15 +26,15 @@ build() {
 
   cd ${srcdir}/ncursesw-build
   ../${_pkgbasename}-${pkgver}/configure --prefix=/usr --mandir=/usr/share/man \
-     --with-shared --with-normal --without-debug --without-ada \
+     --with-shared --with-normal --without-debug --without-ada --without-gpm \
      --with-install-prefix=${pkgdir} --enable-widec --libdir=/usr/libx32
   make
 
-  # libncurses.so.5 for external binary support 
+  # libraries for external binary support
   cd ${srcdir}/ncurses-build
 #  [ $CARCH = "x86_64" ] && CONFIGFLAG="--with-chtype=long"
   ../${_pkgbasename}-${pkgver}/configure --prefix=/usr \
-    --with-shared --with-normal --without-debug --without-ada \
+    --with-shared --with-normal --without-debug --without-ada --without-gpm \
     --with-install-prefix=${pkgdir} $CONFIGFLAG --libdir=/usr/libx32
   make
 }
@@ -45,7 +45,7 @@ package() {
 
   install -dm755 ${pkgdir}/usr/libx32
 
-  # 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 curses ncurses form panel menu; do
     rm -f ${pkgdir}/usr/libx32/lib${lib}.so
     echo "INPUT(-l${lib}w)" >${pkgdir}/usr/libx32/lib${lib}.so
@@ -53,17 +53,23 @@ package() {
   done
   ln -sf libncurses++w.a ${pkgdir}/usr/libx32/libncurses++.a
 
-  # Some packages look for -lcurses during build
+  # some packages look for -lcurses during build
   rm -f ${pkgdir}/usr/libx32/libcursesw.so
   echo "INPUT(-lncursesw)" >${pkgdir}/usr/libx32/libcursesw.so
   ln -sf libncurses.so ${pkgdir}/usr/libx32/libcurses.so
   ln -sf libncursesw.a ${pkgdir}/usr/libx32/libcursesw.a
   ln -sf libncurses.a ${pkgdir}/usr/libx32/libcurses.a
 
-  # non-widec compatibility library
-  cd ${srcdir}/ncurses-build        
-  install -Dm755 lib/libncurses.so.${pkgver} ${pkgdir}/usr/libx32/libncurses.so.${pkgver}
-  ln -sf libncurses.so.${pkgver} ${pkgdir}/usr/libx32/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/libx32/lib${lib}.so.${pkgver}
+    ln -s lib${lib}.so.${pkgver} ${pkgdir}/usr/libx32/lib${lib}.so.5
+  done
 
   rm -rf "${pkgdir}"/usr/{include,share,bin}
+  mkdir -p "$pkgdir/usr/share/licenses"
+  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
 }
+
+# vim: set et ts=2 sw=2: