1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

Update to 1.4

PR:		ports/39692
Submitted by:	maintainer
This commit is contained in:
Patrick Li 2002-06-23 22:56:15 +00:00
parent 1479907f68
commit b5e991be88
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=61845
11 changed files with 197 additions and 124 deletions

View File

@ -4,61 +4,80 @@
#
# $FreeBSD$
#
# WITH_MUTT_CYRUS_SASL: if defined, 'Cyrus sasl' support.
#
PORTNAME= mutt
PORTVERSION= ${VERSION}.j${JP_VERSION}
PORTREVISION= 1
CATEGORIES= japanese mail
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
MASTER_SITES= http://www.emaillab.org/mutt/1.4/ \
http://www5.xdsl.ne.jp/~shuna/mutt/distfiles/ \
http://ha4.seikyou.ne.jp/home/Kohtaro.Hitomi/mutt/ \
http://www5.xdsl.ne.jp/~shuna/distfiles/mutt/ \
ftp://ftp.gbnet.net/pub/mutt-international/ \
ftp://ftp.guug.de/pub/mutt/ \
ftp://ftp.guug.de/pub/mutt/historic/
DISTNAME= ${PORTNAME}-${VERSION}
ftp://ftp.mutt.org/pub/mutt/devel/
DISTNAME= ${PORTNAME}-${VERSION}i
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
manual_ja-${MANUALVERSION}i-2${EXTRACT_SUFX}
PATCH_SITES= http://www.emaillab.org/mutt/1.2/ \
http://www5.xdsl.ne.jp/~shuna/distfiles/mutt/
PATCHFILES= ${DISTNAME}i-jp${JP_VERSION}.diff.gz
PATCH_DIST_STRIP= -p1
${DISTNAME}-ja.${JP_VERSION}${EXTRACT_SUFX} \
manual_ja-${MANUALVERSION}i-0${EXTRACT_SUFX}
MAINTAINER= shuna@pop16.odn.ne.jp
LIB_DEPENDS= slang.2:${PORTSDIR}/japanese/libslang
LIB_DEPENDS= slang.2:${PORTSDIR}/japanese/libslang \
iconv.3:${PORTSDIR}/converters/libiconv
.if !defined(WITH_GETTEXT)
LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
.endif
.if defined(WITH_GETTEXT)
.else
BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
.endif
.if defined(WITH_MUTT_CYRUS_SASL)
LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl
.endif
RUN_DEPENDS= urlview:${PORTSDIR}/textproc/urlview
VERSION= 1.2.5.1
JP_VERSION= 0
MANUALVERSION= 1.2
VERSION= 1.4
JP_VERSION= 1
MANUALVERSION= 1.4
FETCH_BEFORE_ARGS= -A # ha4.seikyou.ne.jp is running broken httpd
DIST_SUBDIR= mutt
USE_GMAKE= yes
USE_AUTOMAKE= yes
USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${VERSION}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include -I${LOCALBASE}/include/slang" \
LDFLAGS=-L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-slang --enable-locales-fix \
--with-libiconv-prefix=${LOCALBASE} \
--without-wc-funcs \
--enable-flock --disable-fcntl \
--with-ssl \
--sysconfdir=${PREFIX}/etc \
--with-docdir=${DOCSDIR} \
--enable-pop --enable-imap
--enable-pop --enable-imap \
--enable-default-japanese
.if defined(WITH_GETTEXT)
CONFIGURE_ARGS+= --with-included-gettext
.endif
MAN1= mutt.1 mutt_dotlock.1
MAN5= muttrc.5
.if defined(WITH_MUTT_CYRUS_SASL)
CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
.endif
NOMANCOMPRESS= yes
MAN1= flea.1 mutt.1 muttbug.1 mutt_dotlock.1
MAN5= muttrc.5 mbox.5
DIFFDIR= ${WRKDIR}/${DISTNAME}-ja.${JP_VERSION}
DIFFNAME= patch-${VERSION}.tt.ja.${JP_VERSION}
pre-patch:
(cd ${DIFFDIR}; ${PATCH} < ${FILESDIR}/prepatch-aa)
(cd ${WRKSRC}; ${PATCH} -p1 < ${DIFFDIR}/${DIFFNAME})
pre-configure:
.if defined(NOPORTDOCS)
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extrapatch-nodoc-aa
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extrapatch-nodoc-ab
.endif
(cd ${WRKSRC}; ${ACLOCAL} -I m4)
post-configure:
@ -69,10 +88,20 @@ post-configure:
s/^(s%\@AUTOHEADER\@%).+(%g)/\1${AUTOHEADER}\2/" \
${BUILD_WRKSRC}/config.status
.if !defined(NOPORTDOCS)
post-install:
${INSTALL_DATA} ${DIFFDIR}/INSTALL.JA-PATCH.ja ${DOCSDIR}
${INSTALL_DATA} ${DIFFDIR}/README.JA-PATCH.ja ${DOCSDIR}
${INSTALL_DATA} ${DIFFDIR}/html/manual-ja-patch.en.html ${DOCSDIR}/html
${INSTALL_DATA} ${DIFFDIR}/html/manual-ja-patch.ja.html ${DOCSDIR}/html
${INSTALL_DATA} ${DIFFDIR}/html/usage-japanese.ja.html ${DOCSDIR}/html
${INSTALL_DATA} ${DIFFDIR}/samples/mutt-en.rc ${DOCSDIR}/samples
${INSTALL_DATA} ${DIFFDIR}/samples/mutt-ja.rc ${DOCSDIR}/samples
${INSTALL_DATA} ${DIFFDIR}/samples/sample.muttrc-tt ${DOCSDIR}/samples
${INSTALL_DATA} ${WRKDIR}/manual_ja.txt ${DOCSDIR}
${INSTALL_DATA} ${WRKDIR}/manual_ja.tex ${DOCSDIR}
${INSTALL_DATA} ${WRKDIR}/manual_ja.html ${DOCSDIR}
${INSTALL_DATA} ${WRKDIR}/manual_ja.sgml ${DOCSDIR}
.endif
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (mutt/mutt-1.2.5.1.tar.gz) = 2ede4b04ad0a4c8ecdbaa322f416a8c6
MD5 (mutt/manual_ja-1.2i-2.tar.gz) = 5a5675ffe23ffe273bd6fe246d3aaefd
MD5 (mutt/mutt-1.2.5.1i-jp0.diff.gz) = aab15d9269d64c06345f2c925d975df1
MD5 (mutt/mutt-1.4i.tar.gz) = a67bcdf1a1cd53d61ccd3ebf3993ba59
MD5 (mutt/mutt-1.4i-ja.1.tar.gz) = dfc6610424fad4d3f86b166ff3e2da06
MD5 (mutt/manual_ja-1.4i-0.tar.gz) = 2c8927971b997830f93520dbb517e5e6

View File

@ -0,0 +1,21 @@
--- doc/Makefile.in.orig Sun Jun 23 17:04:16 2002
+++ doc/Makefile.in Sun Jun 23 17:04:47 2002
@@ -78,18 +78,6 @@
$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
- for f in $(srcdir_DOCFILES) ; do \
- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
- done
- for f in $(topsrcdir_DOCFILES) ; do \
- $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
- done
- $(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
- for file in manual*.html ; do \
- $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
- done
uninstall:
-rm -f $(DESTDIR)$(mandir)/man1/mutt.1

View File

@ -0,0 +1,11 @@
--- Makefile.am.orig Sun Jun 23 17:05:57 2002
+++ Makefile.am Sun Jun 23 17:06:25 2002
@@ -9,7 +9,7 @@
IMAP_INCLUDES = -I$(top_srcdir)/imap
endif
-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
+SUBDIRS = m4 po intl doc $(IMAP_SUBDIR)
bin_SCRIPTS = muttbug flea

View File

@ -1,10 +0,0 @@
--- Makefile.am.orig Sat Jul 29 20:11:33 2000
+++ Makefile.am Sat Jul 29 20:15:54 2000
@@ -122,7 +122,6 @@
fi
install-data-local: Muttrc
- $(srcdir)/mkinstalldirs $(DESTDIR)$(sharedir)
$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
-if [ -f $(DESTDIR)$(sharedir)/Muttrc ] ; then \
mv $(DESTDIR)$(sharedir)/Muttrc $(DESTDIR)$(sysconfdir) ; \

View File

@ -1,46 +0,0 @@
--- khenkan.c.orig Tue Aug 1 02:28:27 2000
+++ khenkan.c Tue Aug 1 03:13:51 2000
@@ -1045,6 +1045,7 @@
{
char *p = (char *)s, ch, *beg, *end=NULL, *to_ascii=NULL, *to_kanji=NULL;
int len = 0, count, beg_kanji, end_kanji=0;
+ char *enc_end = NULL, *prev_brk = NULL;
/* check if buffer 'd' has a enough length */
if (dmax - d < strlen((char *)s) * 4 / 3) return (-1);
@@ -1064,11 +1065,23 @@
if (d == dmax) return (-1);
if (len > 75) { /* line break(in text) */
- p = beg; /* search previous word's end */
- while(beg > (char *)s && *beg != ' ') beg--;
- while(beg > (char *)s && *beg == ' ') beg--;
+ if (enc_end == NULL) {
+ enc_end = s;
+ }
+ while(beg >= enc_end && *beg != ' ') beg--;
+ while(beg >= enc_end && *beg == ' ') beg--;
++beg;
- d -= p - beg + 1;
+ if (prev_brk != NULL && beg <= prev_brk) {
+ beg = p;
+ while(beg > prev_brk && isalnum(*beg)) beg--;
+ }
+ if (prev_brk == NULL || beg > prev_brk) {
+ d -= p - beg;
+ p = beg;
+ prev_brk = beg;
+ } else {
+ prev_brk = p;
+ }
*d++ = '\n';
*d++ = ' ';
len = 0;
@@ -1181,6 +1194,7 @@
new_d = encode_base64(d, jtmp_str, jtmp_str + count);
len += new_d - d;
d = new_d;
+ enc_end = p;
beg_kanji = end_kanji;
beg = p;

View File

@ -0,0 +1,11 @@
--- doc/Makefile.in.orig Sat Nov 10 04:06:08 2001
+++ doc/Makefile.in Sat Nov 10 04:06:36 2001
@@ -73,7 +73,7 @@
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5
./instdoc $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/mutt.1
./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
- echo ".so $(mandir)/man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1
+ echo ".so man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1
./instdoc $(srcdir)/dotlock.man \
$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5

View File

@ -0,0 +1,11 @@
--- configure.in.orig Sun Jun 23 17:42:10 2002
+++ configure.in Sun Jun 23 17:43:23 2002
@@ -577,7 +577,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

View File

@ -0,0 +1,9 @@
--- patch-1.4.tt.ja.1.orig Wed Jun 19 00:52:42 2002
+++ patch-1.4.tt.ja.1 Wed Jun 19 00:53:02 2002
@@ -2464,5 +2464,5 @@
--- mutt-ja/PATCHES~ Tue Nov 6 19:59:33 2001
+++ mutt-ja/PATCHES Tue Nov 6 19:59:42 2001
-@@ -1,0 +1 @@
+@@ -0,0 +1 @@
+patch-1.4.tt.ja.1

View File

@ -4,7 +4,10 @@ advanced features like key bindings, keyboard macros, mail threading,
regular expression searches and a powerful pattern matching language
for selecting groups of messages.
WWW: http://www.mutt.org/
This is japanized version.
see /usr/local/share/doc/mutt/README.JA-PATCH.ja
WWW: http://www.emaillab.org/mutt/
-
IWASHITA Yoji

View File

@ -1,3 +1,4 @@
bin/flea
bin/mutt
bin/mutt_dotlock
bin/muttbug
@ -5,62 +6,95 @@ bin/pgpewrap
bin/pgpring
etc/Muttrc
etc/mime.types
share/doc/mutt/html/manual-1.html
share/doc/mutt/html/manual-2.html
share/doc/mutt/html/manual-3.html
share/doc/mutt/html/manual-4.html
share/doc/mutt/html/manual-5.html
share/doc/mutt/html/manual-6.html
share/doc/mutt/html/manual-7.html
share/doc/mutt/html/manual.html
@dirrm share/doc/mutt/html
share/doc/mutt/samples/Mush.rc
share/doc/mutt/samples/Pine.rc
share/doc/mutt/samples/Tin.rc
share/doc/mutt/samples/gpg.rc
share/doc/mutt/samples/pgp2.rc
share/doc/mutt/samples/pgp5.rc
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/doc/mutt/samples
share/doc/mutt/COPYRIGHT
share/doc/mutt/ChangeLog
share/doc/mutt/GPL
share/doc/mutt/INSTALL
share/doc/mutt/NEWS
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/manual.txt
share/doc/mutt/manual_ja.html
share/doc/mutt/manual_ja.sgml
share/doc/mutt/manual_ja.tex
share/doc/mutt/manual_ja.txt
@dirrm share/doc/mutt
%%PORTDOCS%%share/doc/mutt/COPYRIGHT
%%PORTDOCS%%share/doc/mutt/ChangeLog
%%PORTDOCS%%share/doc/mutt/GPL
%%PORTDOCS%%share/doc/mutt/INSTALL
%%PORTDOCS%%share/doc/mutt/INSTALL.JA-PATCH.ja
%%PORTDOCS%%share/doc/mutt/NEWS
%%PORTDOCS%%share/doc/mutt/PGP-Notes.txt
%%PORTDOCS%%share/doc/mutt/README
%%PORTDOCS%%share/doc/mutt/README.JA-PATCH.ja
%%PORTDOCS%%share/doc/mutt/README.SECURITY
%%PORTDOCS%%share/doc/mutt/README.SSL
%%PORTDOCS%%share/doc/mutt/TODO
%%PORTDOCS%%share/doc/mutt/applying-patches.txt
%%PORTDOCS%%share/doc/mutt/devel-notes.txt
%%PORTDOCS%%share/doc/mutt/html/manual-1.html
%%PORTDOCS%%share/doc/mutt/html/manual-2.html
%%PORTDOCS%%share/doc/mutt/html/manual-3.html
%%PORTDOCS%%share/doc/mutt/html/manual-4.html
%%PORTDOCS%%share/doc/mutt/html/manual-5.html
%%PORTDOCS%%share/doc/mutt/html/manual-6.html
%%PORTDOCS%%share/doc/mutt/html/manual-7.html
%%PORTDOCS%%share/doc/mutt/html/manual.html
%%PORTDOCS%%share/doc/mutt/html/manual-ja-patch.en.html
%%PORTDOCS%%share/doc/mutt/html/manual-ja-patch.ja.html
%%PORTDOCS%%share/doc/mutt/html/usage-japanese.ja.html
%%PORTDOCS%%share/doc/mutt/manual.txt
%%PORTDOCS%%share/doc/mutt/manual_ja.html
%%PORTDOCS%%share/doc/mutt/manual_ja.sgml
%%PORTDOCS%%share/doc/mutt/manual_ja.tex
%%PORTDOCS%%share/doc/mutt/manual_ja.txt
%%PORTDOCS%%share/doc/mutt/patch-notes.txt
%%PORTDOCS%%share/doc/mutt/samples/Mush.rc
%%PORTDOCS%%share/doc/mutt/samples/Pine.rc
%%PORTDOCS%%share/doc/mutt/samples/Tin.rc
%%PORTDOCS%%share/doc/mutt/samples/gpg.rc
%%PORTDOCS%%share/doc/mutt/samples/mutt-en.rc
%%PORTDOCS%%share/doc/mutt/samples/mutt-ja.rc
%%PORTDOCS%%share/doc/mutt/samples/pgp2.rc
%%PORTDOCS%%share/doc/mutt/samples/pgp5.rc
%%PORTDOCS%%share/doc/mutt/samples/pgp6.rc
%%PORTDOCS%%share/doc/mutt/samples/sample.mailcap
%%PORTDOCS%%share/doc/mutt/samples/sample.muttrc
%%PORTDOCS%%share/doc/mutt/samples/sample.muttrc-tlr
%%PORTDOCS%%share/doc/mutt/samples/sample.muttrc-tt
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.3.2.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.freebsd-3.3.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.glibc-2.1.3.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.glibc-2.1.90.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.hpux-10.01.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.hpux-10.20.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.hpux-11.00.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.irix-6.5.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.osf1-4.0a.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.4.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
share/locale/ca/LC_MESSAGES/mutt.mo
share/locale/cs/LC_MESSAGES/mutt.mo
share/locale/da/LC_MESSAGES/mutt.mo
share/locale/de/LC_MESSAGES/mutt.mo
share/locale/el/LC_MESSAGES/mutt.mo
share/locale/eo/LC_MESSAGES/mutt.mo
share/locale/es/LC_MESSAGES/mutt.mo
share/locale/et/LC_MESSAGES/mutt.mo
share/locale/fr/LC_MESSAGES/mutt.mo
share/locale/gl/LC_MESSAGES/mutt.mo
share/locale/hu/LC_MESSAGES/mutt.mo
share/locale/id/LC_MESSAGES/mutt.mo
share/locale/it/LC_MESSAGES/mutt.mo
share/locale/ja/LC_MESSAGES/mutt.mo
share/locale/ko/LC_MESSAGES/mutt.mo
share/locale/lt/LC_MESSAGES/mutt.mo
share/locale/nl/LC_MESSAGES/mutt.mo
share/locale/pl/LC_MESSAGES/mutt.mo
share/locale/pt_BR/LC_MESSAGES/mutt.mo
share/locale/ru/LC_MESSAGES/mutt.mo
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_TW.Big5/LC_MESSAGES/mutt.mo
share/locale/zh_CN/LC_MESSAGES/mutt.mo
share/locale/zh_TW/LC_MESSAGES/mutt.mo
%%PORTDOCS%%@dirrm share/doc/mutt/samples/iconv
%%PORTDOCS%%@dirrm share/doc/mutt/samples
%%PORTDOCS%%@dirrm share/doc/mutt/html
%%PORTDOCS%%@dirrm share/doc/mutt