Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/iat/PKGBUILD
	community/libnsbmp/PKGBUILD
	community/libnsgif/PKGBUILD
	community/libopenraw/PKGBUILD
	community/netsurf/PKGBUILD
	core/bison/PKGBUILD
	core/perl/PKGBUILD
	extra/avahi/PKGBUILD
	extra/mutt/PKGBUILD
	extra/php/PKGBUILD

2 files changed, 65 insertions, 34 deletions

diff --git a/community/gtypist/PKGBUILD b/community/gtypist/PKGBUILD
index 84c32cba4..d2be5f0e7 100644
--- a/community/gtypist/PKGBUILD
+++ b/community/gtypist/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57751 2011-11-02 08:47:29Z spupykin $
+# $Id: PKGBUILD 59675 2011-11-29 10:07:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Ben Mazer <blm@groknil.org>
 # Contributor: Mike Douglas <code_monkey@gooeylinux.org>
 
 pkgname=gtypist
-pkgver=2.9
+pkgver=2.9.1
 pkgrel=1
 pkgdesc="universal typing tutor"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,8 +15,8 @@ makedepends=('emacs')
 install=gtypist.install
 source=(ftp://ftp.gnu.org/gnu/gtypist/$pkgname-$pkgver.tar.gz
 	ncurses.patch)
-md5sums=('4500940fb1cde36899afd957d64236bb'
-         '17b3a69119e3bd791f0941e0f93fb8b3')
+md5sums=('8b7e5595fcabd254f85c2e171dcaf4fc'
+         'ba5e990d948ba5019391094dac890aa6')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/gtypist/ncurses.patch b/community/gtypist/ncurses.patch
index ae17733fb..c06424623 100644
--- a/community/gtypist/ncurses.patch
+++ b/community/gtypist/ncurses.patch
@@ -1,32 +1,63 @@
-diff -wbBur gtypist-2.9/configure gtypist-2.9.my/configure
---- gtypist-2.9/configure	2011-11-01 01:31:47.000000000 +0400
-+++ gtypist-2.9.my/configure	2011-11-02 12:31:42.000000000 +0400
-@@ -4478,8 +4478,8 @@
+diff -wbBur gtypist-2.9.1/configure gtypist-2.9.1.my/configure
+--- gtypist-2.9.1/configure	2011-11-29 00:14:11.000000000 +0400
++++ gtypist-2.9.1.my/configure	2011-11-29 13:03:51.000000000 +0400
+@@ -4011,13 +4011,13 @@
+ ALL_LINGUAS="cs de es eu fi fr nl pl ru tr zh_CN zh_TW"
+ 
+ # Checks for libraries.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for add_wch in -lncursesw" >&5
+-$as_echo_n "checking for add_wch in -lncursesw... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for add_wch in -lncurses" >&5
++$as_echo_n "checking for add_wch in -lncurses... " >&6; }
+ if ${ac_cv_lib_ncursesw_add_wch+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lncursesw  $LIBS"
++LIBS="-lncurses  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -4464,7 +4464,7 @@
+ done
  
  
- #AC_CHECK_HEADER(curses.h, HAVE_CURSES_H=1)
 -ac_fn_c_check_header_mongrel "$LINENO" "ncursesw/ncurses.h" "ac_cv_header_ncursesw_ncurses_h" "$ac_includes_default"
--if test "x$ac_cv_header_ncursesw_ncurses_h" = xyes; then :
-+ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
-+if test "x$ac_cv_header_ncurses_h" = xyes; then :
++ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncursesw_ncurses_h" "$ac_includes_default"
+ if test "x$ac_cv_header_ncursesw_ncurses_h" = xyes; then :
    HAVE_NCURSESW_H=1
  fi
+@@ -4473,7 +4473,7 @@
+ 
+ # sanity check for libncursesw:
+ if test -n "$HAVE_NCURSESW_H" -a -n "$HAVE_LIBNCURSESW";  then
+-   LIBS="-lncursesw $LIBS"
++   LIBS="-lncurses $LIBS"
+ else
+    echo -e "Error:  both library and header files for the ncursesw library\n"\
+    	"are required to build this package.  See INSTALL file for"\
+diff -wbBur gtypist-2.9.1/configure.ac gtypist-2.9.1.my/configure.ac
+--- gtypist-2.9.1/configure.ac	2011-11-21 03:27:02.000000000 +0400
++++ gtypist-2.9.1.my/configure.ac	2011-11-29 13:02:53.000000000 +0400
+@@ -21,13 +21,13 @@
+ ALL_LINGUAS="cs de es eu fi fr nl pl ru tr zh_CN zh_TW"
+ 
+ # Checks for libraries.
+-AC_CHECK_LIB(ncursesw, add_wch, HAVE_LIBNCURSESW=1)
++AC_CHECK_LIB(ncurses, add_wch, HAVE_LIBNCURSESW=1)
  
-diff -wbBur gtypist-2.9/configure.ac gtypist-2.9.my/configure.ac
---- gtypist-2.9/configure.ac	2011-10-30 19:26:40.000000000 +0400
-+++ gtypist-2.9.my/configure.ac	2011-11-02 12:30:18.000000000 +0400
-@@ -40,7 +40,7 @@
+ # Checks for header files.
+ AC_HEADER_STDC
  AC_CHECK_HEADERS([unistd.h alloca.h argz.h errno.h fcntl.h langinfo.h libintl.h limits.h locale.h malloc.h stddef.h stdio_ext.h stdlib.h string.h strings.h sys/param.h unistd.h])
  
- #AC_CHECK_HEADER(curses.h, HAVE_CURSES_H=1)
 -AC_CHECK_HEADER(ncursesw/ncurses.h, HAVE_NCURSESW_H=1)
 +AC_CHECK_HEADER(ncurses.h, HAVE_NCURSESW_H=1)
  
- # We prefer ncurses to curses if both are found.
- dnl if test -n "$HAVE_NCURSES_H" -a -n "$HAVE_LIBNCURSES";  then
-diff -wbBur gtypist-2.9/src/cursmenu.c gtypist-2.9.my/src/cursmenu.c
---- gtypist-2.9/src/cursmenu.c	2011-10-31 01:35:20.000000000 +0400
-+++ gtypist-2.9.my/src/cursmenu.c	2011-11-02 12:30:27.000000000 +0400
+ # sanity check for libncursesw: 
+ if test -n "$HAVE_NCURSESW_H" -a -n "$HAVE_LIBNCURSESW";  then
+diff -wbBur gtypist-2.9.1/src/cursmenu.c gtypist-2.9.1.my/src/cursmenu.c
+--- gtypist-2.9.1/src/cursmenu.c	2011-11-01 04:13:02.000000000 +0400
++++ gtypist-2.9.1.my/src/cursmenu.c	2011-11-29 13:04:15.000000000 +0400
 @@ -24,7 +24,7 @@
  #ifdef HAVE_PDCURSES
  #include <curses.h>
@@ -36,9 +67,9 @@ diff -wbBur gtypist-2.9/src/cursmenu.c gtypist-2.9.my/src/cursmenu.c
  #endif
  
  #include "error.h"
-diff -wbBur gtypist-2.9/src/error.c gtypist-2.9.my/src/error.c
---- gtypist-2.9/src/error.c	2011-09-26 15:35:03.000000000 +0400
-+++ gtypist-2.9.my/src/error.c	2011-11-02 12:30:30.000000000 +0400
+diff -wbBur gtypist-2.9.1/src/error.c gtypist-2.9.1.my/src/error.c
+--- gtypist-2.9.1/src/error.c	2011-11-01 04:13:02.000000000 +0400
++++ gtypist-2.9.1.my/src/error.c	2011-11-29 13:04:15.000000000 +0400
 @@ -25,7 +25,7 @@
  #ifdef HAVE_PDCURSES
  #include <curses.h>
@@ -48,9 +79,9 @@ diff -wbBur gtypist-2.9/src/error.c gtypist-2.9.my/src/error.c
  #endif
  
  #include <stdlib.h>
-diff -wbBur gtypist-2.9/src/gtypist.c gtypist-2.9.my/src/gtypist.c
---- gtypist-2.9/src/gtypist.c	2011-10-31 03:24:25.000000000 +0400
-+++ gtypist-2.9.my/src/gtypist.c	2011-11-02 12:30:24.000000000 +0400
+diff -wbBur gtypist-2.9.1/src/gtypist.c gtypist-2.9.1.my/src/gtypist.c
+--- gtypist-2.9.1/src/gtypist.c	2011-11-22 17:31:25.000000000 +0400
++++ gtypist-2.9.1.my/src/gtypist.c	2011-11-29 13:04:15.000000000 +0400
 @@ -31,7 +31,7 @@
  #ifdef HAVE_PDCURSES
  #include <curses.h>
@@ -60,9 +91,9 @@ diff -wbBur gtypist-2.9/src/gtypist.c gtypist-2.9.my/src/gtypist.c
  #endif
  
  #include <time.h>
-diff -wbBur gtypist-2.9/src/script.c gtypist-2.9.my/src/script.c
---- gtypist-2.9/src/script.c	2011-10-26 12:51:57.000000000 +0400
-+++ gtypist-2.9.my/src/script.c	2011-11-02 12:30:37.000000000 +0400
+diff -wbBur gtypist-2.9.1/src/script.c gtypist-2.9.1.my/src/script.c
+--- gtypist-2.9.1/src/script.c	2011-11-28 19:39:48.000000000 +0400
++++ gtypist-2.9.1.my/src/script.c	2011-11-29 13:04:15.000000000 +0400
 @@ -24,7 +24,7 @@
  #ifdef HAVE_PDCURSES
  #include <curses.h>
@@ -72,9 +103,9 @@ diff -wbBur gtypist-2.9/src/script.c gtypist-2.9.my/src/script.c
  #endif
  
  #include "error.h"
-diff -wbBur gtypist-2.9/src/utf8.c gtypist-2.9.my/src/utf8.c
---- gtypist-2.9/src/utf8.c	2011-10-31 03:11:27.000000000 +0400
-+++ gtypist-2.9.my/src/utf8.c	2011-11-02 12:30:43.000000000 +0400
+diff -wbBur gtypist-2.9.1/src/utf8.c gtypist-2.9.1.my/src/utf8.c
+--- gtypist-2.9.1/src/utf8.c	2011-11-28 19:39:19.000000000 +0400
++++ gtypist-2.9.1.my/src/utf8.c	2011-11-29 13:04:15.000000000 +0400
 @@ -23,7 +23,7 @@
  #ifdef HAVE_PDCURSES
  #include <curses.h>