Merge branch 'testing'

1 files changed, 25 insertions, 41 deletions

diff --git a/abs/core/ncurses/PKGBUILD b/abs/core/ncurses/PKGBUILD
index 008e209..53e7682 100644
--- a/abs/core/ncurses/PKGBUILD
+++ b/abs/core/ncurses/PKGBUILD
@@ -4,66 +4,50 @@
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=ncurses
-pkgver=5.9_20141101
-pkgrel=1
+pkgver=6.1
+pkgrel=3
 pkgdesc='System V Release 4.0 curses emulation library'
-arch=('i686' 'x86_64')
+arch=(x86_64)
 url='http://invisible-island.net/ncurses/ncurses.html'
-license=('MIT')
-depends=('glibc' 'gcc-libs' 'sh')
-provides=('libmenu.so' 'libpanel.so' 'libform.so' 'libncurses.so' 'libncurses++w.so'
-          'libformw.so' 'libmenuw.so' 'libpanelw.so' 'libncursesw.so')
-source=(ftp://invisible-island.net/ncurses/current/ncurses-${pkgver/_/-}.tgz{,.asc})
-md5sums=('87500270f8b1ba911228c940bad30ed1'
+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})
+source=(https://ftp.gnu.org/pub/gnu/ncurses/ncurses-$pkgver.tar.gz{,.sig})
+md5sums=('98c889aaf8d23910d2b92d65be2e737a'
          'SKIP')
-
-prepare() {
-  mkdir ncurses{,w}-build
-}
+validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB')  # Thomas Dickey
 
 build() {
-  cd ncursesw-build
-  ../$pkgname-${pkgver/_/-}/configure --prefix=/usr --mandir=/usr/share/man \
-     --with-shared --with-normal --without-debug --without-ada \
-     --enable-widec --enable-pc-files --with-cxx-binding --with-cxx-shared
-  # add --enable-ext-colors and --enable-ext-mouse with next soname bump
-  make
+  cd $pkgname-$pkgver
 
-  # libraries for external binary support
-  cd ${srcdir}/ncurses-build
-  [[ $CARCH = "x86_64" ]] && CONFIGFLAG="--with-chtype=long"
-  ../$pkgname-${pkgver/_/-}/configure --prefix=/usr \
-    --with-shared --with-normal --without-debug --without-ada $CONFIGFLAG \
-    --with-cxx-binding --with-cxx-shared
+  ./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
   make
 }
 
 package() {
-  cd ncursesw-build
+  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
 
-  for lib in ncurses ncurses++ form panel menu; do
-    ln -s ${lib}w.pc "$pkgdir"/usr/lib/pkgconfig/${lib}.pc
+  for lib in tic tinfo; do
+    echo "INPUT(libncursesw.so.${pkgver:0:1})" > "$pkgdir/usr/lib/lib${lib}.so"
+    ln -s libncursesw.so.${pkgver:0:1} "$pkgdir/usr/lib/lib${lib}.so.${pkgver:0:1}"
   done
 
   # some packages look for -lcurses during build
-  echo "INPUT(-lncursesw)" > "$pkgdir"/usr/lib/libcursesw.so
-  ln -s libncurses.so "$pkgdir"/usr/lib/libcurses.so
-
-  # 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/lib/lib${lib}.so.${pkgver%_*}
-    ln -s lib${lib}.so.${pkgver%_*} "$pkgdir"/usr/lib/lib${lib}.so.5
-  done
+  echo 'INPUT(-lncursesw)' > "$pkgdir/usr/lib/libcursesw.so"
+  ln -s libncurses.so "$pkgdir/usr/lib/libcurses.so"
 
   # install license, rip it from the readme
-  cd "$srcdir"/$pkgname-${pkgver/_/-}
-  install -dm755 "$pkgdir"/usr/share/licenses/$pkgname
-  grep -B 100 '$Id' README > "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  grep -B 100 '$Id' README > "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }