diff options
author | sobomax <sobomax@FreeBSD.org> | 2002-03-18 11:26:13 +0000 |
---|---|---|
committer | sobomax <sobomax@FreeBSD.org> | 2002-03-18 11:26:13 +0000 |
commit | 267c972eab297e87ce7c16314746799098e8dac4 (patch) | |
tree | 2af683a87fe7ce45af6afa790164c7aaae743d86 /mail/mutt-devel | |
parent | 7946383043a99d6c49d37abb276828dde02d26a3 (diff) | |
download | FreeBSD-ports-267c972eab297e87ce7c16314746799098e8dac4.zip FreeBSD-ports-267c972eab297e87ce7c16314746799098e8dac4.tar.gz |
Iconv cleanup, stage 2a: remove patches that only replacing <iconv.h> with
<giconv.h> or -liconv with -lgiconv.
Diffstat (limited to 'mail/mutt-devel')
-rw-r--r-- | mail/mutt-devel/files/patch-06 | 11 | ||||
-rw-r--r-- | mail/mutt-devel/files/patch-07 | 29 | ||||
-rw-r--r-- | mail/mutt-devel/files/patch-09 | 11 | ||||
-rw-r--r-- | mail/mutt-devel/files/patch-10 | 11 | ||||
-rw-r--r-- | mail/mutt-devel/files/patch-11 | 11 | ||||
-rw-r--r-- | mail/mutt-devel/files/patch-12 | 40 | ||||
-rw-r--r-- | mail/mutt-devel/files/patch-13 | 11 |
7 files changed, 0 insertions, 124 deletions
diff --git a/mail/mutt-devel/files/patch-06 b/mail/mutt-devel/files/patch-06 deleted file mode 100644 index 1c2c8aa..0000000 --- a/mail/mutt-devel/files/patch-06 +++ /dev/null @@ -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" diff --git a/mail/mutt-devel/files/patch-07 b/mail/mutt-devel/files/patch-07 deleted file mode 100644 index e6f1c79..0000000 --- a/mail/mutt-devel/files/patch-07 +++ /dev/null @@ -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" diff --git a/mail/mutt-devel/files/patch-09 b/mail/mutt-devel/files/patch-09 deleted file mode 100644 index 2dd4ee5..0000000 --- a/mail/mutt-devel/files/patch-09 +++ /dev/null @@ -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" diff --git a/mail/mutt-devel/files/patch-10 b/mail/mutt-devel/files/patch-10 deleted file mode 100644 index f373a2c..0000000 --- a/mail/mutt-devel/files/patch-10 +++ /dev/null @@ -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> diff --git a/mail/mutt-devel/files/patch-11 b/mail/mutt-devel/files/patch-11 deleted file mode 100644 index 9dc05d9..0000000 --- a/mail/mutt-devel/files/patch-11 +++ /dev/null @@ -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); diff --git a/mail/mutt-devel/files/patch-12 b/mail/mutt-devel/files/patch-12 deleted file mode 100644 index 611e7df..0000000 --- a/mail/mutt-devel/files/patch-12 +++ /dev/null @@ -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) - ]) diff --git a/mail/mutt-devel/files/patch-13 b/mail/mutt-devel/files/patch-13 deleted file mode 100644 index afdc0fc..0000000 --- a/mail/mutt-devel/files/patch-13 +++ /dev/null @@ -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 - |