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

[Bartłomiej Piotrowski]

    Date: Sunday, January 28, 2018 @ 13:26:12
  Author: bpiotrowski
Revision: 315530

6.1-1: new upstream release

Modified:
  ncurses/trunk/PKGBUILD

----------+
 PKGBUILD |   29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-28 07:33:42 UTC (rev 315529)
+++ PKGBUILD	2018-01-28 13:26:12 UTC (rev 315530)
@@ -4,9 +4,8 @@
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=ncurses
-_pkgver=6.0-20170902
-pkgver=${_pkgver/-/+}
-pkgrel=3
+pkgver=6.1
+pkgrel=1
 pkgdesc='System V Release 4.0 curses emulation library'
 arch=(x86_64)
 url='http://invisible-island.net/ncurses/ncurses.html'
@@ -13,38 +12,40 @@
 license=(MIT)
 depends=(glibc gcc-libs)
 provides=(libncurses++w.so libformw.so libmenuw.so libpanelw.so libncursesw.so)
-source=(http://invisible-mirror.net/archives/ncurses/current/ncurses-${_pkgver}.tgz{,.asc})
-md5sums=('b7b1cedc484172434855b00831183458'
+#source=(http://invisible-mirror.net/archives/ncurses/current/ncurses-${_pkgver}.tgz{,.asc})
+source=(https://ftp.gnu.org/pub/gnu/ncurses/ncurses-$pkgver.tar.gz{,.sig})
+md5sums=('98c889aaf8d23910d2b92d65be2e737a'
          'SKIP')
 validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB')  # Thomas Dickey
 
 build() {
-  cd $pkgname-${_pkgver}
+  cd $pkgname-$pkgver
 
   ./configure --prefix=/usr --mandir=/usr/share/man \
     --with-pkg-config-libdir=/usr/lib/pkgconfig \
     --with-shared --with-normal --without-debug --without-ada \
-    --enable-widec --enable-pc-files --with-cxx-binding --with-cxx-shared \
-    --with-termlib=tinfo --with-ticlib=tic
+    --enable-widec --enable-pc-files --with-cxx-binding --with-cxx-shared
   make
 }
 
 package() {
-  cd $pkgname-${_pkgver}
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
   # fool packages looking to link to non-wide-character ncurses libraries
   for lib in ncurses ncurses++ form panel menu; do
-    echo "INPUT(-l${lib}w)" > "$pkgdir/usr/lib/lib${lib}.so"
+    echo 'INPUT(-l${lib}w)' > "$pkgdir/usr/lib/lib${lib}.so"
     ln -s ${lib}w.pc "$pkgdir/usr/lib/pkgconfig/${lib}.pc"
   done
 
-  # don't require -ltinfo when linking with --no-add-needed
-  rm -f "$pkgdir/usr/lib/libncursesw.so"
-  echo "INPUT(libncursesw.so.${pkgver:0:1} -ltinfo)" > "$pkgdir/usr/lib/libncursesw.so"
+  for lib in tic tinfo; do
+    echo 'INPUT(-lncursesw)' > "$pkgdir/usr/lib/lib${lib}.so"
+    ln -s libncursesw.so.${pkgver:0:1} "$pkgdir/usr/lib/lib${lib}.so.${pkgver:0:1}"
+    #ln -s ncursesw.pc "$pkgdir/usr/lib/pkgconfig/${lib}.pc"
+  done
 
   # some packages look for -lcurses during build
-  echo "INPUT(-lncursesw)" > "$pkgdir/usr/lib/libcursesw.so"
+  echo 'INPUT(-lncursesw)' > "$pkgdir/usr/lib/libcursesw.so"
   ln -s libncurses.so "$pkgdir/usr/lib/libcurses.so"
 
   # install license, rip it from the readme