6 files changed, 61 insertions, 78 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index d77662ea5b62..9891fd9e64ba 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	mutt-devel
-PORTVERSION=	1.3.19
-PORTREVISION=	4
+PORTVERSION=	1.3.20
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \
 		ftp://ftp.parodius.com/pub/mutt/devel/
@@ -24,7 +23,7 @@ CONFIGURE_ARGS=	--enable-pop --enable-imap --enable-flock --disable-fcntl \
 		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${PREFIX}/share/doc/mutt \
 		--sysconfdir=${PREFIX}/etc \
-		--with-iconv=${PREFIX}
+		--with-libiconv-prefix=${PREFIX}
 
 .include <bsd.port.pre.mk>
 
@@ -250,7 +249,7 @@ PLIST_SUB+=	SUB_ADD_E="@comment "
 PLIST_SUB+=	SUB_ADD_F="@comment "
 PLIST_SUB+=	SUB_ADD_G="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
-	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
+	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
 PLIST_SUB+=	SUB_ADD_C="@comment "
@@ -258,7 +257,7 @@ PLIST_SUB+=	SUB_ADD_D="@comment "
 PLIST_SUB+=	SUB_ADD_E="@comment "
 PLIST_SUB+=	SUB_ADD_F="@comment "
 PLIST_SUB+=	SUB_ADD_G="@comment "
-.else
+.else # patches
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
 PLIST_SUB+=	SUB_ADD_C="@comment "
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index b1154e6c99f5..a9f21bf434c4 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,7 +1,6 @@
-MD5 (mutt/mutt-1.3.19i.tar.gz) = 9fbc13fbf6f8de51e1fe4c9f7ba78149
-MD5 (mutt/patch-1.3.19.rr.compressed.1.gz) = c824bb41be696325cb22710aec4af3a8
-MD5 (mutt/patch-1.3.19.rr.compressed.gz) = 3456672fbf051f94c63b9673106cfb44
-MD5 (mutt/patch-1.3.19.vvv.nntp.gz) = 52e8d42ec5abf85eaac0c2ba76c4ad24
-MD5 (mutt/patch-1.3.19.vvv.initials.gz) = 6fc2b934af0213cfaac3e64358b607df
-MD5 (mutt/patch-1.3.19.vvv.quote.gz) = 86780ab8f283a77bf74b2b35898549b0
-MD5 (mutt/patch-1.3.19.vvv.ru.gz) = bb64f1d7927d74b5d05235db22cbb7da
+MD5 (mutt/mutt-1.3.20i.tar.gz) = 802bf75acd19566848e29dff0aef9940
+MD5 (mutt/patch-1.3.20.rr.compressed.gz) = e5fcd9e272262173045f4022995cf119
+MD5 (mutt/patch-1.3.20.vvv.nntp.gz) = 52e8576f272b0d9a65ef4b3bff4916ff
+MD5 (mutt/patch-1.3.20.vvv.initials.gz) = 04553b07741c82ca024d4cd194915dd2
+MD5 (mutt/patch-1.3.20.vvv.quote.gz) = 904bd277dadc89046b05ca70d70ab0ec
+MD5 (mutt/patch-1.3.20.vvv.ru.gz) = a285aeab33093fc21f6f513e1ebeec13
diff --git a/mail/mutt-devel/files/patch-01 b/mail/mutt-devel/files/patch-01
index 55cf75c6dba3..cd957c0bcc6e 100644
--- a/mail/mutt-devel/files/patch-01
+++ b/mail/mutt-devel/files/patch-01
@@ -1,33 +1,6 @@
---- configure.in.orig	Thu May  3 10:31:09 2001
-+++ configure.in	Thu May  3 10:34:15 2001
-@@ -417,14 +417,14 @@
-     [ mutt_cv_func_iconv=no
-       mutt_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);],
-         mutt_cv_func_iconv=yes)
-       if test "$mutt_cv_func_iconv" = no; then
-         mutt_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);],
-           mutt_cv_lib_iconv=yes
-           mutt_cv_func_iconv=yes)
-@@ -435,7 +435,7 @@
-   AC_MSG_ERROR(Unable to find iconv library)
- fi
- if test "$mutt_cv_lib_iconv" = yes; then
--  LIBICONV="-liconv"
-+  LIBICONV="-lgiconv"
- fi
- AC_DEFINE(HAVE_ICONV)
- 
-@@ -448,7 +448,7 @@
+--- configure.in.orig	Tue Jul 24 23:27:40 2001
++++ configure.in	Wed Jul 25 07:51:00 2001
+@@ -674,7 +674,7 @@
          mutt_save_LIBS="$LIBS"
          LIBS="$LIBS $LIBICONV"
          AC_TRY_RUN([
@@ -36,7 +9,7 @@
  int main()
  {
    iconv_t cd;
-@@ -479,7 +479,7 @@
+@@ -705,7 +705,7 @@
          mutt_save_LIBS="$LIBS"
          LIBS="$LIBS $LIBICONV"
          AC_TRY_RUN([
diff --git a/mail/mutt-devel/files/patch-09 b/mail/mutt-devel/files/patch-09
index 2607c43b8041..2dd4ee5d003c 100644
--- a/mail/mutt-devel/files/patch-09
+++ b/mail/mutt-devel/files/patch-09
@@ -5,7 +5,7 @@
  #include "pgp.h"
  #include "charset.h"
 -#include "iconv.h"
-+#include "giconv.h"
++#include <giconv.h>
  
  /* for hexval */
  #include "mime.h"
diff --git a/mail/mutt-devel/files/patch-13 b/mail/mutt-devel/files/patch-13
new file mode 100644
index 000000000000..afdc0fce063a
--- /dev/null
+++ b/mail/mutt-devel/files/patch-13
@@ -0,0 +1,11 @@
+--- 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
+ 
diff --git a/mail/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
index cbcfec976491..d3ad99e665ee 100644
--- a/mail/mutt-devel/pkg-plist
+++ b/mail/mutt-devel/pkg-plist
@@ -30,8 +30,8 @@ share/locale/sk/LC_MESSAGES/mutt.mo
 share/locale/sv/LC_MESSAGES/mutt.mo
 share/locale/tr/LC_MESSAGES/mutt.mo
 share/locale/uk/LC_MESSAGES/mutt.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/mutt.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
+share/locale/zh_CN/LC_MESSAGES/mutt.mo
+share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_DOCS%%share/doc/mutt/PGP-Notes.txt
 %%SUB_DOCS%%share/doc/mutt/applying-patches.txt
 %%SUB_DOCS%%share/doc/mutt/devel-notes.txt
@@ -330,6 +330,11 @@ share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
 %%SUB_HTML%%share/doc/mutt/html/manual318.html
 %%SUB_HTML%%share/doc/mutt/html/manual319.html
 %%SUB_HTML%%share/doc/mutt/html/manual320.html
+%%SUB_HTML%%share/doc/mutt/html/manual321.html
+%%SUB_HTML%%share/doc/mutt/html/manual322.html
+%%SUB_HTML%%share/doc/mutt/html/manual323.html
+%%SUB_HTML%%share/doc/mutt/html/manual324.html
+%%SUB_HTML%%share/doc/mutt/html/manual325.html
 %%SUB_HTML%%share/doc/mutt/html/manual31.html
 %%SUB_HTML%%share/doc/mutt/html/manual32.html
 %%SUB_HTML%%share/doc/mutt/html/manual33.html
@@ -406,25 +411,20 @@ share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
 %%SUB_HTML%%share/doc/mutt/html/manual98.html
 %%SUB_HTML%%share/doc/mutt/html/manual99.html
 %%SUB_HTML%%share/doc/mutt/html/manual_toc.html
-%%SUB_ADD_A%%share/doc/mutt/html/manual321.html
-%%SUB_ADD_A%%share/doc/mutt/html/manual322.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual321.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual322.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual323.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual324.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual325.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual321.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual322.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual323.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual324.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual325.html
+%%SUB_ADD_A%%share/doc/mutt/html/manual326.html
+%%SUB_ADD_A%%share/doc/mutt/html/manual327.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual326.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual327.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual328.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual329.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual330.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual326.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual327.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual321.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual322.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual323.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual324.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual325.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual328.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual329.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual330.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual331.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual332.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual326.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual327.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual328.html
@@ -442,11 +442,10 @@ share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
 %%SUB_ADD_D%%share/doc/mutt/html/manual340.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual341.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual342.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual321.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual322.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual323.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual324.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual325.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual343.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual344.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual345.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual346.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual326.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual327.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual328.html
@@ -466,11 +465,10 @@ share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
 %%SUB_ADD_E%%share/doc/mutt/html/manual342.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual343.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual344.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual321.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual322.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual323.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual324.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual325.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual345.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual346.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual347.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual348.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual326.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual327.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual328.html
@@ -493,11 +491,10 @@ share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
 %%SUB_ADD_F%%share/doc/mutt/html/manual345.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual346.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual347.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual321.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual322.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual323.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual324.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual325.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual348.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual349.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual350.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual351.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual326.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual327.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual328.html
@@ -522,5 +519,9 @@ share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
 %%SUB_ADD_G%%share/doc/mutt/html/manual347.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual348.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual349.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual350.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual351.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual352.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual353.html
 %%SUB_HTML%%@dirrm share/doc/mutt/html
 %%SUB_DOCS%%@dirrm share/doc/mutt