diff options
author | David E. O'Brien <obrien@FreeBSD.org> | 2002-06-22 00:15:41 +0000 |
---|---|---|
committer | David E. O'Brien <obrien@FreeBSD.org> | 2002-06-22 00:15:41 +0000 |
commit | 2abd9587b47f56bfaf49743b4aa420dc2071211b (patch) | |
tree | cf28a083e746acc7f6b31772947cb72b6ed06c10 /mail | |
parent | - Sync www/apache13's change (.default -> -dist) (diff) |
Upgrade to version 1.4[.0].
Notes
Notes:
svn path=/head/; revision=61714
Diffstat (limited to 'mail')
-rw-r--r-- | mail/mutt/Makefile | 36 | ||||
-rw-r--r-- | mail/mutt/distinfo | 6 | ||||
-rw-r--r-- | mail/mutt/files/patch-02 | 31 | ||||
-rw-r--r-- | mail/mutt/files/patch-05 | 12 | ||||
-rw-r--r-- | mail/mutt/files/patch-charmaps.Makefile.am | 14 | ||||
-rw-r--r-- | mail/mutt/files/patch-configure.in | 32 | ||||
-rw-r--r-- | mail/mutt/pkg-plist | 185 | ||||
-rw-r--r-- | mail/mutt14/Makefile | 36 | ||||
-rw-r--r-- | mail/mutt14/distinfo | 6 | ||||
-rw-r--r-- | mail/mutt14/files/patch-02 | 31 | ||||
-rw-r--r-- | mail/mutt14/files/patch-05 | 12 | ||||
-rw-r--r-- | mail/mutt14/files/patch-charmaps.Makefile.am | 14 | ||||
-rw-r--r-- | mail/mutt14/files/patch-configure.in | 32 | ||||
-rw-r--r-- | mail/mutt14/pkg-plist | 185 |
14 files changed, 184 insertions, 448 deletions
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 918d3bad9087..bd652cce45e1 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -7,8 +7,8 @@ # PORTNAME= mutt -PORTVERSION= 1.2.5.1 -PORTREVISION= 1 +PORTVERSION= 1.4 +PORTREVISION= 0 CATEGORIES+= mail MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ ftp://ftp.uib.no/pub/mutt/ \ @@ -18,16 +18,17 @@ MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/mutt-international/ \ ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/ \ ftp://ftp.iks-jena.de/pub/mitarb/lutz/crypt/software/pgp/mutt/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} charmaps-0.0.tar.gz -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +DISTFILES= ${DISTNAME}i${EXTRACT_SUFX} -PATCH_SITES= http://www.spinnaker.de/mutt/compressed/ \ +PATCH_SITES= http://www.mutt.org.ua/download/${PKGNAME}/ \ + http://www.spinnaker.de/mutt/compressed/ \ http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/ \ http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/ \ http://www.efrei.fr/~parmelan/mutt/${PKGNAME:S/^mutt-//}/ \ ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/ \ ftp://riemann.iam.uni-bonn.de/pub/mutt/ -PATCHFILES= patch-${PORTVERSION}.rr.compressed.1.gz +PATCHFILES= patch-${PORTVERSION}.rr.compressed.1.gz \ + patch-${PORTVERSION}.vvv.initials.gz PATCH_DIST_STRIP= -p1 MAINTAINER?= obrien@FreeBSD.org @@ -48,24 +49,27 @@ LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang .elif defined(WITH_NCURSES_PORT) LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses -CFLAGS+= -I${PREFIX}/include/ncurses -I${PREFIX}/include .endif -.if defined(WITH_SSL) -USE_OPENSSL= yes +.if defined(WITH_MUTT_CYRUS_SASL) +LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl .endif .if defined(WITH_DOCS) BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat .endif DIST_SUBDIR= mutt +WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} +USE_OPENSSL= yes GNU_CONFIGURE= yes USE_AUTOMAKE= yes # configure.in is patched by <PATCHFILES> AUTOMAKE_ARGS= --include-deps CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS=-L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \ + --with-ssl=${OPENSSLBASE} --sysconfdir=${PREFIX}/etc \ --with-sharedir=${PREFIX}/share/mutt \ --with-docdir=${PREFIX}/share/doc/mutt --with-charmaps \ + --with-libiconv-prefix=${PREFIX} \ --enable-compressed .if defined(WITH_LOCALES_FIX) CONFIGURE_ARGS+= --enable-locales-fix @@ -74,11 +78,11 @@ CONFIGURE_ARGS+= --enable-locales-fix CONFIGURE_ARGS+= --with-slang=${PREFIX} .elif defined(WITH_NCURSES_PORT) CONFIGURE_ARGS+= --with-curses=${PREFIX} +CFLAGS+= -I${PREFIX}/include/ncurses -I${PREFIX}/include .endif -.if defined(WITH_SSL) -CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} +.if defined(WITH_MUTT_CYRUS_SASL) +CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} .endif -WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} MAN1= mutt.1 mutt_dotlock.1 MAN5= muttrc.5 @@ -89,6 +93,14 @@ pre-configure: cd ${WRKSRC}/charmaps/maps; ${LN} CP1251 WINDOWS-1251 cd ${WRKSRC}/charmaps/maps; ${RM} -f *.orig +# XXX +# this should be done automagically by aclocal but .... +# for now, this will have to do +pre-build: + @${PERL} -pi -e "s/^(ACLOCAL = ).+/\1${ACLOCAL}/; s/^(AUTOCONF = ).+/\1${AUTOCONF}/; \ + s/^(AUTOMAKE = ).+/\1${AUTOMAKE}/; s/^(AUTOHEADER = ).+/\1${AUTOHEADER}/" \ + ${BUILD_WRKSRC}/Makefile + pre-build: cd ${WRKSRC} && ${MAKE} keymap_defs.h diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo index 2afb49985588..5eaf67da7067 100644 --- a/mail/mutt/distinfo +++ b/mail/mutt/distinfo @@ -1,3 +1,3 @@ -MD5 (mutt/mutt-1.2.5.1.tar.gz) = 2ede4b04ad0a4c8ecdbaa322f416a8c6 -MD5 (mutt/charmaps-0.0.tar.gz) = e79b9f57da1f6a4d0a63ff60a4ef7da8 -MD5 (mutt/patch-1.2.5.1.rr.compressed.1.gz) = 2bb00d62cc7740624c45b01878d24bc7 +MD5 (mutt/mutt-1.4i.tar.gz) = a67bcdf1a1cd53d61ccd3ebf3993ba59 +MD5 (mutt/patch-1.4.rr.compressed.1.gz) = 57b241046d0c0bbfe6a4fe7e3ba5f0ec +MD5 (mutt/patch-1.4.vvv.initials.gz) = 43b4c482d9f8164a016d6d869328ad66 diff --git a/mail/mutt/files/patch-02 b/mail/mutt/files/patch-02 index 84fd2e11b1da..3717189e334f 100644 --- a/mail/mutt/files/patch-02 +++ b/mail/mutt/files/patch-02 @@ -1,35 +1,30 @@ ---- doc/Makefile.in.orig Wed Mar 29 11:42:49 2000 -+++ doc/Makefile.in Mon Jun 12 16:50:51 2000 -@@ -58,13 +58,16 @@ +--- doc/Makefile.in.orig Tue Nov 6 11:12:31 2001 ++++ doc/Makefile.in Fri Jun 21 12:00:28 2002 +@@ -60,13 +60,19 @@ topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \ - README NEWS TODO README.SECURITY README.SSL README.UPGRADE + README NEWS TODO README.SECURITY README.SSL -all: muttrc.man try-html try-txt +all: muttrc.man try-html try-txt try-latin1 try-html: ../makedoc - test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./ -+ $(MAKE) manual.html || cp $(srcdir)/manual*.html ./ ++ rm -f *.html && $(MAKE) manual.html || cp $(srcdir)/manual*.html ./ ++ touch $@ try-txt: ../makedoc - test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./ + $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./ ++ touch $@ + +try-latin1: + $(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./ ++ touch $@ - install: all + install: all instdoc $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 -@@ -75,16 +78,16 @@ - $(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5 - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir) - for f in $(srcdir_DOCFILES) ; do \ -- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \ -+ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \ - done - for f in $(topsrcdir_DOCFILES) ; do \ -- $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \ -+ $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \ +@@ -86,10 +92,10 @@ + $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \ done $(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html @@ -43,9 +38,9 @@ uninstall: -rm -f $(DESTDIR)$(mandir)/man1/mutt.1 -@@ -93,14 +96,18 @@ - -rm -rf $(DESTDIR)$(docdir) +@@ -99,14 +105,18 @@ + check: manual.txt: manual.sgml - if sgml2txt -c latin manual ; then \ - uniq < manual.txt | expand > _manual.txt ; \ diff --git a/mail/mutt/files/patch-05 b/mail/mutt/files/patch-05 index 364bc49a259d..13a52d9daa40 100644 --- a/mail/mutt/files/patch-05 +++ b/mail/mutt/files/patch-05 @@ -63,14 +63,14 @@ { case -1: /* abort - don't resort */ return -1; ---- compose.c.orig Wed Aug 25 10:23:12 1999 -+++ compose.c Sun Sep 26 23:46:25 1999 +--- compose.c.orig Mon Feb 12 18:02:38 2001 ++++ compose.c Fri Mar 30 17:04:09 2001 @@ -130,7 +130,7 @@ - struct pgp_vinfo *pgp = pgp_get_vinfo(PGP_SIGN); + char input_signas[SHORT_STRING]; - switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, select (m)ic algorithm, or (f)orget it? "), -- _("esabmf"))) -+ N_("esabmf"))) + switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "), +- _("esabf"))) ++ N_("esabf"))) { case 1: /* (e)ncrypt */ bits |= PGPENCRYPT; diff --git a/mail/mutt/files/patch-charmaps.Makefile.am b/mail/mutt/files/patch-charmaps.Makefile.am deleted file mode 100644 index 383b9d7039fd..000000000000 --- a/mail/mutt/files/patch-charmaps.Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ ---- charmaps/Makefile.am.orig Mon Aug 23 22:12:09 1999 -+++ charmaps/Makefile.am Fri Dec 7 15:17:33 2001 -@@ -1,6 +1,7 @@ - ## Process this file with automake to produce Makefile.in - --noinst_DATA = charmap_notice -- --charmap_notice: -- @echo ; echo "For charmap support, please read INSTALL" ; echo -+install: -+ $(top_srcdir)/mkinstalldirs $(charmaps) -+ for f in $(top_srcdir)/$(subdir)/maps/* ; do \ -+ $(INSTALL) -m 644 $$f $(charmaps)/ ; \ -+ done diff --git a/mail/mutt/files/patch-configure.in b/mail/mutt/files/patch-configure.in index c26517da78ac..88e89b063d73 100644 --- a/mail/mutt/files/patch-configure.in +++ b/mail/mutt/files/patch-configure.in @@ -1,9 +1,29 @@ ---- configure.in.orig Fri Jul 28 11:50:24 2000 -+++ configure.in Wed Dec 5 12:18:13 2001 -@@ -610,4 +615,6 @@ - AC_SUBST(MUTTLOCALEDIR) - AC_DEFINE_UNQUOTED(MUTTLOCALEDIR, "$MUTTLOCALEDIR") +--- configure.in.orig Fri Jun 21 14:52:03 2002 ++++ configure.in Fri Jun 21 14:54:07 2002 +@@ -515,7 +515,7 @@ + AC_MSG_ERROR([SSL support is only useful with POP or IMAP support]) + fi + +- if test "$with_ssl" != "yes" ++ if test "$with_ssl" != "yes" && x$withval != x/usr + then + LDFLAGS="$LDFLAGS -L$withval/lib" + CPPFLAGS="$CPPFLAGS -I$withval/include" +@@ -572,7 +572,7 @@ + then + if test "$with_sasl" != "yes" + then +- CPPFLAGS="$CPPFLAGS -I$with_sasl/include" ++ CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl" + LDFLAGS="$LDFLAGS -L$with_sasl/lib" + fi + +@@ -609,6 +609,8 @@ + [if test $enableval = yes; then + AC_DEFINE(USE_FLOCK,1, [ Define to use flock() to lock mailboxes. ]) + fi]) + +MUTTLIBS="$MUTTLIBS -lxpg4" - AC_OUTPUT(Makefile intl/Makefile m4/Makefile dnl + mutt_cv_fcntl=yes + AC_ARG_ENABLE(fcntl, [ --disable-fcntl Do NOT use fcntl() to lock files ], diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist index a05217648e99..c0b5cf03d3f7 100644 --- a/mail/mutt/pkg-plist +++ b/mail/mutt/pkg-plist @@ -6,167 +6,6 @@ bin/pgpewrap bin/pgpring etc/Muttrc etc/mime.types -share/mutt/charmaps/ANSI_X3.110-1983 -share/mutt/charmaps/ANSI_X3.4-1968 -share/mutt/charmaps/ASMO_449 -share/mutt/charmaps/BALTIC -share/mutt/charmaps/BS_4730 -share/mutt/charmaps/BS_VIEWDATA -share/mutt/charmaps/CP1250 -share/mutt/charmaps/CP1251 -share/mutt/charmaps/CP1252 -share/mutt/charmaps/CP1253 -share/mutt/charmaps/CP1254 -share/mutt/charmaps/CP1255 -share/mutt/charmaps/CP1256 -share/mutt/charmaps/CP1257 -share/mutt/charmaps/CSA_Z243.4-1985-1 -share/mutt/charmaps/CSA_Z243.4-1985-2 -share/mutt/charmaps/CSA_Z243.4-1985-GR -share/mutt/charmaps/CSN_369103 -share/mutt/charmaps/CWI -share/mutt/charmaps/DEC-MCS -share/mutt/charmaps/DIN_66003 -share/mutt/charmaps/DS_2089 -share/mutt/charmaps/EBCDIC-AT-DE -share/mutt/charmaps/EBCDIC-AT-DE-A -share/mutt/charmaps/EBCDIC-CA-FR -share/mutt/charmaps/EBCDIC-DK-NO -share/mutt/charmaps/EBCDIC-DK-NO-A -share/mutt/charmaps/EBCDIC-ES -share/mutt/charmaps/EBCDIC-ES-A -share/mutt/charmaps/EBCDIC-ES-S -share/mutt/charmaps/EBCDIC-FI-SE -share/mutt/charmaps/EBCDIC-FI-SE-A -share/mutt/charmaps/EBCDIC-FR -share/mutt/charmaps/EBCDIC-IS-FRISS -share/mutt/charmaps/EBCDIC-IT -share/mutt/charmaps/EBCDIC-PT -share/mutt/charmaps/EBCDIC-UK -share/mutt/charmaps/EBCDIC-US -share/mutt/charmaps/ECMA-CYRILLIC -share/mutt/charmaps/ES -share/mutt/charmaps/ES2 -share/mutt/charmaps/GB_1988-80 -share/mutt/charmaps/GOST_19768-74 -share/mutt/charmaps/GREEK-CCITT -share/mutt/charmaps/GREEK7 -share/mutt/charmaps/GREEK7-OLD -share/mutt/charmaps/HP-ROMAN8 -share/mutt/charmaps/IBM037 -share/mutt/charmaps/IBM038 -share/mutt/charmaps/IBM1004 -share/mutt/charmaps/IBM1026 -share/mutt/charmaps/IBM1047 -share/mutt/charmaps/IBM256 -share/mutt/charmaps/IBM273 -share/mutt/charmaps/IBM274 -share/mutt/charmaps/IBM275 -share/mutt/charmaps/IBM277 -share/mutt/charmaps/IBM278 -share/mutt/charmaps/IBM280 -share/mutt/charmaps/IBM281 -share/mutt/charmaps/IBM284 -share/mutt/charmaps/IBM285 -share/mutt/charmaps/IBM290 -share/mutt/charmaps/IBM297 -share/mutt/charmaps/IBM420 -share/mutt/charmaps/IBM423 -share/mutt/charmaps/IBM424 -share/mutt/charmaps/IBM437 -share/mutt/charmaps/IBM500 -share/mutt/charmaps/IBM850 -share/mutt/charmaps/IBM851 -share/mutt/charmaps/IBM852 -share/mutt/charmaps/IBM855 -share/mutt/charmaps/IBM857 -share/mutt/charmaps/IBM860 -share/mutt/charmaps/IBM861 -share/mutt/charmaps/IBM862 -share/mutt/charmaps/IBM863 -share/mutt/charmaps/IBM864 -share/mutt/charmaps/IBM865 -share/mutt/charmaps/IBM868 -share/mutt/charmaps/IBM869 -share/mutt/charmaps/IBM870 -share/mutt/charmaps/IBM871 -share/mutt/charmaps/IBM875 -share/mutt/charmaps/IBM880 -share/mutt/charmaps/IBM891 -share/mutt/charmaps/IBM903 -share/mutt/charmaps/IBM904 -share/mutt/charmaps/IBM905 -share/mutt/charmaps/IBM918 -share/mutt/charmaps/IEC_P27-1 -share/mutt/charmaps/INIS -share/mutt/charmaps/INIS-8 -share/mutt/charmaps/INIS-CYRILLIC -share/mutt/charmaps/INVARIANT -share/mutt/charmaps/ISO-8859-1 -share/mutt/charmaps/ISO-8859-10 -share/mutt/charmaps/ISO-8859-2 -share/mutt/charmaps/ISO-8859-3 -share/mutt/charmaps/ISO-8859-4 -share/mutt/charmaps/ISO-8859-5 -share/mutt/charmaps/ISO-8859-6 -share/mutt/charmaps/ISO-8859-7 -share/mutt/charmaps/ISO-8859-8 -share/mutt/charmaps/ISO-8859-9 -share/mutt/charmaps/ISO-IR-90 -share/mutt/charmaps/ISO_10367-BOX -share/mutt/charmaps/ISO_10646 -share/mutt/charmaps/ISO_2033-1983 -share/mutt/charmaps/ISO_5427 -share/mutt/charmaps/ISO_5427-EXT -share/mutt/charmaps/ISO_5428 -share/mutt/charmaps/ISO_646.BASIC -share/mutt/charmaps/ISO_646.IRV -share/mutt/charmaps/ISO_6937 -share/mutt/charmaps/ISO_6937-2-25 -share/mutt/charmaps/ISO_6937-2-ADD -share/mutt/charmaps/ISO_8859-1,GL -share/mutt/charmaps/ISO_8859-SUPP -share/mutt/charmaps/IT -share/mutt/charmaps/JIS_C6220-1969-JP -share/mutt/charmaps/JIS_C6220-1969-RO -share/mutt/charmaps/JIS_C6229-1984-A -share/mutt/charmaps/JIS_C6229-1984-B -share/mutt/charmaps/JIS_C6229-1984-B-ADD -share/mutt/charmaps/JIS_C6229-1984-HAND -share/mutt/charmaps/JIS_C6229-1984-HAND-ADD -share/mutt/charmaps/JIS_C6229-1984-KANA -share/mutt/charmaps/JIS_X0201 -share/mutt/charmaps/JUS_I.B1.002 -share/mutt/charmaps/JUS_I.B1.003-MAC -share/mutt/charmaps/JUS_I.B1.003-SERB -share/mutt/charmaps/KOI-8 -share/mutt/charmaps/KOI8-R -share/mutt/charmaps/KSC5636 -share/mutt/charmaps/LATIN-GREEK -share/mutt/charmaps/LATIN-GREEK-1 -share/mutt/charmaps/MAC-IS -share/mutt/charmaps/MACINTOSH -share/mutt/charmaps/MSZ_7795.3 -share/mutt/charmaps/NATS-DANO -share/mutt/charmaps/NATS-DANO-ADD -share/mutt/charmaps/NATS-SEFI -share/mutt/charmaps/NATS-SEFI-ADD -share/mutt/charmaps/NC_NC00-10 -share/mutt/charmaps/NEXTSTEP -share/mutt/charmaps/NF_Z_62-010 -share/mutt/charmaps/NF_Z_62-010-1973 -share/mutt/charmaps/NS_4551-1 -share/mutt/charmaps/NS_4551-2 -share/mutt/charmaps/PT -share/mutt/charmaps/PT2 -share/mutt/charmaps/SAMI -share/mutt/charmaps/SEN_850200_B -share/mutt/charmaps/SEN_850200_C -share/mutt/charmaps/T.101-G2 -share/mutt/charmaps/T.61-7BIT -share/mutt/charmaps/T.61-8BIT -share/mutt/charmaps/VIDEOTEX-SUPPL -share/mutt/charmaps/WINDOWS-1251 share/locale/cs/LC_MESSAGES/mutt.mo share/locale/da/LC_MESSAGES/mutt.mo share/locale/de/LC_MESSAGES/mutt.mo @@ -185,7 +24,6 @@ share/locale/ru/LC_MESSAGES/mutt.mo share/locale/sk/LC_MESSAGES/mutt.mo share/locale/sv/LC_MESSAGES/mutt.mo share/locale/uk/LC_MESSAGES/mutt.mo -share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo share/doc/mutt/manual.txt share/doc/mutt/COPYRIGHT share/doc/mutt/ChangeLog @@ -196,10 +34,10 @@ share/doc/mutt/PGP-Notes.txt share/doc/mutt/README share/doc/mutt/README.SECURITY share/doc/mutt/README.SSL -share/doc/mutt/README.UPGRADE share/doc/mutt/TODO share/doc/mutt/applying-patches.txt share/doc/mutt/devel-notes.txt +share/doc/mutt/patch-notes.txt share/doc/mutt/samples/Mush.rc share/doc/mutt/samples/Pine.rc share/doc/mutt/samples/Tin.rc @@ -210,7 +48,24 @@ share/doc/mutt/samples/pgp6.rc share/doc/mutt/samples/sample.mailcap share/doc/mutt/samples/sample.muttrc share/doc/mutt/samples/sample.muttrc-tlr -@dirrm share/mutt/charmaps -@dirrm share/mutt +share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc +share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc +share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc +share/doc/mutt/samples/iconv/iconv.aix-4.3.2.rc +share/doc/mutt/samples/iconv/iconv.freebsd-3.3.rc +share/doc/mutt/samples/iconv/iconv.glibc-2.1.3.rc +share/doc/mutt/samples/iconv/iconv.glibc-2.1.90.rc +share/doc/mutt/samples/iconv/iconv.hpux-10.01.rc +share/doc/mutt/samples/iconv/iconv.hpux-10.20.rc +share/doc/mutt/samples/iconv/iconv.hpux-11.00.rc +share/doc/mutt/samples/iconv/iconv.irix-6.5.rc +share/doc/mutt/samples/iconv/iconv.osf1-4.0a.rc +share/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc +share/doc/mutt/samples/iconv/iconv.solaris-2.4.rc +share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc +share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc +share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc +share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc +@dirrm share/doc/mutt/samples/iconv @dirrm share/doc/mutt/samples @dirrm share/doc/mutt diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile index 918d3bad9087..bd652cce45e1 100644 --- a/mail/mutt14/Makefile +++ b/mail/mutt14/Makefile @@ -7,8 +7,8 @@ # PORTNAME= mutt -PORTVERSION= 1.2.5.1 -PORTREVISION= 1 +PORTVERSION= 1.4 +PORTREVISION= 0 CATEGORIES+= mail MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ ftp://ftp.uib.no/pub/mutt/ \ @@ -18,16 +18,17 @@ MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/mutt-international/ \ ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/ \ ftp://ftp.iks-jena.de/pub/mitarb/lutz/crypt/software/pgp/mutt/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} charmaps-0.0.tar.gz -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +DISTFILES= ${DISTNAME}i${EXTRACT_SUFX} -PATCH_SITES= http://www.spinnaker.de/mutt/compressed/ \ +PATCH_SITES= http://www.mutt.org.ua/download/${PKGNAME}/ \ + http://www.spinnaker.de/mutt/compressed/ \ http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/ \ http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/ \ http://www.efrei.fr/~parmelan/mutt/${PKGNAME:S/^mutt-//}/ \ ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/ \ ftp://riemann.iam.uni-bonn.de/pub/mutt/ -PATCHFILES= patch-${PORTVERSION}.rr.compressed.1.gz +PATCHFILES= patch-${PORTVERSION}.rr.compressed.1.gz \ + patch-${PORTVERSION}.vvv.initials.gz PATCH_DIST_STRIP= -p1 MAINTAINER?= obrien@FreeBSD.org @@ -48,24 +49,27 @@ LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang .elif defined(WITH_NCURSES_PORT) LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses -CFLAGS+= -I${PREFIX}/include/ncurses -I${PREFIX}/include .endif -.if defined(WITH_SSL) -USE_OPENSSL= yes +.if defined(WITH_MUTT_CYRUS_SASL) +LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl .endif .if defined(WITH_DOCS) BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat .endif DIST_SUBDIR= mutt +WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} +USE_OPENSSL= yes GNU_CONFIGURE= yes USE_AUTOMAKE= yes # configure.in is patched by <PATCHFILES> AUTOMAKE_ARGS= --include-deps CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS=-L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \ + --with-ssl=${OPENSSLBASE} --sysconfdir=${PREFIX}/etc \ --with-sharedir=${PREFIX}/share/mutt \ --with-docdir=${PREFIX}/share/doc/mutt --with-charmaps \ + --with-libiconv-prefix=${PREFIX} \ --enable-compressed .if defined(WITH_LOCALES_FIX) CONFIGURE_ARGS+= --enable-locales-fix @@ -74,11 +78,11 @@ CONFIGURE_ARGS+= --enable-locales-fix CONFIGURE_ARGS+= --with-slang=${PREFIX} .elif defined(WITH_NCURSES_PORT) CONFIGURE_ARGS+= --with-curses=${PREFIX} +CFLAGS+= -I${PREFIX}/include/ncurses -I${PREFIX}/include .endif -.if defined(WITH_SSL) -CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} +.if defined(WITH_MUTT_CYRUS_SASL) +CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} .endif -WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} MAN1= mutt.1 mutt_dotlock.1 MAN5= muttrc.5 @@ -89,6 +93,14 @@ pre-configure: cd ${WRKSRC}/charmaps/maps; ${LN} CP1251 WINDOWS-1251 cd ${WRKSRC}/charmaps/maps; ${RM} -f *.orig +# XXX +# this should be done automagically by aclocal but .... +# for now, this will have to do +pre-build: + @${PERL} -pi -e "s/^(ACLOCAL = ).+/\1${ACLOCAL}/; s/^(AUTOCONF = ).+/\1${AUTOCONF}/; \ + s/^(AUTOMAKE = ).+/\1${AUTOMAKE}/; s/^(AUTOHEADER = ).+/\1${AUTOHEADER}/" \ + ${BUILD_WRKSRC}/Makefile + pre-build: cd ${WRKSRC} && ${MAKE} keymap_defs.h diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo index 2afb49985588..5eaf67da7067 100644 --- a/mail/mutt14/distinfo +++ b/mail/mutt14/distinfo @@ -1,3 +1,3 @@ -MD5 (mutt/mutt-1.2.5.1.tar.gz) = 2ede4b04ad0a4c8ecdbaa322f416a8c6 -MD5 (mutt/charmaps-0.0.tar.gz) = e79b9f57da1f6a4d0a63ff60a4ef7da8 -MD5 (mutt/patch-1.2.5.1.rr.compressed.1.gz) = 2bb00d62cc7740624c45b01878d24bc7 +MD5 (mutt/mutt-1.4i.tar.gz) = a67bcdf1a1cd53d61ccd3ebf3993ba59 +MD5 (mutt/patch-1.4.rr.compressed.1.gz) = 57b241046d0c0bbfe6a4fe7e3ba5f0ec +MD5 (mutt/patch-1.4.vvv.initials.gz) = 43b4c482d9f8164a016d6d869328ad66 diff --git a/mail/mutt14/files/patch-02 b/mail/mutt14/files/patch-02 index 84fd2e11b1da..3717189e334f 100644 --- a/mail/mutt14/files/patch-02 +++ b/mail/mutt14/files/patch-02 @@ -1,35 +1,30 @@ ---- doc/Makefile.in.orig Wed Mar 29 11:42:49 2000 -+++ doc/Makefile.in Mon Jun 12 16:50:51 2000 -@@ -58,13 +58,16 @@ +--- doc/Makefile.in.orig Tue Nov 6 11:12:31 2001 ++++ doc/Makefile.in Fri Jun 21 12:00:28 2002 +@@ -60,13 +60,19 @@ topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \ - README NEWS TODO README.SECURITY README.SSL README.UPGRADE + README NEWS TODO README.SECURITY README.SSL -all: muttrc.man try-html try-txt +all: muttrc.man try-html try-txt try-latin1 try-html: ../makedoc - test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./ -+ $(MAKE) manual.html || cp $(srcdir)/manual*.html ./ ++ rm -f *.html && $(MAKE) manual.html || cp $(srcdir)/manual*.html ./ ++ touch $@ try-txt: ../makedoc - test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./ + $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./ ++ touch $@ + +try-latin1: + $(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./ ++ touch $@ - install: all + install: all instdoc $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 -@@ -75,16 +78,16 @@ - $(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5 - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir) - for f in $(srcdir_DOCFILES) ; do \ -- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \ -+ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \ - done - for f in $(topsrcdir_DOCFILES) ; do \ -- $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \ -+ $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \ +@@ -86,10 +92,10 @@ + $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \ done $(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html @@ -43,9 +38,9 @@ uninstall: -rm -f $(DESTDIR)$(mandir)/man1/mutt.1 -@@ -93,14 +96,18 @@ - -rm -rf $(DESTDIR)$(docdir) +@@ -99,14 +105,18 @@ + check: manual.txt: manual.sgml - if sgml2txt -c latin manual ; then \ - uniq < manual.txt | expand > _manual.txt ; \ diff --git a/mail/mutt14/files/patch-05 b/mail/mutt14/files/patch-05 index 364bc49a259d..13a52d9daa40 100644 --- a/mail/mutt14/files/patch-05 +++ b/mail/mutt14/files/patch-05 @@ -63,14 +63,14 @@ { case -1: /* abort - don't resort */ return -1; ---- compose.c.orig Wed Aug 25 10:23:12 1999 -+++ compose.c Sun Sep 26 23:46:25 1999 +--- compose.c.orig Mon Feb 12 18:02:38 2001 ++++ compose.c Fri Mar 30 17:04:09 2001 @@ -130,7 +130,7 @@ - struct pgp_vinfo *pgp = pgp_get_vinfo(PGP_SIGN); + char input_signas[SHORT_STRING]; - switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, select (m)ic algorithm, or (f)orget it? "), -- _("esabmf"))) -+ N_("esabmf"))) + switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "), +- _("esabf"))) ++ N_("esabf"))) { case 1: /* (e)ncrypt */ bits |= PGPENCRYPT; diff --git a/mail/mutt14/files/patch-charmaps.Makefile.am b/mail/mutt14/files/patch-charmaps.Makefile.am deleted file mode 100644 index 383b9d7039fd..000000000000 --- a/mail/mutt14/files/patch-charmaps.Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ ---- charmaps/Makefile.am.orig Mon Aug 23 22:12:09 1999 -+++ charmaps/Makefile.am Fri Dec 7 15:17:33 2001 -@@ -1,6 +1,7 @@ - ## Process this file with automake to produce Makefile.in - --noinst_DATA = charmap_notice -- --charmap_notice: -- @echo ; echo "For charmap support, please read INSTALL" ; echo -+install: -+ $(top_srcdir)/mkinstalldirs $(charmaps) -+ for f in $(top_srcdir)/$(subdir)/maps/* ; do \ -+ $(INSTALL) -m 644 $$f $(charmaps)/ ; \ -+ done diff --git a/mail/mutt14/files/patch-configure.in b/mail/mutt14/files/patch-configure.in index c26517da78ac..88e89b063d73 100644 --- a/mail/mutt14/files/patch-configure.in +++ b/mail/mutt14/files/patch-configure.in @@ -1,9 +1,29 @@ ---- configure.in.orig Fri Jul 28 11:50:24 2000 -+++ configure.in Wed Dec 5 12:18:13 2001 -@@ -610,4 +615,6 @@ - AC_SUBST(MUTTLOCALEDIR) - AC_DEFINE_UNQUOTED(MUTTLOCALEDIR, "$MUTTLOCALEDIR") +--- configure.in.orig Fri Jun 21 14:52:03 2002 ++++ configure.in Fri Jun 21 14:54:07 2002 +@@ -515,7 +515,7 @@ + AC_MSG_ERROR([SSL support is only useful with POP or IMAP support]) + fi + +- if test "$with_ssl" != "yes" ++ if test "$with_ssl" != "yes" && x$withval != x/usr + then + LDFLAGS="$LDFLAGS -L$withval/lib" + CPPFLAGS="$CPPFLAGS -I$withval/include" +@@ -572,7 +572,7 @@ + then + if test "$with_sasl" != "yes" + then +- CPPFLAGS="$CPPFLAGS -I$with_sasl/include" ++ CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl" + LDFLAGS="$LDFLAGS -L$with_sasl/lib" + fi + +@@ -609,6 +609,8 @@ + [if test $enableval = yes; then + AC_DEFINE(USE_FLOCK,1, [ Define to use flock() to lock mailboxes. ]) + fi]) + +MUTTLIBS="$MUTTLIBS -lxpg4" - AC_OUTPUT(Makefile intl/Makefile m4/Makefile dnl + mutt_cv_fcntl=yes + AC_ARG_ENABLE(fcntl, [ --disable-fcntl Do NOT use fcntl() to lock files ], diff --git a/mail/mutt14/pkg-plist b/mail/mutt14/pkg-plist index a05217648e99..c0b5cf03d3f7 100644 --- a/mail/mutt14/pkg-plist +++ b/mail/mutt14/pkg-plist @@ -6,167 +6,6 @@ bin/pgpewrap bin/pgpring etc/Muttrc etc/mime.types -share/mutt/charmaps/ANSI_X3.110-1983 -share/mutt/charmaps/ANSI_X3.4-1968 -share/mutt/charmaps/ASMO_449 -share/mutt/charmaps/BALTIC -share/mutt/charmaps/BS_4730 -share/mutt/charmaps/BS_VIEWDATA -share/mutt/charmaps/CP1250 -share/mutt/charmaps/CP1251 -share/mutt/charmaps/CP1252 -share/mutt/charmaps/CP1253 -share/mutt/charmaps/CP1254 -share/mutt/charmaps/CP1255 -share/mutt/charmaps/CP1256 -share/mutt/charmaps/CP1257 -share/mutt/charmaps/CSA_Z243.4-1985-1 -share/mutt/charmaps/CSA_Z243.4-1985-2 -share/mutt/charmaps/CSA_Z243.4-1985-GR -share/mutt/charmaps/CSN_369103 -share/mutt/charmaps/CWI -share/mutt/charmaps/DEC-MCS -share/mutt/charmaps/DIN_66003 -share/mutt/charmaps/DS_2089 -share/mutt/charmaps/EBCDIC-AT-DE -share/mutt/charmaps/EBCDIC-AT-DE-A -share/mutt/charmaps/EBCDIC-CA-FR -share/mutt/charmaps/EBCDIC-DK-NO -share/mutt/charmaps/EBCDIC-DK-NO-A -share/mutt/charmaps/EBCDIC-ES -share/mutt/charmaps/EBCDIC-ES-A -share/mutt/charmaps/EBCDIC-ES-S -share/mutt/charmaps/EBCDIC-FI-SE -share/mutt/charmaps/EBCDIC-FI-SE-A -share/mutt/charmaps/EBCDIC-FR -share/mutt/charmaps/EBCDIC-IS-FRISS -share/mutt/charmaps/EBCDIC-IT -share/mutt/charmaps/EBCDIC-PT -share/mutt/charmaps/EBCDIC-UK -share/mutt/charmaps/EBCDIC-US -share/mutt/charmaps/ECMA-CYRILLIC -share/mutt/charmaps/ES -share/mutt/charmaps/ES2 -share/mutt/charmaps/GB_1988-80 -share/mutt/charmaps/GOST_19768-74 -share/mutt/charmaps/GREEK-CCITT -share/mutt/charmaps/GREEK7 -share/mutt/charmaps/GREEK7-OLD -share/mutt/charmaps/HP-ROMAN8 -share/mutt/charmaps/IBM037 -share/mutt/charmaps/IBM038 -share/mutt/charmaps/IBM1004 -share/mutt/charmaps/IBM1026 -share/mutt/charmaps/IBM1047 -share/mutt/charmaps/IBM256 -share/mutt/charmaps/IBM273 -share/mutt/charmaps/IBM274 -share/mutt/charmaps/IBM275 -share/mutt/charmaps/IBM277 -share/mutt/charmaps/IBM278 -share/mutt/charmaps/IBM280 -share/mutt/charmaps/IBM281 -share/mutt/charmaps/IBM284 -share/mutt/charmaps/IBM285 -share/mutt/charmaps/IBM290 -share/mutt/charmaps/IBM297 -share/mutt/charmaps/IBM420 -share/mutt/charmaps/IBM423 -share/mutt/charmaps/IBM424 -share/mutt/charmaps/IBM437 -share/mutt/charmaps/IBM500 -share/mutt/charmaps/IBM850 -share/mutt/charmaps/IBM851 -share/mutt/charmaps/IBM852 -share/mutt/charmaps/IBM855 -share/mutt/charmaps/IBM857 -share/mutt/charmaps/IBM860 -share/mutt/charmaps/IBM861 -share/mutt/charmaps/IBM862 -share/mutt/charmaps/IBM863 -share/mutt/charmaps/IBM864 -share/mutt/charmaps/IBM865 -share/mutt/charmaps/IBM868 -share/mutt/charmaps/IBM869 -share/mutt/charmaps/IBM870 -share/mutt/charmaps/IBM871 -share/mutt/charmaps/IBM875 -share/mutt/charmaps/IBM880 -share/mutt/charmaps/IBM891 -share/mutt/charmaps/IBM903 -share/mutt/charmaps/IBM904 -share/mutt/charmaps/IBM905 -share/mutt/charmaps/IBM918 -share/mutt/charmaps/IEC_P27-1 -share/mutt/charmaps/INIS -share/mutt/charmaps/INIS-8 -share/mutt/charmaps/INIS-CYRILLIC -share/mutt/charmaps/INVARIANT -share/mutt/charmaps/ISO-8859-1 -share/mutt/charmaps/ISO-8859-10 -share/mutt/charmaps/ISO-8859-2 -share/mutt/charmaps/ISO-8859-3 -share/mutt/charmaps/ISO-8859-4 -share/mutt/charmaps/ISO-8859-5 -share/mutt/charmaps/ISO-8859-6 -share/mutt/charmaps/ISO-8859-7 -share/mutt/charmaps/ISO-8859-8 -share/mutt/charmaps/ISO-8859-9 -share/mutt/charmaps/ISO-IR-90 -share/mutt/charmaps/ISO_10367-BOX -share/mutt/charmaps/ISO_10646 -share/mutt/charmaps/ISO_2033-1983 -share/mutt/charmaps/ISO_5427 -share/mutt/charmaps/ISO_5427-EXT -share/mutt/charmaps/ISO_5428 -share/mutt/charmaps/ISO_646.BASIC -share/mutt/charmaps/ISO_646.IRV -share/mutt/charmaps/ISO_6937 -share/mutt/charmaps/ISO_6937-2-25 -share/mutt/charmaps/ISO_6937-2-ADD -share/mutt/charmaps/ISO_8859-1,GL -share/mutt/charmaps/ISO_8859-SUPP -share/mutt/charmaps/IT -share/mutt/charmaps/JIS_C6220-1969-JP -share/mutt/charmaps/JIS_C6220-1969-RO -share/mutt/charmaps/JIS_C6229-1984-A -share/mutt/charmaps/JIS_C6229-1984-B -share/mutt/charmaps/JIS_C6229-1984-B-ADD -share/mutt/charmaps/JIS_C6229-1984-HAND -share/mutt/charmaps/JIS_C6229-1984-HAND-ADD -share/mutt/charmaps/JIS_C6229-1984-KANA -share/mutt/charmaps/JIS_X0201 -share/mutt/charmaps/JUS_I.B1.002 -share/mutt/charmaps/JUS_I.B1.003-MAC -share/mutt/charmaps/JUS_I.B1.003-SERB -share/mutt/charmaps/KOI-8 -share/mutt/charmaps/KOI8-R -share/mutt/charmaps/KSC5636 -share/mutt/charmaps/LATIN-GREEK -share/mutt/charmaps/LATIN-GREEK-1 -share/mutt/charmaps/MAC-IS -share/mutt/charmaps/MACINTOSH -share/mutt/charmaps/MSZ_7795.3 -share/mutt/charmaps/NATS-DANO -share/mutt/charmaps/NATS-DANO-ADD -share/mutt/charmaps/NATS-SEFI -share/mutt/charmaps/NATS-SEFI-ADD -share/mutt/charmaps/NC_NC00-10 -share/mutt/charmaps/NEXTSTEP -share/mutt/charmaps/NF_Z_62-010 -share/mutt/charmaps/NF_Z_62-010-1973 -share/mutt/charmaps/NS_4551-1 -share/mutt/charmaps/NS_4551-2 -share/mutt/charmaps/PT -share/mutt/charmaps/PT2 -share/mutt/charmaps/SAMI -share/mutt/charmaps/SEN_850200_B -share/mutt/charmaps/SEN_850200_C -share/mutt/charmaps/T.101-G2 -share/mutt/charmaps/T.61-7BIT -share/mutt/charmaps/T.61-8BIT -share/mutt/charmaps/VIDEOTEX-SUPPL -share/mutt/charmaps/WINDOWS-1251 share/locale/cs/LC_MESSAGES/mutt.mo share/locale/da/LC_MESSAGES/mutt.mo share/locale/de/LC_MESSAGES/mutt.mo @@ -185,7 +24,6 @@ share/locale/ru/LC_MESSAGES/mutt.mo share/locale/sk/LC_MESSAGES/mutt.mo share/locale/sv/LC_MESSAGES/mutt.mo share/locale/uk/LC_MESSAGES/mutt.mo -share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo share/doc/mutt/manual.txt share/doc/mutt/COPYRIGHT share/doc/mutt/ChangeLog @@ -196,10 +34,10 @@ share/doc/mutt/PGP-Notes.txt share/doc/mutt/README share/doc/mutt/README.SECURITY share/doc/mutt/README.SSL -share/doc/mutt/README.UPGRADE share/doc/mutt/TODO share/doc/mutt/applying-patches.txt share/doc/mutt/devel-notes.txt +share/doc/mutt/patch-notes.txt share/doc/mutt/samples/Mush.rc share/doc/mutt/samples/Pine.rc share/doc/mutt/samples/Tin.rc @@ -210,7 +48,24 @@ share/doc/mutt/samples/pgp6.rc share/doc/mutt/samples/sample.mailcap share/doc/mutt/samples/sample.muttrc share/doc/mutt/samples/sample.muttrc-tlr -@dirrm share/mutt/charmaps -@dirrm share/mutt +share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc +share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc +share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc +share/doc/mutt/samples/iconv/iconv.aix-4.3.2.rc +share/doc/mutt/samples/iconv/iconv.freebsd-3.3.rc +share/doc/mutt/samples/iconv/iconv.glibc-2.1.3.rc +share/doc/mutt/samples/iconv/iconv.glibc-2.1.90.rc +share/doc/mutt/samples/iconv/iconv.hpux-10.01.rc +share/doc/mutt/samples/iconv/iconv.hpux-10.20.rc +share/doc/mutt/samples/iconv/iconv.hpux-11.00.rc +share/doc/mutt/samples/iconv/iconv.irix-6.5.rc +share/doc/mutt/samples/iconv/iconv.osf1-4.0a.rc +share/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc +share/doc/mutt/samples/iconv/iconv.solaris-2.4.rc +share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc +share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc +share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc +share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc +@dirrm share/doc/mutt/samples/iconv @dirrm share/doc/mutt/samples @dirrm share/doc/mutt |