From c2d35f966b8ce574f32e421b557e5f89a5e1d06d Mon Sep 17 00:00:00 2001
From: tsutsui <tsutsui@pkgsrc.org>
Date: Wed, 26 Mar 2014 16:47:39 +0000
Subject: 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)
---
 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(-)
 create mode 100644 x11/mlterm/patches/patch-kiklib_src_kik__debug.c

(limited to 'x11/mlterm')

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 1b39d8e6dbd..24315261e97 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -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 --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index 0862152a795..fee0ce2942e 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -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 @@ Size (mlterm-3.3.4.tar.gz) = 3589264 bytes
 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 --git a/x11/mlterm/patches/patch-kiklib_src_kik__debug.c b/x11/mlterm/patches/patch-kiklib_src_kik__debug.c
new file mode 100644
index 00000000000..960014f09d4
--- /dev/null
+++ b/x11/mlterm/patches/patch-kiklib_src_kik__debug.c
@@ -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 ;
+ }
+ 
+ /*
-- 
cgit v1.2.3