Need to check requirement of math library for atan2(3).

4 files changed, 90 insertions, 4 deletions

diff --git a/inputmethod/ibus-handwrite/Makefile b/inputmethod/ibus-handwrite/Makefile
index 488df9dc5f6..979549835cf 100644
--- a/inputmethod/ibus-handwrite/Makefile
+++ b/inputmethod/ibus-handwrite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/12/15 18:54:55 marino Exp $
+# $NetBSD: Makefile,v 1.12 2011/12/16 10:51:18 obache Exp $
 #
 
 DISTNAME=	ibus-handwrite-2.1.4
@@ -22,7 +22,6 @@ FIND_PREFIX:=	ZINNIA_TOMOE_DIR=zinnia-tomoe
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config
-LDFLAGS+=		-lm	# list explicitly for ld v2.22
 
 CONFIGURE_ARGS+=	--enable-zinnia
 CONFIGURE_ARGS+=	--with-zinnia-tomoe=${ZINNIA_TOMOE_DIR}/lib/zinnia/model/tomoe
diff --git a/inputmethod/ibus-handwrite/distinfo b/inputmethod/ibus-handwrite/distinfo
index 4369a31c0aa..b6e4da0a554 100644
--- a/inputmethod/ibus-handwrite/distinfo
+++ b/inputmethod/ibus-handwrite/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2011/03/25 12:36:26 obache Exp $
+$NetBSD: distinfo,v 1.6 2011/12/16 10:51:18 obache Exp $
 
 SHA1 (ibus-handwrite-2.1.4.tar.bz2) = 2798728c628dfa60a7c1c45c8a59882962c91b1e
 RMD160 (ibus-handwrite-2.1.4.tar.bz2) = 35e7288d5efcd98a01138d075b0455874730a4ea
 Size (ibus-handwrite-2.1.4.tar.bz2) = 237980 bytes
-SHA1 (patch-aa) = 18449df350fbff0e465ad05fc5c3b8e879418d0b
+SHA1 (patch-configure) = 66d3e86c3ac5de1bbd466bfca1fc1d709b2d1da6
+SHA1 (patch-configure.ac) = 0730abb2210c60b2feb1e9a3055568f4fbb11e2a
diff --git a/inputmethod/ibus-handwrite/patches/patch-configure b/inputmethod/ibus-handwrite/patches/patch-configure
new file mode 100644
index 00000000000..bfee715f9ac
--- /dev/null
+++ b/inputmethod/ibus-handwrite/patches/patch-configure
@@ -0,0 +1,70 @@
+$NetBSD: patch-configure,v 1.1 2011/12/16 10:51:18 obache Exp $
+
+* regen with patched configure.ac.
+
+--- configure.orig	2011-03-25 05:28:36.000000000 +0000
++++ configure
+@@ -5153,6 +5153,63 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing atan2" >&5
++$as_echo_n "checking for library containing atan2... " >&6; }
++if ${ac_cv_search_atan2+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char atan2 ();
++int
++main ()
++{
++return atan2 ();
++  ;
++  return 0;
++}
++_ACEOF
++for ac_lib in '' m; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_atan2=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if ${ac_cv_search_atan2+:} false; then :
++  break
++fi
++done
++if ${ac_cv_search_atan2+:} false; then :
++
++else
++  ac_cv_search_atan2=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_atan2" >&5
++$as_echo "$ac_cv_search_atan2" >&6; }
++ac_res=$ac_cv_search_atan2
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++fi
++
++
+ if test "x${enable_zinnia}" = "xyes"; then :
+ 
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zinnia_recognizer_open in -lzinnia" >&5
diff --git a/inputmethod/ibus-handwrite/patches/patch-configure.ac b/inputmethod/ibus-handwrite/patches/patch-configure.ac
new file mode 100644
index 00000000000..f7075bd0bb7
--- /dev/null
+++ b/inputmethod/ibus-handwrite/patches/patch-configure.ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure.ac,v 1.1 2011/12/16 10:51:18 obache Exp $
+
+* Need to requirement of math library for atan2(3).
+  http://code.google.com/p/ibus-handwrite/issues/detail?id=19
+
+--- configure.ac.orig	2011-03-25 05:28:26.000000000 +0000
++++ configure.ac
+@@ -66,6 +66,8 @@ GETTEXT_PACKAGE="$PACKAGE_NAME"
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define to the read-only architecture-independent data directory.])
+ 
++AC_SEARCH_LIBS([atan2], [m])
++
+ AS_IF([test "x${enable_zinnia}" = "xyes"],
+ 	[
+ 		AC_CHECK_LIB(zinnia,[zinnia_recognizer_open],[],[have_zinnia=no])