update to 1.2.2i. remove deprecated `if defined' statements.

bump NEED_VERSION. change a few master sites.
This commit is contained in:
fgsch 2000-06-29 23:18:10 +00:00
parent 3e7c05decb
commit 435aff5976
5 changed files with 61 additions and 202 deletions

View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.30 2000/06/28 22:28:20 fgsch Exp $
# $OpenBSD: Makefile,v 1.31 2000/06/29 23:18:10 fgsch Exp $
DISTNAME= mutt-1.0.1i
DISTNAME= mutt-1.2.2i
CATEGORIES= mail
NEED_VERSION= 1.308
MASTER_SITES= ftp://ftp.guug.de/pub/mutt/ \
ftp://riemann.iam.uni-bonn.de/pub/mutt/ \
NEED_VERSION= 1.309
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
ftp://ftp.gbnet.net/pub/mutt-international/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/
ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/ \
ftp://ftp.iks-jena.de/pub/mitarb/lutz/crypt/software/pgp/mutt/
MAINTAINER= turan@openbsd.org
@ -17,18 +17,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
FLAVORS=slang curses imap pop
.if defined(TTY_LIB)
FLAVOR?=
FLAVOR+=${TTY_LIB}
.endif
FLAVOR?=slang
.if defined(WITH_IMAP)
FLAVOR+=imap
.endif
.if defined(WITH_POP)
FLAVOR+=pop
.endif
LIB_DEPENDS= intl.1::devel/gettext
@ -41,12 +30,11 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
.if ${FLAVOR:L:Mslang}
LIB_DEPENDS+= slang.14::devel/libslang
CONFIGURE_ARGS+=--with-slang=${PREFIX}
.elif ${FLAVOR:L:Mcurses}
CONFIGURE_ARGS+=--with-curses
.else
.BEGIN:
@echo "Bad choice FLAVOR=${FLAVOR}"; exit 1
echo "Bad choice FLAVOR=${FLAVOR}"; exit 1
.endif
.if defined(HOMESPOOL)

View File

@ -1,3 +1,3 @@
MD5 (mutt-1.0.1i.tar.gz) = bc9e998bcf0966796c1ccf78611b8a42
RMD160 (mutt-1.0.1i.tar.gz) = a2ff8f4490453fd556c1c2a4e951a61970f5ce82
SHA1 (mutt-1.0.1i.tar.gz) = bc6e3abec40771718afcac88d5d2cc8d43395925
MD5 (mutt-1.2.2i.tar.gz) = 69b210bc33446559fbc70c8ff4ada248
RMD160 (mutt-1.2.2i.tar.gz) = 9a5962e2f22ac6b0b9dfbbe23916cb9422b29b3a
SHA1 (mutt-1.2.2i.tar.gz) = f2458b231109e5a30398dbc6d32ce14b00cbe97e

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-do_not_automove,v 1.4 2000/01/21 16:39:38 espie Exp $
--- init.h.orig Thu Jan 6 12:55:07 2000
+++ init.h Thu Jan 20 16:33:04 2000
@@ -153,7 +153,7 @@ struct option_t MuttVars[] = {
{ "mime_forward", DT_QUAD, R_NONE, OPT_MIMEFWD, M_NO },
{ "mime_forward_decode", DT_BOOL, R_NONE, OPTMIMEFORWDECODE, 0 },
{ "mime_fwd", DT_SYN, R_NONE, UL "mime_forward", 0 },
$OpenBSD: patch-do_not_automove,v 1.5 2000/06/29 23:18:11 fgsch Exp $
--- init.h.orig Thu Jun 8 03:00:14 2000
+++ init.h Thu Jun 29 12:00:16 2000
@@ -994,7 +994,7 @@
#endif
- { "move", DT_QUAD, R_NONE, OPT_MOVE, M_ASKNO },
+ { "move", DT_QUAD, R_NONE, OPT_MOVE, M_NO },
{ "message_format", DT_STR, R_NONE, UL &MsgFmt, UL "%s" },
{ "msg_format", DT_SYN, R_NONE, UL "message_format", 0 },
{ "pager", DT_PATH, R_NONE, UL &Pager, UL "builtin" },
/*
** .pp
** Controls whether you will be asked to confirm moving read messages

View File

@ -1,11 +1,12 @@
--- doc/Makefile.in.orig Thu Feb 11 06:34:52 1999
+++ doc/Makefile.in Fri Apr 14 02:40:47 2000
@@ -43,7 +43,7 @@
DOCFILES = manual.txt
$OpenBSD: patch-doc-Makefile.in,v 1.2 2000/06/29 23:18:11 fgsch Exp $
--- doc/Makefile.in.orig Wed Mar 29 06:42:49 2000
+++ doc/Makefile.in Wed Jun 28 19:53:15 2000
@@ -58,7 +58,7 @@
topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \
README NEWS TODO README.SECURITY README.SSL README.UPGRADE
-all: muttrc.man try-html try-txt
+all: muttrc.man
-all: mutt.man dotlock.man try-html try-txt
+all: mutt.man dotlock.man
complete: all html
try-html: ../makedoc
test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./

View File

@ -1,6 +1,11 @@
@comment $OpenBSD: PLIST,v 1.11 2000/06/29 23:18:11 fgsch Exp $
bin/mutt
bin/muttbug
bin/pgpewrap
bin/pgpring
man/man1/mutt.1
man/man1/mutt_dotlock.1
man/man5/muttrc.5
share/doc/mutt/COPYRIGHT
share/doc/mutt/ChangeLog
share/doc/mutt/GPL
@ -9,15 +14,38 @@ 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/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
share/doc/mutt/manual.txt
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
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/fr/LC_MESSAGES/mutt.mo
share/locale/gl/LC_MESSAGES/mutt.mo
share/locale/id/LC_MESSAGES/mutt.mo
share/locale/it/LC_MESSAGES/mutt.mo
share/locale/ko/LC_MESSAGES/mutt.mo
@ -26,170 +54,12 @@ 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/uk/LC_MESSAGES/mutt.mo
share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
share/mutt/Muttrc
share/mutt/charsets/ansi-x3-110-1983
share/mutt/charsets/ansi-x3-4-1968
share/mutt/charsets/asmo-449
share/mutt/charsets/baltic
share/mutt/charsets/bs-4730
share/mutt/charsets/bs-viewdata
share/mutt/charsets/charsets.alias
share/mutt/charsets/charsets.alias.dist
share/mutt/charsets/cp1250
share/mutt/charsets/cp1251
share/mutt/charsets/cp1252
share/mutt/charsets/cp1253
share/mutt/charsets/cp1254
share/mutt/charsets/cp1255
share/mutt/charsets/cp1256
share/mutt/charsets/cp1257
share/mutt/charsets/csa-z243-4-1985-1
share/mutt/charsets/csa-z243-4-1985-2
share/mutt/charsets/csa-z243-4-1985-gr
share/mutt/charsets/csn-369103
share/mutt/charsets/cwi
share/mutt/charsets/dec-mcs
share/mutt/charsets/din-66003
share/mutt/charsets/ds-2089
share/mutt/charsets/ebcdic-at-de
share/mutt/charsets/ebcdic-at-de-a
share/mutt/charsets/ebcdic-ca-fr
share/mutt/charsets/ebcdic-dk-no
share/mutt/charsets/ebcdic-dk-no-a
share/mutt/charsets/ebcdic-es
share/mutt/charsets/ebcdic-es-a
share/mutt/charsets/ebcdic-es-s
share/mutt/charsets/ebcdic-fi-se
share/mutt/charsets/ebcdic-fi-se-a
share/mutt/charsets/ebcdic-fr
share/mutt/charsets/ebcdic-is-friss
share/mutt/charsets/ebcdic-it
share/mutt/charsets/ebcdic-pt
share/mutt/charsets/ebcdic-uk
share/mutt/charsets/ebcdic-us
share/mutt/charsets/ecma-cyrillic
share/mutt/charsets/es
share/mutt/charsets/es2
share/mutt/charsets/gb-1988-80
share/mutt/charsets/gost-19768-74
share/mutt/charsets/greek-ccitt
share/mutt/charsets/greek7
share/mutt/charsets/greek7-old
share/mutt/charsets/hp-roman8
share/mutt/charsets/ibm037
share/mutt/charsets/ibm038
share/mutt/charsets/ibm1004
share/mutt/charsets/ibm1026
share/mutt/charsets/ibm1047
share/mutt/charsets/ibm256
share/mutt/charsets/ibm273
share/mutt/charsets/ibm274
share/mutt/charsets/ibm275
share/mutt/charsets/ibm277
share/mutt/charsets/ibm278
share/mutt/charsets/ibm280
share/mutt/charsets/ibm281
share/mutt/charsets/ibm284
share/mutt/charsets/ibm285
share/mutt/charsets/ibm290
share/mutt/charsets/ibm297
share/mutt/charsets/ibm420
share/mutt/charsets/ibm423
share/mutt/charsets/ibm424
share/mutt/charsets/ibm437
share/mutt/charsets/ibm500
share/mutt/charsets/ibm850
share/mutt/charsets/ibm851
share/mutt/charsets/ibm852
share/mutt/charsets/ibm855
share/mutt/charsets/ibm857
share/mutt/charsets/ibm860
share/mutt/charsets/ibm861
share/mutt/charsets/ibm862
share/mutt/charsets/ibm863
share/mutt/charsets/ibm864
share/mutt/charsets/ibm865
share/mutt/charsets/ibm868
share/mutt/charsets/ibm869
share/mutt/charsets/ibm870
share/mutt/charsets/ibm871
share/mutt/charsets/ibm875
share/mutt/charsets/ibm880
share/mutt/charsets/ibm891
share/mutt/charsets/ibm903
share/mutt/charsets/ibm904
share/mutt/charsets/ibm905
share/mutt/charsets/ibm918
share/mutt/charsets/iec-p27-1
share/mutt/charsets/inis
share/mutt/charsets/inis-8
share/mutt/charsets/inis-cyrillic
share/mutt/charsets/invariant
share/mutt/charsets/iso-10367-box
share/mutt/charsets/iso-2033-1983
share/mutt/charsets/iso-5427
share/mutt/charsets/iso-5427-ext
share/mutt/charsets/iso-5428
share/mutt/charsets/iso-646-basic
share/mutt/charsets/iso-646-irv
share/mutt/charsets/iso-6937
share/mutt/charsets/iso-6937-2-25
share/mutt/charsets/iso-6937-2-add
share/mutt/charsets/iso-8859-1
share/mutt/charsets/iso-8859-10
share/mutt/charsets/iso-8859-2
share/mutt/charsets/iso-8859-3
share/mutt/charsets/iso-8859-4
share/mutt/charsets/iso-8859-5
share/mutt/charsets/iso-8859-6
share/mutt/charsets/iso-8859-7
share/mutt/charsets/iso-8859-8
share/mutt/charsets/iso-8859-9
share/mutt/charsets/iso-8859-supp
share/mutt/charsets/iso-ir-90
share/mutt/charsets/it
share/mutt/charsets/jis-c6220-1969-jp
share/mutt/charsets/jis-c6220-1969-ro
share/mutt/charsets/jis-c6229-1984-a
share/mutt/charsets/jis-c6229-1984-b
share/mutt/charsets/jis-c6229-1984-b-add
share/mutt/charsets/jis-c6229-1984-hand
share/mutt/charsets/jis-c6229-1984-hand-add
share/mutt/charsets/jis-c6229-1984-kana
share/mutt/charsets/jis-x0201
share/mutt/charsets/jus-i-b1-002
share/mutt/charsets/jus-i-b1-003-mac
share/mutt/charsets/jus-i-b1-003-serb
share/mutt/charsets/koi-8
share/mutt/charsets/koi8-r
share/mutt/charsets/ksc5636
share/mutt/charsets/latin-greek
share/mutt/charsets/latin-greek-1
share/mutt/charsets/mac-is
share/mutt/charsets/macintosh
share/mutt/charsets/msz-7795-3
share/mutt/charsets/nats-dano
share/mutt/charsets/nats-dano-add
share/mutt/charsets/nats-sefi
share/mutt/charsets/nats-sefi-add
share/mutt/charsets/nc-nc00-10
share/mutt/charsets/nextstep
share/mutt/charsets/nf-z-62-010
share/mutt/charsets/nf-z-62-010-(1973)
share/mutt/charsets/ns-4551-1
share/mutt/charsets/ns-4551-2
share/mutt/charsets/pt
share/mutt/charsets/pt2
share/mutt/charsets/sami
share/mutt/charsets/sen-850200-b
share/mutt/charsets/sen-850200-c
share/mutt/charsets/t-101-g2
share/mutt/charsets/t-61-7bit
share/mutt/charsets/t-61-8bit
share/mutt/charsets/videotex-suppl
share/mutt/mime.types
@dirrm share/mutt/charsets
@dirrm share/mutt
@dirrm share/doc/mutt/samples
@dirrm share/doc/mutt/html
@dirrm share/doc/mutt