From owner-ports-jp@jp.freebsd.org  Thu Sep 13 00:30:43 2001
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id AAA13530;
	Thu, 13 Sep 2001 00:30:43 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from sahiro.homeip.net (p103-dna05sawada.niigata.ocn.ne.jp [211.122.195.231])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id AAA13525
	for <ports-jp@jp.freebsd.org>; Thu, 13 Sep 2001 00:30:38 +0900 (JST)
	(envelope-from sahiro@crest.ocn.ne.jp)
Date: Thu, 13 Sep 2001 00:29:55 +0900
From: SASAKI Katuhiro <sahiro@crest.ocn.ne.jp>
To: ports-jp@jp.freebsd.org
Message-ID: <3b9f7f73.6405%sahiro@crest.ocn.ne.jp>
In-Reply-To: <86k7z5vibh.wl@archon.local.idaemons.org>
References: <8666aqw6nl.wl@archon.local.idaemons.org>
	<3b9e2e1e.6400%sahiro@crest.ocn.ne.jp>
	<86k7z5vibh.wl@archon.local.idaemons.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-2022-JP
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+010328
X-Sequence: ports-jp 11350
Subject: [ports-jp 11350] Re: japanese/gnome(core|libs) (Re: we'll have another ports freeze for 4.4-RELEASE)
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: sahiro@crest.ocn.ne.jp

$B!!$I$&$b!"$5$5$-$G$9!#(B
$B!!(Bfreeze$B$b$&0l2s$H$$$&$3$H$G3hLvCf$N3'$5$^!"$46lO+MM$G$9!J%Z%3(B
$B%j!K!#(B


Akinori MUSHA $B$5$^$N(B<86k7z5vibh.wl@archon.local.idaemons.org>$B$+$i(B
>$B!!(Bnakai $B$5$s$O$*K;$7$$$N$+(B GNOME 1.2 $B$N:"$+$i0l2s$b<j$rF~$l$F(B
>$B$*$i$l$J$$$h$&$J$N$G!"D>$;$kJ}$,D>$7$F$I$s$I$s(B commit $B$7$F$$$/(B
>$B$7$+$"$j$^$;$s!#(B
>
$B!!$&!A$s!"$d$O$j$=$&$N$J$G$7$g$&$+!#$=$l$G$O$7$P$i$/!J(Bnakai$B$5$s(B
$B$,K\3JE*$KI|5"$9$k$^$G!)!K$N4V!"(Bnakai$B$5$sMm$_$N(Bport$B$NJQ99Ey$O!"(B
$B$3$A$i$KEj$2$F3'$5$^$K8+$FD:$3$&$+$H;W$$$^$9!#(B
#10$BF|IU$1$G(Bwww/aria$B$N99?7$OF~$C$F$$$k$h$&$J$s$G$9$,!D!D!#(B

$B!!$G!":#2s$N%M%?$OA02s$K0z$-B3$-(Bjapanese/gnomelibs$B$G$9!#$o$?$7$,(B
[FreeBSD-users-jp 64087]$B$GEj9F$7$?%Q%C%A(B
$B!J(Bhttp://www.gnome.gr.jp/ml/gnome-devel/200101/msg00009.html$B$N$?(B
$B$4$&$5$s:n(BKDE menu patch$B$r!"(BFreeBSD$B$GMxMQ$G$-$k$h$&$K2~JQ$7$?$b(B
$B$N$G$9!#!K$r<h$j9~$s$G$_$^$7$?!#%Q%C%A$N40@.EY$G$9$,!"(B
[FreeBSD-users-jp 64087]$B$KBP$7$FIT6q9g>pJs$r4s$;$?J}$O$$$i$C(B
$B$7$c$i$J$+$C$?$N$G!"$=$3$=$3;H$($F$$$k$b$N$HH=CG$7$F$$$^$9!#(B
$B!!$J$*!"0l$D$N%Q%C%A%U%!%$%k$GJ#?t$NBP>]$K%Q%C%A$rEv$F$k$H$$$&$*(B
$B9T57$N0-$$$3$H$r$d$C$F$$$^$9!#$3$l$O!"(Bnakai$B$5$s$,:n@.$5$l$?%Q%C(B
$B%A$H:.$6$C$F$7$^$C$F4IM}$,LLE]$K$J$k$N$rHr$1$k$H$$$&0UL#9g$$$G4:(B
$B$($F$d$C$F$$$^$9$N$G!"BgL\$K8+$F$d$C$F$/$@$5$k$H=u$+$j$^$9!#(B
$B!!$=$l$H!":#2s$N%Q%C%A$G$O(Bjapanese/gnomelibs$B$K(BLIB_DEPENDS$B$rDI2C(B
$B$7$F$$$^$9$N$G!"(Bx11/gnomelibs$B$NB&$K$b>/$7=$@5$,I,MW$G$9!#%a%$%k(B
$B$N:G8e$K$^$H$a$F$*$-$^$7$?!#(B


$B!!$=$l$G$O!#(B


diff -urN /usr/ports/x11/gnomelibs/Makefile gnomelibs/Makefile
--- /usr/ports/x11/gnomelibs/Makefile	Wed Sep 12 04:37:52 2001
+++ gnomelibs/Makefile	Wed Sep 12 18:05:30 2001
@@ -15,7 +15,7 @@
 MAINTAINER?=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml \
+LIB_DEPENDS+=	xml.5:${PORTSDIR}/textproc/libxml \
 		ORBit.2:${PORTSDIR}/devel/ORBit
 RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 

diff -urN /usr/ports/japanese/gnomelibs/Makefile gnomelibs/Makefile
--- /usr/ports/japanese/gnomelibs/Makefile	Wed Sep 12 04:35:55 2001
+++ gnomelibs/Makefile	Wed Sep 12 18:09:29 2001
@@ -6,7 +6,7 @@
 #
 
 # This port does not work with another version of master port.
-#PORTVERSION=	1.4.1.1
+#PORTVERSION=	1.4.1.2
 CATEGORIES=	japanese x11 gnome
 
 MASTERDIR=	${.CURDIR}/../../x11/gnomelibs
@@ -16,6 +16,8 @@
 MAINTAINER=	nakai@FreeBSD.org
 
 PLIST=		${WRKDIR}/pkg-plist
+
+LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
 
 post-extract:
 	${ECHO} bin/gnome-libs-jp > ${PLIST}
diff -urN /usr/ports/japanese/gnomelibs/files/patch-utf8menu gnomelibs/files/patch-utf8menu
--- /usr/ports/japanese/gnomelibs/files/patch-utf8menu	Thu Jan  1 09:00:00 1970
+++ gnomelibs/files/patch-utf8menu	Tue Sep 11 20:35:11 2001
@@ -0,0 +1,756 @@
+--- acconfig.h.orig	Thu Sep 21 20:43:37 2000
++++ acconfig.h	Tue Sep  3 22:04:18 2001
+@@ -63,6 +63,8 @@
+ #undef KDE_ICONDIR
+ #undef KDE_MINI_ICONDIR
+ 
++#undef HAVE_LIBGICONV
++
+ #undef PREFER_DB1
+ 
+ /* define if needed to include sa_len member in struct sockaddr */
+--- config.h.in.orig	Fri Jun 15 08:19:49 2001
++++ config.h.in	Tue Sep  3 22:04:43 2001
+@@ -113,6 +113,8 @@
+ #undef KDE_ICONDIR
+ #undef KDE_MINI_ICONDIR
+ 
++#undef HAVE_LIBGICONV
++
+ #undef PREFER_DB1
+ 
+ /* define if needed to include sa_len member in struct sockaddr */
+@@ -166,6 +168,9 @@
+ /* Define if you have the gtk_signal_handler_pending function.  */
+ #undef HAVE_GTK_SIGNAL_HANDLER_PENDING
+ 
++/* Define if you have the iconv function.  */
++#undef HAVE_ICONV
++
+ /* Define if you have the memmove function.  */
+ #undef HAVE_MEMMOVE
+ 
+@@ -175,6 +180,9 @@
+ /* Define if you have the munmap function.  */
+ #undef HAVE_MUNMAP
+ 
++/* Define if you have the nl_langinfo function.  */
++#undef HAVE_NL_LANGINFO
++
+ /* Define if you have the putenv function.  */
+ #undef HAVE_PUTENV
+ 
+@@ -280,9 +288,21 @@
+ /* Define if you have the <dlfcn.h> header file.  */
+ #undef HAVE_DLFCN_H
+ 
++/* Define if you have the <giconv.h> header file.  */
++#undef HAVE_GICONV_H
++
++/* Define if you have the <iconv.h> header file.  */
++#undef HAVE_ICONV_H
++
++/* Define if you have the <langinfo.h> header file.  */
++#undef HAVE_LANGINFO_H
++
+ /* Define if you have the <lastlog.h> header file.  */
+ #undef HAVE_LASTLOG_H
+ 
++/* Define if you have the <libcharset.h> header file.  */
++#undef HAVE_LIBCHARSET_H
++
+ /* Define if you have the <libutil.h> header file.  */
+ #undef HAVE_LIBUTIL_H
+ 
+@@ -361,8 +381,14 @@
+ /* Define if you have the <utmpx.h> header file.  */
+ #undef HAVE_UTMPX_H
+ 
++/* Define if you have the charset library (-lcharset).  */
++#undef HAVE_LIBCHARSET
++
+ /* Define if you have the i library (-li).  */
+ #undef HAVE_LIBI
++
++/* Define if you have the iconv library (-liconv).  */
++#undef HAVE_LIBICONV
+ 
+ /* Define if you have the m library (-lm).  */
+ #undef HAVE_LIBM
+--- configure.orig	Tue Aug 21 12:57:30 2001
++++ configure	Tue Sep  3 22:20:24 2001
+@@ -2732,7 +2732,7 @@
+ 	
+ 
+ 
+-for ac_prog in gawk mawk nawk awk
++for ac_prog in mawk gawk nawk awk
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -3484,7 +3484,7 @@
+ # define a MAINT-like variable REBUILD which is set if Perl
+ # and awk are found, so autogenerated sources can be rebuilt
+ 
+-for ac_prog in gawk mawk nawk awk
++for ac_prog in mawk gawk nawk awk
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -10289,6 +10289,430 @@
+ #define KDE_MINI_ICONDIR "$kde_datadir/icons/mini"
+ EOF
+ 
++
++for ac_func in iconv
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:10297: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 10302 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:10325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ iconv_ok=yes
++else
++  echo "$ac_t""no" 1>&6
++iconv_ok=no
++fi
++done
++
++if test "$iconv_ok" = yes; then
++  for ac_hdr in iconv.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:10355: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 10360 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:10365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++else
++  for ac_hdr in giconv.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:10396: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 10401 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:10406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ giconv_ok=yes
++else
++  echo "$ac_t""no" 1>&6
++giconv_ok=no
++fi
++done
++
++  if test "$giconv_ok" = yes; then
++    LIBS="$LIBS -lgiconv"; cat >> confdefs.h <<\EOF
++#define HAVE_LIBGICONV 1
++EOF
++
++  else
++    echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
++echo "configure:10440: checking for iconv in -liconv" >&5
++ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-liconv  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 10448 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char iconv();
++
++int main() {
++iconv()
++; return 0; }
++EOF
++if { (eval echo configure:10459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_lib=HAVE_LIB`echo iconv | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_lib 1
++EOF
++
++  LIBS="-liconv $LIBS"
++
++else
++  echo "$ac_t""no" 1>&6
++{ echo "configure: error: iconv() is not available." 1>&2; exit 1; }
++fi
++
++    for ac_hdr in iconv.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:10491: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 10496 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:10501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++  fi
++fi
++
++for ac_func in nl_langinfo
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:10533: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 10538 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:10561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ langinfo_ok=yes
++else
++  echo "$ac_t""no" 1>&6
++langinfo_ok=no
++fi
++done
++
++if test "$langinfo_ok" = yes; then
++  for ac_hdr in langinfo.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:10591: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 10596 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:10601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++else
++  echo $ac_n "checking for locale_charset in -lcharset""... $ac_c" 1>&6
++echo "configure:10629: checking for locale_charset in -lcharset" >&5
++ac_lib_var=`echo charset'_'locale_charset | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-lcharset  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 10637 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char locale_charset();
++
++int main() {
++locale_charset()
++; return 0; }
++EOF
++if { (eval echo configure:10648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_lib=HAVE_LIB`echo charset | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_lib 1
++EOF
++
++  LIBS="-lcharset $LIBS"
++
++else
++  echo "$ac_t""no" 1>&6
++{ echo "configure: error: nl_langinfo() nor locale_charse() is not available." 1>&2; exit 1; }
++fi
++
++  for ac_hdr in libcharset.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:10680: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 10685 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:10690: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++fi
+ 
+ 
+ 
+--- configure.in.orig	Tue Aug 21 12:56:45 2001
++++ configure.in	Tue Sep  3 22:02:22 2001
+@@ -436,6 +436,33 @@
+ AC_DEFINE_UNQUOTED(KDE_MINI_ICONDIR, "$kde_datadir/icons/mini")
+ 
+ dnl
++dnl iconv checks
++dnl
++AC_CHECK_FUNCS(iconv, iconv_ok=yes, iconv_ok=no)
++if test "$iconv_ok" = yes; then
++  AC_CHECK_HEADERS(iconv.h)
++else
++  AC_CHECK_HEADERS(giconv.h, giconv_ok=yes, giconv_ok=no)
++  if test "$giconv_ok" = yes; then
++    LIBS="$LIBS -lgiconv"; AC_DEFINE(HAVE_LIBGICONV)
++  else
++    AC_CHECK_LIB(iconv, iconv, , AC_MSG_ERROR(iconv() is not available.))
++    AC_CHECK_HEADERS(iconv.h)
++  fi
++fi
++
++dnl
++dnl nl_langinfo/locale_charset checks
++dnl
++AC_CHECK_FUNCS(nl_langinfo, langinfo_ok=yes, langinfo_ok=no)
++if test "$langinfo_ok" = yes; then
++  AC_CHECK_HEADERS(langinfo.h)
++else
++  AC_CHECK_LIB(charset, locale_charset, , AC_MSG_ERROR(nl_langinfo() nor locale_charse() is not available.))
++  AC_CHECK_HEADERS(libcharset.h)
++fi
++
++dnl
+ dnl Substitutions
+ dnl
+ 
+--- libgnome/gnome-dentry.c.orig	Fri Jun 15 07:21:01 2001
++++ libgnome/gnome-dentry.c	Tue Sep  3 22:04:25 2001
+@@ -13,6 +13,39 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++
++#include <locale.h>
++
++#ifdef HAVE_ICONV
++#ifdef HAVE_ICONV_H
++#include <iconv.h>
++#endif
++#else
++#ifdef HAVE_LIBGICONV
++#ifdef HAVE_GICONV_H
++#include <giconv.h>
++#endif
++#else
++#ifdef HAVE_LIBICONV
++#ifdef HAVE_ICONV_H
++#include <iconv.h>
++#endif
++#endif
++#endif
++#endif
++
++#ifdef HAVE_NL_LANGINFO
++#ifdef HAVE_LANGINFO_H
++#include <langinfo.h>
++#endif
++#else
++#ifdef HAVE_LIBCHARSET
++#ifdef HAVE_LIBCHARSET_H
++#include <libcharset.h>
++#endif
++#endif
++#endif
++
+ #include "gnome-defs.h"
+ #include "gnome-util.h"
+ #include "gnome-url.h"
+@@ -194,7 +227,9 @@
+ 	newitem = g_new0 (GnomeDesktopEntry, 1);
+ 
+ 	newitem->name          = name;
++	utf8tolocalechar (&newitem->name);
+ 	newitem->comment       = gnome_config_get_translated_string ("Comment");
++	utf8tolocalechar (&newitem->comment);
+ 	newitem->exec_length   = exec_length;
+ 	newitem->exec          = exec_vector;
+ 	newitem->tryexec       = try_file;
+@@ -808,4 +843,137 @@
+ 		g_free(e);
+ 	}
+ 	if(list) g_list_free(list);
++}
++
++#define F 0   /* character never appears in text */
++#define T 1   /* character appears in plain ASCII text */
++#define I 2   /* character appears in ISO-8859 text */
++#define X 3   /* character appears in non-ISO extended ASCII (Mac, IBM PC) */
++
++static char text_chars[256] = {
++	/*                  BEL BS HT LF    FF CR    */
++	F, F, F, F, F, F, F, T, T, T, T, F, T, T, F, F,  /* 0x0X */
++        /*                              ESC          */
++	F, F, F, F, F, F, F, F, F, F, F, T, F, F, F, F,  /* 0x1X */
++	T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T,  /* 0x2X */
++	T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T,  /* 0x3X */
++	T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T,  /* 0x4X */
++	T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T,  /* 0x5X */
++	T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T,  /* 0x6X */
++	T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, F,  /* 0x7X */
++	/*            NEL                            */
++	X, X, X, X, X, T, X, X, X, X, X, X, X, X, X, X,  /* 0x8X */
++	X, X, X, X, X, X, X, X, X, X, X, X, X, X, X, X,  /* 0x9X */
++	I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I,  /* 0xaX */
++	I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I,  /* 0xbX */
++	I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I,  /* 0xcX */
++	I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I,  /* 0xdX */
++	I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I,  /* 0xeX */
++	I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I   /* 0xfX */
++};
++
++int
++looks_utf8(buf, nbytes, ubuf, ulen)
++	const unsigned char *buf;
++	int nbytes;
++	unsigned long *ubuf;
++	int *ulen;
++{
++	int i, n;
++	unsigned long c;
++	int gotone = 0;
++
++	*ulen = 0;
++
++	for (i = 0; i < nbytes; i++) {
++		if ((buf[i] & 0x80) == 0) {	   /* 0xxxxxxx is plain ASCII */
++			/*
++			 * Even if the whole file is valid UTF-8 sequences,
++			 * still reject it if it uses weird control characters.
++			 */
++
++			if (text_chars[buf[i]] != T)
++				return 0;
++
++			if (ubuf != NULL)
++				ubuf[(*ulen)++] = buf[i];
++		} else if ((buf[i] & 0x40) == 0) { /* 10xxxxxx never 1st byte */
++			return 0;
++		} else {			   /* 11xxxxxx begins UTF-8 */
++			int following;
++
++			if ((buf[i] & 0x20) == 0) {		/* 110xxxxx */
++				c = buf[i] & 0x1f;
++				following = 1;
++			} else if ((buf[i] & 0x10) == 0) {	/* 1110xxxx */
++				c = buf[i] & 0x0f;
++				following = 2;
++			} else if ((buf[i] & 0x08) == 0) {	/* 11110xxx */
++				c = buf[i] & 0x07;
++				following = 3;
++			} else if ((buf[i] & 0x04) == 0) {	/* 111110xx */
++				c = buf[i] & 0x03;
++				following = 4;
++			} else if ((buf[i] & 0x02) == 0) {	/* 1111110x */
++				c = buf[i] & 0x01;
++				following = 5;
++			} else
++				return 0;
++
++			for (n = 0; n < following; n++) {
++				i++;
++				if (i >= nbytes)
++					goto done;
++
++				if ((buf[i] & 0x80) == 0 || (buf[i] & 0x40))
++					return 0;
++
++				c = (c << 6) + (buf[i] & 0x3f);
++			}
++
++			if (ubuf != NULL)
++				ubuf[(*ulen)++] = c;
++			gotone = 1;
++		}
++	}
++done:
++	return gotone;   /* don't claim it's UTF-8 if it's all 7-bit */
++}
++
++void
++utf8tolocalechar (char **value)
++{
++	static gchar *locale;
++	static gboolean initialized = FALSE;
++	gchar *pout, *pin, *str;
++	gint len, ulen = 0, ib, ob;
++	iconv_t fd;
++
++	if (!initialized) {
++		setlocale (LC_CTYPE, "");
++
++#ifdef HAVE_NL_LANGINFO
++		locale = nl_langinfo (CODESET);
++#else
++#ifdef HAVE_LIBCHARSET
++		locale = locale_charset();
++#endif
++#endif
++		initialized = TRUE;
++	}
++	if (*value) {
++		len = strlen (*value);
++		if (looks_utf8 (*value, len, NULL, &ulen)) {
++			if ((fd = iconv_open (locale, "UTF-8")) != (iconv_t)-1) {
++				ib = len;
++				ob = ib * 3;
++				pout = str = g_new0 (gchar, ob);
++				pin = *value;
++				iconv (fd, &pin, &ib, &pout, &ob);
++				iconv_close (fd);
++				g_free (*value);
++				*value = str;
++			}
++		}
++	}
+ }


================================================================
                       SASAKI Katuhiro

                mailto: sahiro@crest.ocn.ne.jp
================================================================
