[arch-commits] Commit in lib32-ncurses/trunk (PKGBUILD)

[Evangelos Foutras]

    Date: Monday, September 7, 2015 @ 11:16:38
  Author: foutrelis
Revision: 139446

upgpkg: lib32-ncurses 6.0-2

Remove non-widec compatibility libraries.

Modified:
  lib32-ncurses/trunk/PKGBUILD

----------+
 PKGBUILD |   27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-07 09:10:05 UTC (rev 139445)
+++ PKGBUILD	2015-09-07 09:16:38 UTC (rev 139446)
@@ -5,7 +5,7 @@
 _pkgbasename=ncurses
 pkgname=lib32-${_pkgbasename}
 pkgver=6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="System V Release 4.0 curses emulation library (32-bit)"
 arch=('x86_64')
 url="http://www.gnu.org/software/ncurses/"
@@ -18,31 +18,21 @@
 validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB') # Thomas Dickey
 
 build() {
+  cd ${_pkgbasename}-${pkgver}
+
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  cd ${srcdir}/
-  mkdir ncurses{,w}-build
-
-  cd ${srcdir}/ncursesw-build
-  ../${_pkgbasename}-${pkgver}/configure --prefix=/usr --mandir=/usr/share/man \
+  ./configure --prefix=/usr --mandir=/usr/share/man \
      --with-shared --with-normal --without-debug --without-ada \
      --with-install-prefix=${pkgdir} --enable-widec --libdir=/usr/lib32 \
      --enable-ext-colors --enable-ext-mouse
   make
-
-  # 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-install-prefix=${pkgdir} $CONFIGFLAG --libdir=/usr/lib32
-  make
 }
 
 package() {
-  cd ${srcdir}/ncursesw-build
+  cd ${_pkgbasename}-${pkgver}
   make install
 
   install -dm755 ${pkgdir}/usr/lib32
@@ -62,13 +52,6 @@
   ln -sf libncursesw.a ${pkgdir}/usr/lib32/libcursesw.a
   ln -sf libncurses.a ${pkgdir}/usr/lib32/libcurses.a
 
-  # 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/lib32/lib${lib}.so.${pkgver}
-    ln -s lib${lib}.so.${pkgver} ${pkgdir}/usr/lib32/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"