Remove iconv->giconv hack.

6 files changed, 0 insertions, 252 deletions

diff --git a/deskutils/gnucash/files/patch-configure b/deskutils/gnucash/files/patch-configure
index 90a3d3088429..cb1f57af28a6 100644
--- a/deskutils/gnucash/files/patch-configure
+++ b/deskutils/gnucash/files/patch-configure
@@ -3,48 +3,6 @@ $FreeBSD$
 
 --- configure.orig	Thu Jan 10 12:57:53 2002
 +++ configure	Thu Jan 10 12:59:14 2002
-@@ -8560,7 +8560,7 @@
- #line 8561 "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);
-@@ -8577,12 +8577,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 8583 "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);
-@@ -8620,7 +8620,7 @@
- #include "confdefs.h"
- 
- #include <stdlib.h>
--#include <iconv.h>
-+#include <giconv.h>
- extern
- #ifdef __cplusplus
- "C"
-@@ -8658,7 +8658,7 @@
-   fi
-   LIBICONV=
-   if test "$am_cv_lib_iconv" = yes; then
--    LIBICONV="-liconv"
-+    LIBICONV="-lgiconv"
-   fi
-   
- 
 @@ -9608,7 +9608,7 @@
    withval="$with_help_prefix"
    GNC_HELPDIR="$with_help_prefix/gnome/help/gnucash"
diff --git a/editors/glimmer/files/patch-configure b/editors/glimmer/files/patch-configure
index 1b83b07a79ac..e465f0cec6c0 100644
--- a/editors/glimmer/files/patch-configure
+++ b/editors/glimmer/files/patch-configure
@@ -3,48 +3,6 @@ $FreeBSD$
 
 --- configure.orig	Thu Feb  7 15:54:38 2002
 +++ configure	Thu Feb  7 16:09:08 2002
-@@ -8001,7 +8001,7 @@
- #line 8001 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
--#include <iconv.h>
-+#include <giconv.h>
- int
- main ()
- {
-@@ -8032,12 +8032,12 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-     if test "$am_cv_func_iconv" != yes; then
-       am_save_LIBS="$LIBS"
--      LIBS="$LIBS -liconv"
-+      LIBS="$LIBS -lgiconv"
-       cat >conftest.$ac_ext <<_ACEOF
- #line 8037 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
--#include <iconv.h>
-+#include <giconv.h>
- int
- main ()
- {
-@@ -8090,7 +8090,7 @@
- #include "confdefs.h"
- 
- #include <stdlib.h>
--#include <iconv.h>
-+#include <giconv.h>
- extern
- #ifdef __cplusplus
- "C"
-@@ -8144,7 +8144,7 @@
-   fi
-   LIBICONV=
-   if test "$am_cv_lib_iconv" = yes; then
--    LIBICONV="-liconv"
-+    LIBICONV="-lgiconv"
-   fi
- 
-   echo "$as_me:8150: checking for nl_langinfo and CODESET" >&5
 @@ -8605,7 +8605,7 @@
  echo "${ECHO_T}no" >&6
  fi
diff --git a/finance/gnucash-devel/files/patch-configure b/finance/gnucash-devel/files/patch-configure
index 90a3d3088429..cb1f57af28a6 100644
--- a/finance/gnucash-devel/files/patch-configure
+++ b/finance/gnucash-devel/files/patch-configure
@@ -3,48 +3,6 @@ $FreeBSD$
 
 --- configure.orig	Thu Jan 10 12:57:53 2002
 +++ configure	Thu Jan 10 12:59:14 2002
-@@ -8560,7 +8560,7 @@
- #line 8561 "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);
-@@ -8577,12 +8577,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 8583 "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);
-@@ -8620,7 +8620,7 @@
- #include "confdefs.h"
- 
- #include <stdlib.h>
--#include <iconv.h>
-+#include <giconv.h>
- extern
- #ifdef __cplusplus
- "C"
-@@ -8658,7 +8658,7 @@
-   fi
-   LIBICONV=
-   if test "$am_cv_lib_iconv" = yes; then
--    LIBICONV="-liconv"
-+    LIBICONV="-lgiconv"
-   fi
-   
- 
 @@ -9608,7 +9608,7 @@
    withval="$with_help_prefix"
    GNC_HELPDIR="$with_help_prefix/gnome/help/gnucash"
diff --git a/finance/gnucash/files/patch-configure b/finance/gnucash/files/patch-configure
index 90a3d3088429..cb1f57af28a6 100644
--- a/finance/gnucash/files/patch-configure
+++ b/finance/gnucash/files/patch-configure
@@ -3,48 +3,6 @@ $FreeBSD$
 
 --- configure.orig	Thu Jan 10 12:57:53 2002
 +++ configure	Thu Jan 10 12:59:14 2002
-@@ -8560,7 +8560,7 @@
- #line 8561 "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);
-@@ -8577,12 +8577,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 8583 "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);
-@@ -8620,7 +8620,7 @@
- #include "confdefs.h"
- 
- #include <stdlib.h>
--#include <iconv.h>
-+#include <giconv.h>
- extern
- #ifdef __cplusplus
- "C"
-@@ -8658,7 +8658,7 @@
-   fi
-   LIBICONV=
-   if test "$am_cv_lib_iconv" = yes; then
--    LIBICONV="-liconv"
-+    LIBICONV="-lgiconv"
-   fi
-   
- 
 @@ -9608,7 +9608,7 @@
    withval="$with_help_prefix"
    GNC_HELPDIR="$with_help_prefix/gnome/help/gnucash"
diff --git a/x11/gswitchit/files/patch-configure b/x11/gswitchit/files/patch-configure
index bb193a809cdd..b44fb41d422f 100644
--- a/x11/gswitchit/files/patch-configure
+++ b/x11/gswitchit/files/patch-configure
@@ -3,48 +3,6 @@ $FreeBSD$
 
 --- configure.orig	Thu Feb  7 11:22:34 2002
 +++ configure	Thu Feb  7 11:25:18 2002
-@@ -6997,7 +6997,7 @@
- #line 6998 "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);
-@@ -7014,12 +7014,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 7020 "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);
-@@ -7057,7 +7057,7 @@
- #include "confdefs.h"
- 
- #include <stdlib.h>
--#include <iconv.h>
-+#include <giconv.h>
- extern
- #ifdef __cplusplus
- "C"
-@@ -7095,7 +7095,7 @@
-   fi
-   LIBICONV=
-   if test "$am_cv_lib_iconv" = yes; then
--    LIBICONV="-liconv"
-+    LIBICONV="-lgiconv"
-   fi
-   
- 
 @@ -7478,7 +7478,7 @@
  fi
  
diff --git a/x11/gswitchit_applet/files/patch-configure b/x11/gswitchit_applet/files/patch-configure
index bb193a809cdd..b44fb41d422f 100644
--- a/x11/gswitchit_applet/files/patch-configure
+++ b/x11/gswitchit_applet/files/patch-configure
@@ -3,48 +3,6 @@ $FreeBSD$
 
 --- configure.orig	Thu Feb  7 11:22:34 2002
 +++ configure	Thu Feb  7 11:25:18 2002
-@@ -6997,7 +6997,7 @@
- #line 6998 "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);
-@@ -7014,12 +7014,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 7020 "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);
-@@ -7057,7 +7057,7 @@
- #include "confdefs.h"
- 
- #include <stdlib.h>
--#include <iconv.h>
-+#include <giconv.h>
- extern
- #ifdef __cplusplus
- "C"
-@@ -7095,7 +7095,7 @@
-   fi
-   LIBICONV=
-   if test "$am_cv_lib_iconv" = yes; then
--    LIBICONV="-liconv"
-+    LIBICONV="-lgiconv"
-   fi
-   
- 
 @@ -7478,7 +7478,7 @@
  fi