readline: updated to 6.3.8 and updated mandir

diff --git a/readline/.footprint b/readline/.footprint
index ff3f0159bab341dfd150997b9957f7353860fe0e..afefd060f2a117b2f2b3c108e0786f7a1b91d0da 100644 (file)
--- a/readline/.footprint
+++ b/readline/.footprint
@@ -22,16 +22,11 @@ drwxr-xr-x  root/root       usr/lib/
 lrwxrwxrwx     root/root       usr/lib/libhistory.so -> ../../lib/libhistory.so.6.3
 -rw-r--r--     root/root       usr/lib/libreadline.a
 lrwxrwxrwx     root/root       usr/lib/libreadline.so -> ../../lib/libreadline.so.6.3
-drwxr-xr-x     root/root       usr/man/
-drwxr-xr-x     root/root       usr/man/man3/
--rw-r--r--     root/root       usr/man/man3/history.3.gz
--rw-r--r--     root/root       usr/man/man3/readline.3.gz
 drwxr-xr-x     root/root       usr/share/
-drwxr-xr-x     root/root       usr/share/doc/
-drwxr-xr-x     root/root       usr/share/doc/readline/
--rw-r--r--     root/root       usr/share/doc/readline/CHANGES
--rw-r--r--     root/root       usr/share/doc/readline/INSTALL
--rw-r--r--     root/root       usr/share/doc/readline/README
+drwxr-xr-x     root/root       usr/share/man/
+drwxr-xr-x     root/root       usr/share/man/man3/
+-rw-r--r--     root/root       usr/share/man/man3/history.3.gz
+-rw-r--r--     root/root       usr/share/man/man3/readline.3.gz
 drwxr-xr-x     root/root       usr/share/readline/
 -rw-r--r--     root/root       usr/share/readline/excallback.c
 -rw-r--r--     root/root       usr/share/readline/fileman.c

diff --git a/readline/.md5sum b/readline/.md5sum
index 073342621be80a0858912a9c02221c43a9c4b410..ae22d1e0d943391d852ffa03dae75875d2a928f8 100644 (file)
--- a/readline/.md5sum
+++ b/readline/.md5sum
@@ -1,4 +1,4 @@
 553cf04fdeec54dca12062864c3ffba3  inputrc
-b1efd651024094fa2f0f3a34d2d0f0b7  readline-6.3.6-wcwidth.patch
-44b8c334f34790e920a807a126996882  readline-6.3.6.patch.gz
+b1efd651024094fa2f0f3a34d2d0f0b7  readline-6.3.8-wcwidth.patch
+bfba9ca30c7252588ea50bcc61f1006c  readline-6.3.8.patch.gz
 33c8fb279e981274f485fd91da77e94a  readline-6.3.tar.gz

diff --git a/readline/Pkgfile b/readline/Pkgfile
index e5e0e0079385ea55602add26cbee014fa584947f..d4c9bbcd3d95e504b93a68921bdf708be6a3a5ef 100644 (file)
--- a/readline/Pkgfile
+++ b/readline/Pkgfile
@@ -5,8 +5,8 @@
 # Depends on: ncurses
 
 name=readline
-version=6.3.6
-release=1
+version=6.3.8
+release=2
 source=(http://ftp.gnu.org/gnu/$name/$name-${version::3}.tar.gz \
         $name-$version.patch.gz inputrc $name-$version-wcwidth.patch)
 
@@ -18,15 +18,14 @@ build() {
   # Don't use rpath for linking the shared libs
   sed -i '117s/-Wl,-rpath,$(libdir)//' support/shobj-conf
 
-  # Patch to avoid wcwidth tests
+   # Patch to avoid wcwidth tests
   patch -i $SRC/$name-$version-wcwidth.patch
 
   ./configure --build=$CHOST \
               --host=$CTARGET \
-              --prefix=/usr \
-              --mandir=/usr/man
-  make SHLIB_LIBS=-lncurses
-  make DESTDIR=$PKG install
+              --prefix=/usr
+  make -j1 SHLIB_LIBS=-lncurses
+  make -j1 DESTDIR=$PKG install
 
   install -d $PKG/lib
   mv $PKG/usr/lib/lib*.so.* $PKG/lib
@@ -34,5 +33,5 @@ build() {
   ln -sf ../../lib/libreadline.so.${version:0:3} $PKG/usr/lib/libreadline.so
 
   install -D -m 644 $SRC/inputrc $PKG/etc/inputrc
-  rm -r $PKG/usr/share/info
+  rm -r $PKG/usr/share/{doc,info}
 }

diff --git a/readline/readline-6.3.6.patch.gz b/readline/readline-6.3.6.patch.gz
deleted file mode 100644 (file)
index bbbf639..0000000
Binary files a/readline/readline-6.3.6.patch.gz and /dev/null differ

diff --git a/readline/readline-6.3.8-wcwidth.patch b/readline/readline-6.3.8-wcwidth.patch
new file mode 100644 (file)
index 0000000..6570b33
--- /dev/null
+++ b/readline/readline-6.3.8-wcwidth.patch
@@ -0,0 +1,97 @@
+diff -ur original/readline-6.3/configure build/readline-6.3/configure
+--- original/readline-6.3/configure    2013-03-13 23:14:53.000000000 +0900
++++ build/readline-6.3/configure       2014-04-28 22:52:45.510169436 +0900
+@@ -6316,49 +6316,49 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wcwidth broken with unicode combining characters" >&5
+-$as_echo_n "checking for wcwidth broken with unicode combining characters... " >&6; }
+-if ${bash_cv_wcwidth_broken+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <unistd.h>
+-#include <stdlib.h>
+-#include <stdio.h>
+-
+-#include <locale.h>
+-#include <wchar.h>
+-
+-main(c, v)
+-int     c;
+-char    **v;
+-{
+-        int     w;
+-
+-        setlocale(LC_ALL, "en_US.UTF-8");
+-        w = wcwidth (0x0301);
+-        exit (w == 0);  /* exit 0 if wcwidth broken */
+-}
+-
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  bash_cv_wcwidth_broken=yes
+-else
+-  bash_cv_wcwdith_broken=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
++#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wcwidth broken with unicode combining characters" >&5
++#$as_echo_n "checking for wcwidth broken with unicode combining characters... " >&6; }
++#if ${bash_cv_wcwidth_broken+:} false; then :
++#  $as_echo_n "(cached) " >&6
++#else
++#  if test "$cross_compiling" = yes; then :
++#  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++#as_fn_error $? "cannot run test program while cross compiling
++#See \`config.log' for more details" "$LINENO" 5; }
++#else
++#  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++#/* end confdefs.h.  */
++#
++##include <unistd.h>
++##include <stdlib.h>
++##include <stdio.h>
++#
++##include <locale.h>
++##include <wchar.h>
++#
++#main(c, v)
++#int     c;
++#char    **v;
++#{
++#        int     w;
++#
++#        setlocale(LC_ALL, "en_US.UTF-8");
++#        w = wcwidth (0x0301);
++#        exit (w == 0);  /* exit 0 if wcwidth broken */
++#}
++#
++#_ACEOF
++#if ac_fn_c_try_run "$LINENO"; then :
++#  bash_cv_wcwidth_broken=yes
++#else
++#  bash_cv_wcwdith_broken=no
++#fi
++#rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++#  conftest.$ac_objext conftest.beam conftest.$ac_ext
++#fi
++bash_cv_wcwdith_broken=no
++#fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bash_cv_wcwidth_broken" >&5
+ $as_echo "$bash_cv_wcwidth_broken" >&6; }
+ if test "$bash_cv_wcwidth_broken" = yes; then
+