X-Git-Url: http://gitweb/?a=blobdiff_plain;f=ncurses%2FPkgfile;h=ce603a52dda64dfc6d81af4fbbcb89127d3a53c6;hb=4466e574d8c1151a707caddb2238a54f986cab6f;hp=4d1ea66ac467dd14323029ecfcaa0f460118d4d5;hpb=83e7e2d09802b3a99d4eda97a03cad72a1b1039a;p=crossrootfs.git

diff --git a/ncurses/Pkgfile b/ncurses/Pkgfile
index 4d1ea66..ce603a5 100644
--- a/ncurses/Pkgfile
+++ b/ncurses/Pkgfile
@@ -1,44 +1,46 @@
 # Description: A System V Release 4.0 curses emulation library
 # URL: http://www.gnu.org/software/ncurses/ncurses.html
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Arch Maintainer: CRUX-ARM System Team, devel@crux-arm.nu
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Depends on:
 
 name=ncurses
-version=5.7
-release=2
+version=6.1
+release=1
 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
 
 build() {
   cd $name-$version
+  ./configure --build=$CHOST \
+              --host=$CTARGET \
+              --with-install-prefix=$PKG \
+              --prefix=/usr \
+              --mandir=/usr/share/man \
+              --with-{normal,shared} \
+              --without-{debug,ada,tests} \
+              --enable-pc-files \
+              --enable-widec \
+              --disable-rpath \
+              --disable-rpath-hack \
+              --disable-stripping
+              
+  make
+  make DESTDIR=$PKG install
 
-  local OPTIONS="\
---build=$CHOST \
---host=$CTARGET \
---with-install-prefix=$PKG \
---prefix=/usr \
---with-normal \
---with-shared \
---without-debug \
---without-ada
-"
+  install -d $PKG/{lib,usr/include/ncursesw,usr/lib/pkgconfig}
 
-  ./configure $OPTIONS
-  make
-  make install
-  make distclean
-  
-  sed '/^BUILD_CCFLAGS/ s/-DHAVE_CONFIG_H/-DHAVE_CONFIG_H -D_GNU_SOURCE/' -i ncurses/Makefile.in
-  ./configure $OPTIONS --enable-widec
-  make 
-  make install
+  # move library to /lib and create symlinks
+  mv $PKG/usr/lib/libncursesw.so.* $PKG/lib
+  ln -sf ../../lib/libncursesw.so.$version $PKG/usr/lib/libncursesw.so
+  ln -s libncursesw.so.$version $PKG/lib/libncurses.so.${version%%.*}
 
-  mkdir $PKG/lib
+  # linker scripts and .pc files for non-wide ncurses
+  for LIB in ncurses form panel menu ; do
+    echo "INPUT(-l${LIB}w)" > $PKG/usr/lib/lib${LIB}.so
+    ln -s ${LIB}w.pc $PKG/usr/lib/pkgconfig/${LIB}.pc
+  done
 
-  for i in w ''; do \
-    mv $PKG/usr/lib/libncurses$i.so.* $PKG/lib && \
-    ln -sf libncurses$i.so $PKG/usr/lib/libcurses$i.so && \
-    ln -sf ../../lib/libncurses$i.so.5 $PKG/usr/lib/libncurses$i.so && \
-    ln -sf ../../lib/libncurses$i.so.5 $PKG/usr/lib/libncurses$i.so.5 \
-  ; done
+  # linker script for the curses library
+  echo "INPUT(-lncursesw)" > $PKG/usr/lib/libcursesw.so
+  ln -s libncurses.so $PKG/usr/lib/libcurses.so
 }