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

[Allan McRae]

    Date: Sunday, April 18, 2010 @ 05:29:42
  Author: allan
Revision: 77821

upgpkg: ncurses 5.7-3
rebuild to remove from base group

Modified:
  ncurses/trunk/PKGBUILD
Deleted:
  ncurses/trunk/ChangeLog

-----------+
 ChangeLog |   15 ---------------
 PKGBUILD  |   31 ++++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 26 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2010-04-18 09:26:21 UTC (rev 77820)
+++ ChangeLog	2010-04-18 09:29:42 UTC (rev 77821)
@@ -1,15 +0,0 @@
-2009-01-22  Allan McRae <allan at archlinux.org>
-	* ncurses-5.7-2.1
-	* x86_64 only build
-	* compile non-wide charater library with chtype=long
-          for compatibility with binary blobs (FS#13351)
-
-2008-11-15  Allan McRae <allan at archlinux.org>
-	* ncurses-5.7-2
-	* fix installation of non-wide charater libraries (FS#12124)
-
-2008-11-03  Allan McRae <allan at archlinux.org>
-	* ncurses-5.7-1
-	* upstream update
-	* remove coverity patch (included upstream)
-	* enable makeflags

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-18 09:26:21 UTC (rev 77820)
+++ PKGBUILD	2010-04-18 09:29:42 UTC (rev 77821)
@@ -4,7 +4,7 @@
 
 pkgname=ncurses
 pkgver=5.7
-pkgrel=2.1
+pkgrel=3
 pkgdesc="System V Release 4.0 curses emulation library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/ncurses/"
@@ -14,12 +14,26 @@
 md5sums=('cce05daf61a64501ef6cd8da1f727ec6')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --mandir=/usr/share/man \
+  cd ${srcdir}/
+  mkdir ncurses{,w}-build
+  
+  cd ${srcdir}/ncursesw-build
+  ../${pkgname}-${pkgver}/configure --prefix=/usr --mandir=/usr/share/man \
      --with-shared --with-normal --without-debug --without-ada \
      --with-install-prefix=${pkgdir} --enable-widec 
   make || return 1
+
+  # libncurses.so.5 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 \
+    --with-install-prefix=${pkgdir} $CONFIGFLAG
+  make || return 1
+}
+
+package() {
+  cd ${srcdir}/ncursesw-build
   make install
 
   # move libraries needed for boot to /lib (we call tput in initscripts)
@@ -46,13 +60,8 @@
   ln -sf libncursesw.a ${pkgdir}/usr/lib/libcursesw.a
   ln -sf libncurses.a ${pkgdir}/usr/lib/libcurses.a
 
-  # Install libncurses.so.5 for external binary support 
-  [ $CARCH = "x86_64" ] && CONFIGFLAG="--with-chtype=long"
-  ./configure --prefix=/usr \
-    --with-shared --with-normal --without-debug --without-ada \
-    --with-install-prefix=${pkgdir} $CONFIGFLAG
-  make || return 1
-  
+  # non-widec compatibility library
+  cd ${srcdir}/ncurses-build        
   install -Dm755 lib/libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.${pkgver}
   ln -sf libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.5