mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

Iconv cleanup, stage 2a: remove patches that only replacing <iconv.h> with

Browse Source 
<giconv.h> or -liconv with -lgiconv.
This commit is contained in:
Maxim Sobolev 2002-03-18 11:26:13 +00:00
parent dc2cf7c4bc
commit 449a928eea
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=56293
59 changed files with 0 additions and 1536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deskutils/gnucash/files/patch-intl::gettextP.h
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- intl/gettextP.h 2001/07/27 15:27:33 1.1
+++ intl/gettextP.h 2001/07/27 15:27:49
@@ -25,7 +25,7 @@
# include "../iconv/gconv_int.h"
#else
# if HAVE_ICONV
-# include <iconv.h>
+# include <giconv.h>
# endif
#endif

26
deskutils/mrproject/files/patch-configure
View File

@ -1,26 +0,0 @@
--- configure.orig Sun Jan 27 18:08:12 2002
+++ configure Sun Jan 27 18:08:30 2002
@@ -7468,12 +7468,12 @@
rm -f conftest*
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
- LIBS="$LIBS -liconv"
+ LIBS="$LIBS -lgiconv"
cat > conftest.$ac_ext <<EOF
#line 7474 "configure"
#include "confdefs.h"
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
int main() {
iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
@@ -7549,7 +7549,7 @@
fi
LIBICONV=
if test "$am_cv_lib_iconv" = yes; then
- LIBICONV="-liconv"
+ LIBICONV="-lgiconv"
fi

26
deskutils/planner/files/patch-configure
View File

@ -1,26 +0,0 @@
--- configure.orig Sun Jan 27 18:08:12 2002
+++ configure Sun Jan 27 18:08:30 2002
@@ -7468,12 +7468,12 @@
rm -f conftest*
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
- LIBS="$LIBS -liconv"
+ LIBS="$LIBS -lgiconv"
cat > conftest.$ac_ext <<EOF
#line 7474 "configure"
#include "confdefs.h"
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
int main() {
iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
@@ -7549,7 +7549,7 @@
fi
LIBICONV=
if test "$am_cv_lib_iconv" = yes; then
- LIBICONV="-liconv"
+ LIBICONV="-lgiconv"
fi

14
devel/gnome-vfs1/files/patch-libgnomevfs::gnome-vfs-mime-info.c
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- libgnomevfs/gnome-vfs-mime-info.c 2002/03/17 13:33:30 1.1
+++ libgnomevfs/gnome-vfs-mime-info.c 2002/03/17 13:33:39
@@ -46,7 +46,7 @@
#include <time.h>
#include <unistd.h>
-#include <iconv.h>
+#include <giconv.h>
#include <errno.h>
#include <stdlib.h>

14
devel/gnomevfs/files/patch-libgnomevfs::gnome-vfs-mime-info.c
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- libgnomevfs/gnome-vfs-mime-info.c 2002/03/17 13:33:30 1.1
+++ libgnomevfs/gnome-vfs-mime-info.c 2002/03/17 13:33:39
@@ -46,7 +46,7 @@
#include <time.h>
#include <unistd.h>
-#include <iconv.h>
+#include <giconv.h>
#include <errno.h>
#include <stdlib.h>

14
devel/gtranslator/files/patch-src::convert.c
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- src/convert.c 2001/09/10 10:08:11 1.1
+++ src/convert.c 2001/09/10 10:08:22
@@ -24,7 +24,7 @@
#include "convert.h"
#include "utils.h"
-#include <iconv.h>
+#include <giconv.h>
#include <string.h>
/*

148
editors/AbiWord/files/patch-..::wv::configure
View File

@ -1,148 +0,0 @@
$FreeBSD$
--- ../wv/configure.orig Thu Nov 22 12:24:09 2001
+++ ../wv/configure Mon Dec 17 13:44:55 2001
@@ -2676,16 +2676,16 @@
if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
-echo "configure:2682: checking for iconv.h" >&5
+ ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
+echo "configure:2682: checking for giconv.h" >&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 2687 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -2710,7 +2710,7 @@
else
echo "$ac_t""no" 1>&6
- { echo "configure: error: * * * I found system iconv but can't find iconv.h header! * * *" 1>&2; exit 1; }
+ { echo "configure: error: * * * I found system iconv but can't find giconv.h header! * * *" 1>&2; exit 1; }
fi
@@ -2725,30 +2725,30 @@
if test "x$LIBICONV_DIR" != "x" ; then
if test "$use_peer_libiconv" != "no" ; then
ICONV_CFLAGS="-I$LIBICONV_DIR/include"
- ICONV_LIBS="-L$LIBICONV_DIR/lib/.libs -liconv"
+ ICONV_LIBS="-L$LIBICONV_DIR/lib/.libs -lgiconv"
else
ICONV_CFLAGS="-I$LIBICONV_DIR/include"
- ICONV_LIBS="-L$LIBICONV_DIR/lib -liconv"
+ ICONV_LIBS="-L$LIBICONV_DIR/lib -lgiconv"
fi
else
ICONV_CFLAGS=""
- ICONV_LIBS="-liconv"
+ ICONV_LIBS="-lgiconv"
fi
CPPFLAGS="${CPPFLAGS} $ICONV_CFLAGS"
LDFLAGS="${LDFLAGS} $ICONV_LIBS"
if test "$use_peer_libiconv" = "abi" ; then
- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
-echo "configure:2745: checking for iconv.h" >&5
+ ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
+echo "configure:2745: checking for giconv.h" >&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 2750 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -2773,16 +2773,16 @@
fi
else
- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
-echo "configure:2779: checking for iconv.h" >&5
+ ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
+echo "configure:2779: checking for giconv.h" >&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 2784 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -2802,14 +2802,14 @@
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- echo $ac_n "checking for iconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:2807: checking for iconv_open in -liconv" >&5
+ echo $ac_n "checking for iconv_open in -lgiconv""... $ac_c" 1>&6
+echo "configure:2807: checking for iconv_open in -lgiconv" >&5
ac_lib_var=`echo iconv'_'iconv_open | 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"
+LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2815 "configure"
#include "confdefs.h"
@@ -2842,14 +2842,14 @@
else
echo "$ac_t""no" 1>&6
- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:2847: checking for libiconv_open in -liconv" >&5
+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
+echo "configure:2847: checking for libiconv_open in -lgiconv" >&5
ac_lib_var=`echo iconv'_'libiconv_open | 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"
+LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2855 "configure"
#include "confdefs.h"
@@ -2882,7 +2882,7 @@
else
echo "$ac_t""no" 1>&6
- { echo "configure: error: * * * I found iconv.h header but no working library! * * *" 1>&2; exit 1; }
+ { echo "configure: error: * * * I found giconv.h header but no working library! * * *" 1>&2; exit 1; }
fi
@@ -2916,7 +2916,7 @@
#line 2917 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
int main() {

14
editors/AbiWord/files/patch-..::wv::text.c
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- ../wv/text.c.orig Tue Jun 26 19:04:10 2001
+++ ../wv/text.c Wed Aug 8 14:47:29 2001
@@ -5,7 +5,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include "iconv.h"
+#include "giconv.h"
#include "wv.h"
extern TokenTable s_Tokens[];

148
editors/AbiWord2/files/patch-..::wv::configure
View File

@ -1,148 +0,0 @@
$FreeBSD$
--- ../wv/configure.orig Thu Nov 22 12:24:09 2001
+++ ../wv/configure Mon Dec 17 13:44:55 2001
@@ -2676,16 +2676,16 @@
if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
-echo "configure:2682: checking for iconv.h" >&5
+ ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
+echo "configure:2682: checking for giconv.h" >&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 2687 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -2710,7 +2710,7 @@
else
echo "$ac_t""no" 1>&6
- { echo "configure: error: * * * I found system iconv but can't find iconv.h header! * * *" 1>&2; exit 1; }
+ { echo "configure: error: * * * I found system iconv but can't find giconv.h header! * * *" 1>&2; exit 1; }
fi
@@ -2725,30 +2725,30 @@
if test "x$LIBICONV_DIR" != "x" ; then
if test "$use_peer_libiconv" != "no" ; then
ICONV_CFLAGS="-I$LIBICONV_DIR/include"
- ICONV_LIBS="-L$LIBICONV_DIR/lib/.libs -liconv"
+ ICONV_LIBS="-L$LIBICONV_DIR/lib/.libs -lgiconv"
else
ICONV_CFLAGS="-I$LIBICONV_DIR/include"
- ICONV_LIBS="-L$LIBICONV_DIR/lib -liconv"
+ ICONV_LIBS="-L$LIBICONV_DIR/lib -lgiconv"
fi
else
ICONV_CFLAGS=""
- ICONV_LIBS="-liconv"
+ ICONV_LIBS="-lgiconv"
fi
CPPFLAGS="${CPPFLAGS} $ICONV_CFLAGS"
LDFLAGS="${LDFLAGS} $ICONV_LIBS"
if test "$use_peer_libiconv" = "abi" ; then
- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
-echo "configure:2745: checking for iconv.h" >&5
+ ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
+echo "configure:2745: checking for giconv.h" >&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 2750 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -2773,16 +2773,16 @@
fi
else
- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
-echo "configure:2779: checking for iconv.h" >&5
+ ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
+echo "configure:2779: checking for giconv.h" >&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 2784 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -2802,14 +2802,14 @@
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- echo $ac_n "checking for iconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:2807: checking for iconv_open in -liconv" >&5
+ echo $ac_n "checking for iconv_open in -lgiconv""... $ac_c" 1>&6
+echo "configure:2807: checking for iconv_open in -lgiconv" >&5
ac_lib_var=`echo iconv'_'iconv_open | 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"
+LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2815 "configure"
#include "confdefs.h"
@@ -2842,14 +2842,14 @@
else
echo "$ac_t""no" 1>&6
- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:2847: checking for libiconv_open in -liconv" >&5
+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
+echo "configure:2847: checking for libiconv_open in -lgiconv" >&5
ac_lib_var=`echo iconv'_'libiconv_open | 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"
+LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2855 "configure"
#include "confdefs.h"
@@ -2882,7 +2882,7 @@
else
echo "$ac_t""no" 1>&6
- { echo "configure: error: * * * I found iconv.h header but no working library! * * *" 1>&2; exit 1; }
+ { echo "configure: error: * * * I found giconv.h header but no working library! * * *" 1>&2; exit 1; }
fi
@@ -2916,7 +2916,7 @@
#line 2917 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
int main() {

14
editors/AbiWord2/files/patch-..::wv::text.c
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- ../wv/text.c.orig Tue Jun 26 19:04:10 2001
+++ ../wv/text.c Wed Aug 8 14:47:29 2001
@@ -5,7 +5,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include "iconv.h"
+#include "giconv.h"
#include "wv.h"
extern TokenTable s_Tokens[];

148
editors/abiword-devel/files/patch-..::wv::configure
View File

@ -1,148 +0,0 @@
$FreeBSD$
--- ../wv/configure.orig Thu Nov 22 12:24:09 2001
+++ ../wv/configure Mon Dec 17 13:44:55 2001
@@ -2676,16 +2676,16 @@
if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
-echo "configure:2682: checking for iconv.h" >&5
+ ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
+echo "configure:2682: checking for giconv.h" >&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 2687 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -2710,7 +2710,7 @@
else
echo "$ac_t""no" 1>&6
- { echo "configure: error: * * * I found system iconv but can't find iconv.h header! * * *" 1>&2; exit 1; }
+ { echo "configure: error: * * * I found system iconv but can't find giconv.h header! * * *" 1>&2; exit 1; }
fi
@@ -2725,30 +2725,30 @@
if test "x$LIBICONV_DIR" != "x" ; then
if test "$use_peer_libiconv" != "no" ; then
ICONV_CFLAGS="-I$LIBICONV_DIR/include"
- ICONV_LIBS="-L$LIBICONV_DIR/lib/.libs -liconv"
+ ICONV_LIBS="-L$LIBICONV_DIR/lib/.libs -lgiconv"
else
ICONV_CFLAGS="-I$LIBICONV_DIR/include"
- ICONV_LIBS="-L$LIBICONV_DIR/lib -liconv"
+ ICONV_LIBS="-L$LIBICONV_DIR/lib -lgiconv"
fi
else
ICONV_CFLAGS=""
- ICONV_LIBS="-liconv"
+ ICONV_LIBS="-lgiconv"
fi
CPPFLAGS="${CPPFLAGS} $ICONV_CFLAGS"
LDFLAGS="${LDFLAGS} $ICONV_LIBS"
if test "$use_peer_libiconv" = "abi" ; then
- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
-echo "configure:2745: checking for iconv.h" >&5
+ ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
+echo "configure:2745: checking for giconv.h" >&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 2750 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -2773,16 +2773,16 @@
fi
else
- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
-echo "configure:2779: checking for iconv.h" >&5
+ ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
+echo "configure:2779: checking for giconv.h" >&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 2784 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -2802,14 +2802,14 @@
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- echo $ac_n "checking for iconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:2807: checking for iconv_open in -liconv" >&5
+ echo $ac_n "checking for iconv_open in -lgiconv""... $ac_c" 1>&6
+echo "configure:2807: checking for iconv_open in -lgiconv" >&5
ac_lib_var=`echo iconv'_'iconv_open | 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"
+LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2815 "configure"
#include "confdefs.h"
@@ -2842,14 +2842,14 @@
else
echo "$ac_t""no" 1>&6
- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:2847: checking for libiconv_open in -liconv" >&5
+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
+echo "configure:2847: checking for libiconv_open in -lgiconv" >&5
ac_lib_var=`echo iconv'_'libiconv_open | 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"
+LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2855 "configure"
#include "confdefs.h"
@@ -2882,7 +2882,7 @@
else
echo "$ac_t""no" 1>&6
- { echo "configure: error: * * * I found iconv.h header but no working library! * * *" 1>&2; exit 1; }
+ { echo "configure: error: * * * I found giconv.h header but no working library! * * *" 1>&2; exit 1; }
fi
@@ -2916,7 +2916,7 @@
#line 2917 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
int main() {

14
editors/abiword-devel/files/patch-..::wv::text.c
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- ../wv/text.c.orig Tue Jun 26 19:04:10 2001
+++ ../wv/text.c Wed Aug 8 14:47:29 2001
@@ -5,7 +5,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include "iconv.h"
+#include "giconv.h"
#include "wv.h"
extern TokenTable s_Tokens[];

148
editors/abiword/files/patch-..::wv::configure
View File

@ -1,148 +0,0 @@
$FreeBSD$
--- ../wv/configure.orig Thu Nov 22 12:24:09 2001
+++ ../wv/configure Mon Dec 17 13:44:55 2001
@@ -2676,16 +2676,16 @@
if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
-echo "configure:2682: checking for iconv.h" >&5
+ ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
+echo "configure:2682: checking for giconv.h" >&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 2687 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -2710,7 +2710,7 @@
else
echo "$ac_t""no" 1>&6
- { echo "configure: error: * * * I found system iconv but can't find iconv.h header! * * *" 1>&2; exit 1; }
+ { echo "configure: error: * * * I found system iconv but can't find giconv.h header! * * *" 1>&2; exit 1; }
fi
@@ -2725,30 +2725,30 @@
if test "x$LIBICONV_DIR" != "x" ; then
if test "$use_peer_libiconv" != "no" ; then
ICONV_CFLAGS="-I$LIBICONV_DIR/include"
- ICONV_LIBS="-L$LIBICONV_DIR/lib/.libs -liconv"
+ ICONV_LIBS="-L$LIBICONV_DIR/lib/.libs -lgiconv"
else
ICONV_CFLAGS="-I$LIBICONV_DIR/include"
- ICONV_LIBS="-L$LIBICONV_DIR/lib -liconv"
+ ICONV_LIBS="-L$LIBICONV_DIR/lib -lgiconv"
fi
else
ICONV_CFLAGS=""
- ICONV_LIBS="-liconv"
+ ICONV_LIBS="-lgiconv"
fi
CPPFLAGS="${CPPFLAGS} $ICONV_CFLAGS"
LDFLAGS="${LDFLAGS} $ICONV_LIBS"
if test "$use_peer_libiconv" = "abi" ; then
- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
-echo "configure:2745: checking for iconv.h" >&5
+ ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
+echo "configure:2745: checking for giconv.h" >&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 2750 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -2773,16 +2773,16 @@
fi
else
- ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
-echo "configure:2779: checking for iconv.h" >&5
+ ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
+echo "configure:2779: checking for giconv.h" >&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 2784 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -2802,14 +2802,14 @@
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- echo $ac_n "checking for iconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:2807: checking for iconv_open in -liconv" >&5
+ echo $ac_n "checking for iconv_open in -lgiconv""... $ac_c" 1>&6
+echo "configure:2807: checking for iconv_open in -lgiconv" >&5
ac_lib_var=`echo iconv'_'iconv_open | 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"
+LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2815 "configure"
#include "confdefs.h"
@@ -2842,14 +2842,14 @@
else
echo "$ac_t""no" 1>&6
- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:2847: checking for libiconv_open in -liconv" >&5
+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
+echo "configure:2847: checking for libiconv_open in -lgiconv" >&5
ac_lib_var=`echo iconv'_'libiconv_open | 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"
+LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2855 "configure"
#include "confdefs.h"
@@ -2882,7 +2882,7 @@
else
echo "$ac_t""no" 1>&6
- { echo "configure: error: * * * I found iconv.h header but no working library! * * *" 1>&2; exit 1; }
+ { echo "configure: error: * * * I found giconv.h header but no working library! * * *" 1>&2; exit 1; }
fi
@@ -2916,7 +2916,7 @@
#line 2917 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
int main() {

14
editors/abiword/files/patch-..::wv::text.c
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- ../wv/text.c.orig Tue Jun 26 19:04:10 2001
+++ ../wv/text.c Wed Aug 8 14:47:29 2001
@@ -5,7 +5,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include "iconv.h"
+#include "giconv.h"
#include "wv.h"
extern TokenTable s_Tokens[];

14
finance/gnucash-devel/files/patch-intl::gettextP.h
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- intl/gettextP.h 2001/07/27 15:27:33 1.1
+++ intl/gettextP.h 2001/07/27 15:27:49
@@ -25,7 +25,7 @@
# include "../iconv/gconv_int.h"
#else
# if HAVE_ICONV
-# include <iconv.h>
+# include <giconv.h>
# endif
#endif

14
finance/gnucash/files/patch-intl::gettextP.h
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- intl/gettextP.h 2001/07/27 15:27:33 1.1
+++ intl/gettextP.h 2001/07/27 15:27:49
@@ -25,7 +25,7 @@
# include "../iconv/gconv_int.h"
#else
# if HAVE_ICONV
-# include <iconv.h>
+# include <giconv.h>
# endif
#endif

11
graphics/djvulibre/files/patch-iconv
View File

@ -1,11 +0,0 @@
GNU iconv is known as giconv on FreeBSD
-mi
--- libdjvu/GUnicode.cpp Tue Oct 23 17:09:25 2001
+++ libdjvu/GUnicode.cpp Thu Feb 7 13:57:53 2002
@@ -44,3 +44,3 @@
#ifdef HAS_ICONV
-#include <iconv.h>
+#include <giconv.h>
#endif

20
japanese/mutt-devel/files/patch-aa
View File

@ -1,20 +0,0 @@
--- configure.in.orig Wed Feb 6 22:22:58 2002
+++ configure.in Wed Feb 6 22:23:22 2002
@@ -686,7 +686,7 @@
mutt_save_LIBS="$LIBS"
LIBS="$LIBS $LIBICONV"
AC_TRY_RUN([
-#include <iconv.h>
+#include <giconv.h>
int main()
{
iconv_t cd;
@@ -717,7 +717,7 @@
mutt_save_LIBS="$LIBS"
LIBS="$LIBS $LIBICONV"
AC_TRY_RUN([
-#include <iconv.h>
+#include <giconv.h>
#include <string.h>
int main()
{

11
japanese/mutt-devel/files/patch-ab
View File

@ -1,11 +0,0 @@
--- charset.c.orig Thu Feb 15 17:09:02 2001
+++ charset.c Thu Mar 1 02:27:30 2001
@@ -31,7 +31,7 @@
#include <unistd.h>
#include <errno.h>
-#include <iconv.h>
+#include <giconv.h>
#include "mutt.h"
#include "charset.h"

11
japanese/mutt-devel/files/patch-ad
View File

@ -1,11 +0,0 @@
--- gnupgparse.c.orig Tue Jan 9 07:21:51 2001
+++ gnupgparse.c Sun Feb 4 21:07:30 2001
@@ -44,7 +44,7 @@
#include "mutt.h"
#include "pgp.h"
#include "charset.h"
-#include "iconv.h"
+#include "giconv.h"
/* for hexval */
#include "mime.h"

11
japanese/mutt-devel/files/patch-ae
View File

@ -1,11 +0,0 @@
--- rfc2047.c.orig Sun Feb 4 21:04:05 2001
+++ rfc2047.c Sun Feb 4 21:08:22 2001
@@ -24,7 +24,7 @@
#include <ctype.h>
#include <errno.h>
-#include <iconv.h>
+#include <giconv.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

11
japanese/mutt-devel/files/patch-af
View File

@ -1,11 +0,0 @@
--- charset.h.orig Fri Dec 7 03:41:04 2001
+++ charset.h Fri Dec 7 03:42:31 2001
@@ -19,7 +19,7 @@
#ifndef _CHARSET_H
#define _CHARSET_H
-#include <iconv.h>
+#include <giconv.h>
int mutt_convert_string (char **, const char *, const char *, int);
void mutt_sanitize_ja_chars (char *, size_t, int);

40
japanese/mutt-devel/files/patch-ah
View File

@ -1,40 +0,0 @@
--- m4/iconv.m4.orig Fri Jun 15 00:44:35 2001
+++ m4/iconv.m4 Fri Jun 15 00:45:30 2001
@@ -19,16 +19,16 @@
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
+#include <giconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
am_cv_func_iconv=yes)
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
- LIBS="$LIBS -liconv"
+ LIBS="$LIBS -lgiconv"
AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
+#include <giconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
@@ -43,7 +43,7 @@
AC_CACHE_VAL(am_cv_proto_iconv, [
AC_TRY_COMPILE([
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
extern
#ifdef __cplusplus
"C"
@@ -63,7 +63,7 @@
fi
LIBICONV=
if test "$am_cv_lib_iconv" = yes; then
- LIBICONV="-liconv"
+ LIBICONV="-lgiconv"
fi
AC_SUBST(LIBICONV)
])

11
mail/balsa/files/patch-libbalsa::address-book-ldap.c
View File

@ -1,11 +0,0 @@
--- libbalsa/address-book-ldap.c Mon Nov 19 03:41:21 2001
+++ libbalsa/address-book-ldap.c.new Sun Dec 16 12:59:34 2001
@@ -31,7 +31,7 @@
#include <sys/time.h>
#include <lber.h>
#include <ldap.h>
-#include <iconv.h>
+#include <giconv.h>
#include "address-book.h"
#include "address-book-ldap.h"

14
mail/balsa/files/patch-libmutt::charset.c
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- libmutt/charset.c 2001/03/06 10:39:57 1.1
+++ libmutt/charset.c 2001/03/06 10:40:07
@@ -29,7 +29,7 @@
#include <unistd.h>
#include <errno.h>
-#include <iconv.h>
+#include <giconv.h>
#include "mutt.h"
#include "charset.h"

14
mail/balsa/files/patch-libmutt::charset.h
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- libmutt/charset.h 2001/03/06 10:38:56 1.1
+++ libmutt/charset.h 2001/03/06 10:39:08
@@ -19,7 +19,7 @@
#ifndef _CHARSET_H
#define _CHARSET_H
-#include <iconv.h>
+#include <giconv.h>
int mutt_convert_string (char **, const char *, const char *);

11
mail/balsa/files/patch-libmutt::rfc2047.c
View File

@ -1,11 +0,0 @@
--- libmutt/rfc2047.c Wed Jul 18 10:47:01 2001
+++ libmutt/rfc2047.c.new Tue Sep 18 16:18:18 2001
@@ -24,7 +24,7 @@
#include <ctype.h>
#include <errno.h>
-#include <iconv.h>
+#include <giconv.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

14
mail/balsa/files/patch-src::print.c
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- src/print.c 2001/04/23 15:33:41 1.1
+++ src/print.c 2001/04/23 15:33:56
@@ -22,7 +22,7 @@
#include <gnome.h>
#include <config.h>
#include <balsa-app.h>
-#include <iconv.h>
+#include <giconv.h>
#include "print.h"

11
mail/balsa2/files/patch-libbalsa::address-book-ldap.c
View File

@ -1,11 +0,0 @@
--- libbalsa/address-book-ldap.c Mon Nov 19 03:41:21 2001
+++ libbalsa/address-book-ldap.c.new Sun Dec 16 12:59:34 2001
@@ -31,7 +31,7 @@
#include <sys/time.h>
#include <lber.h>
#include <ldap.h>
-#include <iconv.h>
+#include <giconv.h>
#include "address-book.h"
#include "address-book-ldap.h"

14
mail/balsa2/files/patch-libmutt::charset.c
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- libmutt/charset.c 2001/03/06 10:39:57 1.1
+++ libmutt/charset.c 2001/03/06 10:40:07
@@ -29,7 +29,7 @@
#include <unistd.h>
#include <errno.h>
-#include <iconv.h>
+#include <giconv.h>
#include "mutt.h"
#include "charset.h"

14
mail/balsa2/files/patch-libmutt::charset.h
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- libmutt/charset.h 2001/03/06 10:38:56 1.1
+++ libmutt/charset.h 2001/03/06 10:39:08
@@ -19,7 +19,7 @@
#ifndef _CHARSET_H
#define _CHARSET_H
-#include <iconv.h>
+#include <giconv.h>
int mutt_convert_string (char **, const char *, const char *);

11
mail/balsa2/files/patch-libmutt::rfc2047.c
View File

@ -1,11 +0,0 @@
--- libmutt/rfc2047.c Wed Jul 18 10:47:01 2001
+++ libmutt/rfc2047.c.new Tue Sep 18 16:18:18 2001
@@ -24,7 +24,7 @@
#include <ctype.h>
#include <errno.h>
-#include <iconv.h>
+#include <giconv.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

14
mail/balsa2/files/patch-src::print.c
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- src/print.c 2001/04/23 15:33:41 1.1
+++ src/print.c 2001/04/23 15:33:56
@@ -22,7 +22,7 @@
#include <gnome.h>
#include <config.h>
#include <balsa-app.h>
-#include <iconv.h>
+#include <giconv.h>
#include "print.h"

11
mail/elm+ME/files/patch-shared_libs-iconv-elmiconv.h
View File

@ -1,11 +0,0 @@
--- shared_libs/iconv/elmiconv.h.orig Wed Oct 31 09:23:34 2001
+++ shared_libs/iconv/elmiconv.h Thu Nov 1 00:24:13 2001
@@ -8,7 +8,7 @@
#include "elmshared.h"
-#include <iconv.h>
+#include <giconv.h>
#include "../../hdrs/cs_imp.h"

11
mail/mutt-devel/files/patch-06
View File

@ -1,11 +0,0 @@
--- charset.c.orig Thu Feb 15 17:09:02 2001
+++ charset.c Thu Mar 1 02:27:30 2001
@@ -31,7 +31,7 @@
#include <unistd.h>
#include <errno.h>
-#include <iconv.h>
+#include <giconv.h>
#include "mutt.h"
#include "charset.h"

29
mail/mutt-devel/files/patch-07
View File

@ -1,29 +0,0 @@
--- aclocal.m4.orig Thu Jun 7 22:10:27 2001
+++ aclocal.m4 Fri Jun 8 12:38:06 2001
@@ -1302,7 +1302,7 @@
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
+#include <giconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
@@ -1311,7 +1311,7 @@
am_save_LIBS="$LIBS"
LIBS="$LIBS -liconv"
AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
+#include <giconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
@@ -1326,7 +1326,7 @@
AC_CACHE_VAL(am_cv_proto_iconv, [
AC_TRY_COMPILE([
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
extern
#ifdef __cplusplus
"C"

11
mail/mutt-devel/files/patch-09
View File

@ -1,11 +0,0 @@
--- gnupgparse.c.orig Tue Jan 9 07:21:51 2001
+++ gnupgparse.c Sun Feb 4 21:07:30 2001
@@ -44,7 +44,7 @@
#include "mutt.h"
#include "pgp.h"
#include "charset.h"
-#include "iconv.h"
+#include <giconv.h>
/* for hexval */
#include "mime.h"

11
mail/mutt-devel/files/patch-10
View File

@ -1,11 +0,0 @@
--- rfc2047.c.orig Sun Feb 4 21:04:05 2001
+++ rfc2047.c Sun Feb 4 21:08:22 2001
@@ -24,7 +24,7 @@
#include <ctype.h>
#include <errno.h>
-#include <iconv.h>
+#include <giconv.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

11
mail/mutt-devel/files/patch-11
View File

@ -1,11 +0,0 @@
--- charset.h.orig Tue Mar 6 00:03:04 2001
+++ charset.h Tue Mar 6 00:04:22 2001
@@ -19,7 +19,7 @@
#ifndef _CHARSET_H
#define _CHARSET_H
-#include <iconv.h>
+#include <giconv.h>
int mutt_convert_string (char **, const char *, const char *, int);
void mutt_sanitize_ja_chars (char *, size_t, int);

40
mail/mutt-devel/files/patch-12
View File

@ -1,40 +0,0 @@
--- m4/iconv.m4.orig Thu Jun 7 22:00:05 2001
+++ m4/iconv.m4 Fri Jun 8 12:45:23 2001
@@ -19,16 +19,16 @@
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
+#include <giconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
am_cv_func_iconv=yes)
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
- LIBS="$LIBS -liconv"
+ LIBS="$LIBS -lgiconv"
AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
+#include <giconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
@@ -43,7 +43,7 @@
AC_CACHE_VAL(am_cv_proto_iconv, [
AC_TRY_COMPILE([
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
extern
#ifdef __cplusplus
"C"
@@ -63,7 +63,7 @@
fi
LIBICONV=
if test "$am_cv_lib_iconv" = yes; then
- LIBICONV="-liconv"
+ LIBICONV="-lgiconv"
fi
AC_SUBST(LIBICONV)
])

11
mail/mutt-devel/files/patch-13
View File

@ -1,11 +0,0 @@
--- intl/gettextP.h.orig Thu Jun 7 22:00:05 2001
+++ intl/gettextP.h Wed Jul 25 08:06:39 2001
@@ -25,7 +25,7 @@
# include "../iconv/gconv_int.h"
#else
# if HAVE_ICONV
-# include <iconv.h>
+# include <giconv.h>
# endif
#endif

29
net-im/gnomeicu/files/patch-configure
View File

@ -1,29 +0,0 @@
--- configure.orig Mon Dec 24 17:17:59 2001
+++ configure Mon Dec 24 17:18:21 2001
@@ -3017,7 +3017,7 @@
#line 3018 "configure"
#include "confdefs.h"
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
int main() {
iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
@@ -3039,7 +3039,7 @@
#line 3040 "configure"
#include "confdefs.h"
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
int main() {
iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
@@ -3077,7 +3077,7 @@
#include "confdefs.h"
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
extern
#ifdef __cplusplus
"C"

11
net-im/gnomeicu/files/patch-src::kanji_conv.c
View File

@ -1,11 +0,0 @@
--- src/kanji_conv.c.orig Mon Dec 24 12:51:08 2001
+++ src/kanji_conv.c Mon Dec 24 12:51:21 2001
@@ -30,7 +30,7 @@
#include <locale.h>
#ifdef HAVE_ICONV
-#include <iconv.h>
+#include <giconv.h>
#endif
#include "kanji_conv.h"

29
net-im/gnomeicu2/files/patch-configure
View File

@ -1,29 +0,0 @@
--- configure.orig Mon Dec 24 17:17:59 2001
+++ configure Mon Dec 24 17:18:21 2001
@@ -3017,7 +3017,7 @@
#line 3018 "configure"
#include "confdefs.h"
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
int main() {
iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
@@ -3039,7 +3039,7 @@
#line 3040 "configure"
#include "confdefs.h"
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
int main() {
iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
@@ -3077,7 +3077,7 @@
#include "confdefs.h"
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
extern
#ifdef __cplusplus
"C"

11
net-im/gnomeicu2/files/patch-src::kanji_conv.c
View File

@ -1,11 +0,0 @@
--- src/kanji_conv.c.orig Mon Dec 24 12:51:08 2001
+++ src/kanji_conv.c Mon Dec 24 12:51:21 2001
@@ -30,7 +30,7 @@
#include <locale.h>
#ifdef HAVE_ICONV
-#include <iconv.h>
+#include <giconv.h>
#endif
#include "kanji_conv.h"

29
net/gnomeicu/files/patch-configure
View File

@ -1,29 +0,0 @@
--- configure.orig Mon Dec 24 17:17:59 2001
+++ configure Mon Dec 24 17:18:21 2001
@@ -3017,7 +3017,7 @@
#line 3018 "configure"
#include "confdefs.h"
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
int main() {
iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
@@ -3039,7 +3039,7 @@
#line 3040 "configure"
#include "confdefs.h"
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
int main() {
iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
@@ -3077,7 +3077,7 @@
#include "confdefs.h"
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
extern
#ifdef __cplusplus
"C"

11
net/gnomeicu/files/patch-src::kanji_conv.c
View File

@ -1,11 +0,0 @@
--- src/kanji_conv.c.orig Mon Dec 24 12:51:08 2001
+++ src/kanji_conv.c Mon Dec 24 12:51:21 2001
@@ -30,7 +30,7 @@
#include <locale.h>
#ifdef HAVE_ICONV
-#include <iconv.h>
+#include <giconv.h>
#endif
#include "kanji_conv.h"

29
net/gnomeicu/gnomeicu/files/patch-configure
View File

@ -1,29 +0,0 @@
--- configure.orig Mon Dec 24 17:17:59 2001
+++ configure Mon Dec 24 17:18:21 2001
@@ -3017,7 +3017,7 @@
#line 3018 "configure"
#include "confdefs.h"
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
int main() {
iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
@@ -3039,7 +3039,7 @@
#line 3040 "configure"
#include "confdefs.h"
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
int main() {
iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
@@ -3077,7 +3077,7 @@
#include "confdefs.h"
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
extern
#ifdef __cplusplus
"C"

11
net/gnomeicu/gnomeicu/files/patch-src::kanji_conv.c
View File

@ -1,11 +0,0 @@
--- src/kanji_conv.c.orig Mon Dec 24 12:51:08 2001
+++ src/kanji_conv.c Mon Dec 24 12:51:21 2001
@@ -30,7 +30,7 @@
#include <locale.h>
#ifdef HAVE_ICONV
-#include <iconv.h>
+#include <giconv.h>
#endif
#include "kanji_conv.h"

29
net/gnomeicu2/files/patch-configure
View File

@ -1,29 +0,0 @@
--- configure.orig Mon Dec 24 17:17:59 2001
+++ configure Mon Dec 24 17:18:21 2001
@@ -3017,7 +3017,7 @@
#line 3018 "configure"
#include "confdefs.h"
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
int main() {
iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
@@ -3039,7 +3039,7 @@
#line 3040 "configure"
#include "confdefs.h"
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
int main() {
iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
@@ -3077,7 +3077,7 @@
#include "confdefs.h"
#include <stdlib.h>
-#include <iconv.h>
+#include <giconv.h>
extern
#ifdef __cplusplus
"C"

11
net/gnomeicu2/files/patch-src::kanji_conv.c
View File

@ -1,11 +0,0 @@
--- src/kanji_conv.c.orig Mon Dec 24 12:51:08 2001
+++ src/kanji_conv.c Mon Dec 24 12:51:21 2001
@@ -30,7 +30,7 @@
#include <locale.h>
#ifdef HAVE_ICONV
-#include <iconv.h>
+#include <giconv.h>
#endif
#include "kanji_conv.h"

11
news/tin/files/patch-ad
View File

@ -1,11 +0,0 @@
--- include/tin.h.bak Sat Nov 17 07:00:13 2001
+++ include/tin.h Tue Dec 25 01:37:32 2001
@@ -747,7 +747,7 @@
#if defined(HAVE_ICONV) && !defined(LOCAL_CHARSET)
# define CHARSET_CONVERSION 1
# ifdef HAVE_ICONV_H
-# include <iconv.h>
+# include <giconv.h>
# endif /* HAVE_ICONV_H */
#endif /* HAVE_ICONV && !LOCAL_CHARSET */

45
x11-toolkits/gal/files/patch-aa
View File

@ -1,45 +0,0 @@
$FreeBSD$
--- configure.orig Sun Jan 13 17:23:41 2002
+++ configure Sun Jan 13 17:24:34 2002
@@ -4890,9 +4890,9 @@
save_CFLAGS="$CFLAGS"
save_LDFLAGS="$LDFLAGS"
CFLAGS="$CFLAGS $ICONV_CFLAGS"
-LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv"
-echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
-echo "configure:4896: checking for iconv in -liconv" >&5
+LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv"
+echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
+echo "configure:4896: checking for iconv in -lgiconv" >&5
if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4900,7 +4900,7 @@
#line 4901 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
int main() {
@@ -4923,7 +4923,7 @@
echo "$ac_t""$ac_cv_libiconv" 1>&6
if test $ac_cv_libiconv = yes; then
- ICONV_LIBS="$ICONV_LIBS -liconv"
+ ICONV_LIBS="$ICONV_LIBS -lgiconv"
have_iconv=yes
else
CFLAGS="$save_CFLAGS"
@@ -5049,7 +5049,7 @@
#line 5050 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_GNU_GET_LIBC_VERSION

14
x11-toolkits/gal/files/patch-gal::util::e-iconv.h
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- gal/util/e-iconv.h 2001/11/07 14:06:41 1.1
+++ gal/util/e-iconv.h 2001/11/07 14:06:52
@@ -24,7 +24,7 @@
#ifndef _E_ICONV_H_
#define _E_ICONV_H_
-#include <iconv.h>
+#include <giconv.h>
#ifdef __cplusplus
extern "C" {

45
x11-toolkits/gal2/files/patch-aa
View File

@ -1,45 +0,0 @@
$FreeBSD$
--- configure.orig Sun Jan 13 17:23:41 2002
+++ configure Sun Jan 13 17:24:34 2002
@@ -4890,9 +4890,9 @@
save_CFLAGS="$CFLAGS"
save_LDFLAGS="$LDFLAGS"
CFLAGS="$CFLAGS $ICONV_CFLAGS"
-LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv"
-echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
-echo "configure:4896: checking for iconv in -liconv" >&5
+LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv"
+echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
+echo "configure:4896: checking for iconv in -lgiconv" >&5
if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4900,7 +4900,7 @@
#line 4901 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
int main() {
@@ -4923,7 +4923,7 @@
echo "$ac_t""$ac_cv_libiconv" 1>&6
if test $ac_cv_libiconv = yes; then
- ICONV_LIBS="$ICONV_LIBS -liconv"
+ ICONV_LIBS="$ICONV_LIBS -lgiconv"
have_iconv=yes
else
CFLAGS="$save_CFLAGS"
@@ -5049,7 +5049,7 @@
#line 5050 "configure"
#include "confdefs.h"
-#include <iconv.h>
+#include <giconv.h>
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_GNU_GET_LIBC_VERSION

14
x11-toolkits/gal2/files/patch-gal::util::e-iconv.h
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- gal/util/e-iconv.h 2001/11/07 14:06:41 1.1
+++ gal/util/e-iconv.h 2001/11/07 14:06:52
@@ -24,7 +24,7 @@
#ifndef _E_ICONV_H_
#define _E_ICONV_H_
-#include <iconv.h>
+#include <giconv.h>
#ifdef __cplusplus
extern "C" {

14
x11-toolkits/wxgtk-devel/files/patch-src::common::strconv.cpp
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- src/common/strconv.cpp 2002/01/31 11:51:35 1.1
+++ src/common/strconv.cpp 2002/01/31 11:51:48
@@ -61,7 +61,7 @@
#endif
#ifdef HAVE_ICONV_H
- #include <iconv.h>
+ #include <giconv.h>
#endif
#ifdef __WXMSW__

20
x11-wm/icewm/files/patch-aq
View File

@ -1,20 +0,0 @@
--- src/ylocale.h.orig Tue Oct 9 23:54:04 2001
+++ src/ylocale.h Wed Feb 20 15:08:20 2002
@@ -9,14 +9,16 @@
#define __YLOCALE_H
#ifdef CONFIG_I18N
-#include <iconv.h>
+#include <giconv.h>
+/*
#if defined(CONFIG_LIBICONV) && !defined (_LIBICONV_VERSION)
#error libiconv in use but included iconv.h not from libiconv
#endif
#if !defined(CONFIG_LIBICONV) && defined (_LIBICONV_VERSION)
#error libiconv not in use but included iconv.h is from libiconv
#endif
+*/
#endif

11
x11/gdkxft/files/patch-src::gdkxft.c
View File

@ -1,11 +0,0 @@
--- src/gdkxft.c.orig Fri Feb 1 13:20:17 2002
+++ src/gdkxft.c Fri Feb 1 13:20:39 2002
@@ -32,7 +32,7 @@
#include <gdk/gdk.h>
#include <gdk/gdkprivate.h>
-#include <iconv.h>
+#include <giconv.h>
#include "realfuncs.h"