[pkgsrc/trunk]: pkgsrc/x11/mlterm Pull one more post-3.3.4 bug fix patch for ...

[tsutsui <tsutsui%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/25b343d141c3
branches:  trunk
changeset: 632390:25b343d141c3
user:      tsutsui <tsutsui%pkgsrc.org@localhost>
date:      Wed Mar 26 16:47:39 2014 +0000

description:
Pull one more post-3.3.4 bug fix patch for build failure with gcc-4.8.x.

Bump PKGREVISION.  (leaf package build fix, and also changes binaries)

diffstat:

 x11/mlterm/Makefile                              |   3 +-
 x11/mlterm/distinfo                              |   3 +-
 x11/mlterm/patches/patch-kiklib_src_kik__debug.c |  51 ++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 2 deletions(-)

diffs (81 lines):

diff -r 5deb0741355b -r 25b343d141c3 x11/mlterm/Makefile
--- a/x11/mlterm/Makefile       Wed Mar 26 16:23:48 2014 +0000
+++ b/x11/mlterm/Makefile       Wed Mar 26 16:47:39 2014 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.102 2014/03/23 07:04:00 tsutsui Exp $
+# $NetBSD: Makefile,v 1.103 2014/03/26 16:47:39 tsutsui Exp $
 
 DISTNAME=      mlterm-3.3.4
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff -r 5deb0741355b -r 25b343d141c3 x11/mlterm/distinfo
--- a/x11/mlterm/distinfo       Wed Mar 26 16:23:48 2014 +0000
+++ b/x11/mlterm/distinfo       Wed Mar 26 16:47:39 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2014/03/23 07:04:00 tsutsui Exp $
+$NetBSD: distinfo,v 1.44 2014/03/26 16:47:39 tsutsui Exp $
 
 SHA1 (mlterm-3.3.4.tar.gz) = eb065d2048ab1b7a0bcb7d1bddf253eb02ceacca
 RMD160 (mlterm-3.3.4.tar.gz) = 5c63c78a5e602dc473eaf0c6f50546cb9c944819
@@ -6,3 +6,4 @@
 SHA1 (patch-common_c__imagelib.c) = baf6de1fa4d6b55f7dd1ba77e42b0c91921fc872
 SHA1 (patch-configure) = 5e3b0c709d447c49b0d26c40bde8ded4ade013c3
 SHA1 (patch-etc_font-fb) = 7e5c1ced916fdb2b6da1dc86dd37d7bad5a7ede7
+SHA1 (patch-kiklib_src_kik__debug.c) = 0e718f1ccafacf2ae282c8c672ca3c4c6b8aa991
diff -r 5deb0741355b -r 25b343d141c3 x11/mlterm/patches/patch-kiklib_src_kik__debug.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/mlterm/patches/patch-kiklib_src_kik__debug.c  Wed Mar 26 16:47:39 2014 +0000
@@ -0,0 +1,51 @@
+$NetBSD: patch-kiklib_src_kik__debug.c,v 1.1 2014/03/26 16:47:39 tsutsui Exp $
+
+Pull post-3.3.4 bug fixes patch:
+http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.4/mlterm-3.3.4-fixes.patch/download
+ - fix build error with gcc-4.8.x
+
+--- kiklib/src/kik_debug.c.orig        2014-03-22 22:06:35.000000000 +0000
++++ kiklib/src/kik_debug.c
+@@ -160,16 +160,38 @@ kik_error_printf(
+       )
+ {
+       va_list  arg_list ;
++      char *  prefix ;
++      int  ret ;
+ 
+       va_start( arg_list , format) ;
+ 
+ #ifdef  HAVE_ERRNO_H
+-      debug_printf( "ERROR(" , strerror( errno) , NULL) ;
++      if( errno != 0)
++      {
++              char *  error ;
++
++              error = strerror( errno) ;
++
++              if( ! ( prefix = alloca( 6 + strlen( error) + 3 + 1)))
++              {
++                      ret = 0 ;
++                      goto  end ;
++              }
+ 
+-      return  debug_printf( "): " , format , arg_list) ;
+-#else
+-      return  debug_printf( "ERROR: " , format , arg_list) ;
++              sprintf( prefix , "ERROR(%s): " , error) ;
++      }
++      else
+ #endif
++      {
++              prefix = "ERROR: " ;
++      }
++
++      ret = debug_printf( prefix , format , arg_list) ;
++
++end:
++      va_end( arg_list) ;
++
++      return  ret ;
+ }
+ 
+ /*