Remove iconv->giconv hack.

2 files changed, 0 insertions, 38 deletions

diff --git a/x11-toolkits/wxgtk-devel/files/patch-configure b/x11-toolkits/wxgtk-devel/files/patch-configure
index 6c8ac364caa6..4d42ccaba3ea 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-configure
+++ b/x11-toolkits/wxgtk-devel/files/patch-configure
@@ -68,24 +68,6 @@ $FreeBSD$
  
  WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc"
  WX_RESOURCES_MACOSX_COMPILED="lib${WX_LIBRARY}.r"
-@@ -12478,7 +12476,7 @@
- fi
- done
- 
--for ac_hdr in iconv.h
-+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
-@@ -14244,7 +14242,7 @@
-     cat > conftest.$ac_ext <<EOF
- #line 14246 "configure"
- #include "confdefs.h"
--#include <iconv.h>
-+#include <giconv.h>
- int main() {
- 
-         char **inbuf, **outbuf;
 @@ -16167,6 +16165,7 @@
    fi
  fi
diff --git a/x11-toolkits/wxgtk-devel/files/patch-setup.h.in b/x11-toolkits/wxgtk-devel/files/patch-setup.h.in
deleted file mode 100644
index c1d1ae20362d..000000000000
--- a/x11-toolkits/wxgtk-devel/files/patch-setup.h.in
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD$
-
---- setup.h.in	2002/01/31 11:53:03	1.1
-+++ setup.h.in	2002/01/31 11:55:49
-@@ -1030,8 +1030,12 @@
- /* Define if you have the <wctype.h> header file.  */
- #undef HAVE_WCTYPE_H
- 
--/* Define if you have the <iconv.h> header file.  */
--#undef HAVE_ICONV_H
-+/* Define if you have the <giconv.h> header file.  */
-+#undef HAVE_GICONV_H
-+
-+#ifdef HAVE_GICONV_H
-+  #define HAVE_ICONV_H
-+#endif
- 
- /* Test for GLIBC 2.2 iconv() */
- #undef WX_ICONV_TAKES_CHAR