Quick fix for build with converters/libiconv, making configure detect

iconv() in libiconv library.

3 files changed, 213 insertions, 1 deletions

diff --git a/textproc/chasen-base/distinfo b/textproc/chasen-base/distinfo
index 3c3add5236a..2d5f37ebc56 100644
--- a/textproc/chasen-base/distinfo
+++ b/textproc/chasen-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2004/06/01 08:23:29 shannonjr Exp $
+$NetBSD: distinfo,v 1.5 2004/06/09 05:42:31 taca Exp $
 
 SHA1 (chasen-2.3.3.tar.gz) = 711f5717ee284d26aa5616292f7aaffaef11d03a
 Size (chasen-2.3.3.tar.gz) = 425981 bytes
@@ -12,3 +12,5 @@ SHA1 (patch-ai) = 7a9ffd640c275c1361e34591d08c1ce519df5dc7
 SHA1 (patch-aj) = 8c440610abaa31b22950ef41149736feefc968e8
 SHA1 (patch-ak) = 05afdb444ef6a59cb2f9c86617b6dba8332ac5f3
 SHA1 (patch-al) = a1069b648d7c352923dd27a193f93b87b4bf3e8a
+SHA1 (patch-am) = 25965ca10b35e564cd0358a1949c7a90a8596b55
+SHA1 (patch-an) = e24d8cb3f1ffa9b2b601b417e94f5eb533782aa5
diff --git a/textproc/chasen-base/patches/patch-am b/textproc/chasen-base/patches/patch-am
new file mode 100644
index 00000000000..cea822bee49
--- /dev/null
+++ b/textproc/chasen-base/patches/patch-am
@@ -0,0 +1,29 @@
+$NetBSD: patch-am,v 1.1 2004/06/09 05:42:31 taca Exp $
+
+--- configure.in.orig	Fri Aug 15 12:58:57 2003
++++ configure.in
+@@ -26,7 +26,7 @@ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(fcntl.h limits.h sys/file.h sys/stat.h unistd.h)
+ AC_CHECK_HEADERS(sys/param.h sys/types.h netinet/in.h)
+-AC_CHECK_HEADERS(io.h windows.h)
++AC_CHECK_HEADERS(io.h windows.h iconv.h)
+ 
+ AC_MSG_CHECKING([for darts.h])
+ AC_ARG_WITH(darts,
+@@ -55,8 +55,13 @@ AC_ARG_WITH(libiconv,
+         AC_SUBST(ICONV_CFLAGS)
+      fi])
+ 
+-AC_CHECK_LIB(iconv, iconv, [], [
+-	AC_CHECK_HEADER(iconv.h, [], AC_MSG_ERROR([ChaSen needs iconv]))])
++AC_MSG_CHECKING([iconv()])
++save_libs="$LIBS"
++LIBS="$LIBS -liconv"
++ac_cv_lib_iconv_iconv=no
++AC_TRY_LINK([#include <iconv.h>], [iconv(0, 0, 0, 0, 0)],
++	[ac_cv_lib_iconv_iconv=yes], [AC_MSG_ERROR([ChaSen needs iconv])])
++AC_MSG_RESULT($ac_cv_lib_iconv_iconv)
+ 
+ AC_DEFUN(cl_VAR_ICONV_ARG, [
+      for CODE in $2; do
diff --git a/textproc/chasen-base/patches/patch-an b/textproc/chasen-base/patches/patch-an
new file mode 100644
index 00000000000..46296a1213b
--- /dev/null
+++ b/textproc/chasen-base/patches/patch-an
@@ -0,0 +1,181 @@
+$NetBSD: patch-an,v 1.1 2004/06/09 05:42:31 taca Exp $
+
+--- configure.orig	Fri Aug 15 13:00:58 2003
++++ configure
+@@ -8497,13 +8497,10 @@ if test "${with_libiconv+set}" = set; th
+ fi;
+ 
+ 
+-echo "$as_me:$LINENO: checking for iconv in -liconv" >&5
+-echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6
+-if test "${ac_cv_lib_iconv_iconv+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-liconv  $LIBS"
++echo "$as_me:$LINENO: checking iconv()" >&5
++echo $ECHO_N "checking iconv()... $ECHO_C" >&6
++save_libs="$LIBS"
++LIBS="$LIBS -liconv"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+@@ -8512,9 +8509,7 @@ cat >conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char iconv ();
++#include <iconv.h>
+ #ifdef F77_DUMMY_MAIN
+ #  ifdef __cplusplus
+      extern "C"
+@@ -8524,7 +8519,7 @@ char iconv ();
+ int
+ main ()
+ {
+-iconv ();
++iconv(0, 0, 0, 0, 0)
+   ;
+   return 0;
+ }
+@@ -8545,135 +8540,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_cv_lib_iconv_iconv=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv" >&5
+-echo "${ECHO_T}$ac_cv_lib_iconv_iconv" >&6
+-if test $ac_cv_lib_iconv_iconv = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBICONV 1
+-_ACEOF
+-
+-  LIBS="-liconv $LIBS"
+-
+-else
+-
+-	if test "${ac_cv_header_iconv_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for iconv.h" >&5
+-echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6
+-if test "${ac_cv_header_iconv_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5
+-echo "${ECHO_T}$ac_cv_header_iconv_h" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking iconv.h usability" >&5
+-echo $ECHO_N "checking iconv.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-$ac_includes_default
+-#include <iconv.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_header_compiler=no
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking iconv.h presence" >&5
+-echo $ECHO_N "checking iconv.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <iconv.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+-  yes:no )
+-    { echo "$as_me:$LINENO: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: iconv.h: proceeding with the preprocessor's result" >&2;};;
+-  no:yes )
+-    { echo "$as_me:$LINENO: WARNING: iconv.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: iconv.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: iconv.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: iconv.h: check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: iconv.h: proceeding with the preprocessor's result" >&2;};;
+-esac
+-echo "$as_me:$LINENO: checking for iconv.h" >&5
+-echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6
+-if test "${ac_cv_header_iconv_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_iconv_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5
+-echo "${ECHO_T}$ac_cv_header_iconv_h" >&6
+-
+-fi
+-if test $ac_cv_header_iconv_h = yes; then
+-  :
+-else
+-  { { echo "$as_me:$LINENO: error: ChaSen needs iconv" >&5
++{ { echo "$as_me:$LINENO: error: ChaSen needs iconv" >&5
+ echo "$as_me: error: ChaSen needs iconv" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-
+-
+-fi
+-
+-
++echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv" >&5
++echo "${ECHO_T}$ac_cv_lib_iconv_iconv" >&6
+ 
+ 
+ echo "$as_me:$LINENO: checking iconv args" >&5