upgpkg: 6.4

Also align with the latest changes in lib32-ncurses.

1 files changed, 37 insertions, 36 deletions

diff --git a/PKGBUILD b/PKGBUILD
index fe193161ffcd..f0de5d2dfede 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,83 +2,84 @@
 
 _name=ncurses
 pkgname=lib32-${_name}5-compat-libs
-pkgver=6.3
+pkgver=6.4
 pkgrel=1
 pkgdesc="System V Release 4.0 curses emulation library (32-bit), ABI 5"
-arch=('x86_64')
-url='https://invisible-island.net/ncurses/ncurses.html'
-license=('MIT')
-depends=('lib32-gcc-libs' 'lib32-glibc' "lib32-${_name}")
+arch=(x86_64)
+url=https://invisible-island.net/ncurses/ncurses.html
+license=(MIT)
+depends=(lib32-gcc-libs lib32-glibc lib32-$_name)
 source=(
-  "https://invisible-mirror.net/archives/${_name}/${_name}-${pkgver}.tar.gz"{,.asc}
-  "${_name}-6.3-libs.patch"
-  "${_name}-6.3-pkgconfig.patch"
+  https://invisible-mirror.net/archives/$_name/$_name-$pkgver.tar.gz{,.asc}
+  $_name-6.3-libs.patch
+  $_name-6.3-pkgconfig.patch
 )
-sha512sums=('5373f228cba6b7869210384a607a2d7faecfcbfef6dbfcd7c513f4e84fbd8bcad53ac7db2e7e84b95582248c1039dcfc7c4db205a618f7da22a166db482f0105'
+sha512sums=('1c2efff87a82a57e57b0c60023c87bae93f6718114c8f9dc010d4c21119a2f7576d0225dab5f0a227c2cfc6fb6bdbd62728e407f35fce5bf351bb50cf9e0fd34'
             'SKIP'
             'adb02b838c40f1e58a1b31c26d5cd0f2a1c43f3b6d68e839981764c0f6c905a9eb51dd36ff018628fdeb20747cc7467727d57135408ab4848259384077a52b28'
             '2d2c0ec3c880e638ab4aa3dbff5e28e4cd233153e24816bd87e077f848aa3edd5114cd0f2a7f6e8869dd1861a2746e512886c18264ff1676927dcc320c5ef958')
-b2sums=('b2c174ac48d587b4d3aa054f04e4ec8bffd8a657a4aff5f090104965c741901e600712c8f8e5e98f3b8a26bc558996a1e14a746f113854832853b855e9d406c3'
+b2sums=('47fd9c2d27f44fa9942552881a471e5067465dbace40bf68b28998dded0556127a1d8662b96de4de4fd76c1c8b98bdae796036553ab4b05ca9f160839d841ba3'
         'SKIP'
         '31bb10e82dd018a75e57252052650d9f0f5eb5e7e887118c2ea40032b11f59ec6aa4d9bae804c615cbecdf3382f3434e0c9e9e8440fdefe66a507be020b8965c'
         'fb6cf606cf3db7f6b306272696a63bce83d52cfa91e850f9a7bdb9d3d8455a26943529a9cf79731dddc7f763c27211a9afab9c4c31dbb6d12fd720eb390eb0a3')
 validpgpkeys=('19882D92DDA4C400C22C0D56CC2AF4472167BE03')  # Thomas Dickey <dickey@invisible-island.net>
 
 prepare() {
-  cd ${_name}-${pkgver}
   # do not link against test libraries
-  patch -Np1 -i ../"${_name}-6.3-libs.patch"
+  patch -Np1 -d $_name-$pkgver -i ../$_name-6.3-libs.patch
   # do not leak build-time LDFLAGS into the pkgconfig files:
   # https://bugs.archlinux.org/task/68523
-  patch -Np1 -i ../"${_name}-6.3-pkgconfig.patch"
+  patch -Np1 -d $_name-$pkgver  -i ../$_name-6.3-pkgconfig.patch
   # NOTE: can't run autoreconf because the autotools setup is custom and ancient
 }
 
 build() {
-  cd ${_name}-${pkgver}
+  local configure_options=(
+    --prefix=/usr
+    --libdir=/usr/lib32
+    --disable-db-install
+    --enable-widec
+    --mandir=/usr/share/man
+    --with-shared
+    --with-versioned-syms
+    --without-ada
+    --without-debug
+    --without-manpages
+    --without-progs
+    --without-tack
+    --without-tests
+    --with-abi-version=5
+    --without-gpm
+    --without-pkg-config
+  )
 
   export CC="gcc -m32"
   export CXX="g++ -m32"
 
-  ./configure --prefix=/usr \
-    --disable-db-install \
-    --enable-widec \
-    --libdir=/usr/lib32 \
-    --mandir=/usr/share/man \
-    --with-shared \
-    --with-versioned-syms \
-    --without-ada \
-    --without-debug \
-    --without-manpages \
-    --without-progs \
-    --without-tack \
-    --without-tests \
-    --with-abi-version=5 \
-    --without-gpm \
-    --without-pkg-config 
+  cd $_name-$pkgver
+  ./configure "${configure_options[@]}"
    make
 }
 
 package() {
-  cd ${_name}-${pkgver}
-  make DESTDIR="${pkgdir}" install.libs
+  make DESTDIR="$pkgdir" install.libs -C $_name-$pkgver
 
   # fool packages looking to link to non-wide-character ncurses libraries
   for lib in ncurses form panel menu; do
-    ln -sv lib${lib}w.so.5 "$pkgdir"/usr/lib32/lib${lib}.so.5
+    ln -sv lib${lib}w.so.5 "$pkgdir/usr/lib32/lib$lib.so.5"
   done
 
   # tic and ticinfo functionality is built in by default
   # make sure that anything linking against it links against libncursesw.so instead
   for lib in tic tinfo; do
-    ln -sv libncursesw.so.5 "${pkgdir}/usr/lib32/lib${lib}.so.5"
+    ln -sv libncursesw.so.5 "$pkgdir/usr/lib32/lib$lib.so.5"
   done
 
   # remove all files conflicting with ncurses
-  rm -frv "${pkgdir}/usr/"{bin,include,share}
+  rm -frv "$pkgdir/usr/"{bin,include,share}
 
   # Remove .so symlinks and static libraries (conflicting with lib32-ncurses)
-  rm -fv "${pkgdir}"/usr/{lib32/*.so,lib32/*.a}
+  rm -fv "$pkgdir/usr/"{lib32/*.so,lib32/*.a}
 
   mkdir -p "$pkgdir/usr/share/licenses"
   ln -s $_name "$pkgdir/usr/share/licenses/$pkgname"