View | Details | Raw Unified | Return to bug 111414
Collapse All | Expand All

(-)./Makefile (-14 / +4 lines)
Lines 101-116 Link Here
101
# If you want to enable the reverse_reply option define:
101
# If you want to enable the reverse_reply option define:
102
#  WITH_MUTT_REVERSE_REPLY_PATCH
102
#  WITH_MUTT_REVERSE_REPLY_PATCH
103
#
103
#
104
# If you want to enable the assumed_charset option define:
105
#  WITH_MUTT_ASSUMED_CHARSET_PATCH
106
#
107
# If you want to enable the `greeting' option define:
104
# If you want to enable the `greeting' option define:
108
#  WITH_MUTT_GREETING_PATCH
105
#  WITH_MUTT_GREETING_PATCH
109
#
106
#
110
107
111
PORTNAME=	mutt-devel
108
PORTNAME=	mutt-devel
112
PORTVERSION=	1.5.14
109
PORTVERSION=	1.5.15
113
PORTREVISION?=	1
110
PORTREVISION?=	0
114
CATEGORIES+=	mail ipv6
111
CATEGORIES+=	mail ipv6
115
.if defined(WITH_MUTT_NNTP)
112
.if defined(WITH_MUTT_NNTP)
116
CATEGORIES+=	news
113
CATEGORIES+=	news
Lines 201-211 Link Here
201
IGNORE=	cannot install: the WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_NNTP are not compatible
198
IGNORE=	cannot install: the WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_NNTP are not compatible
202
.endif
199
.endif
203
.endif
200
.endif
204
.if defined(WITH_MUTT_ASSUMED_CHARSET_PATCH)
205
.if defined(WITH_MUTT_NNTP)
206
IGNORE=	cannot install: the WITH_MUTT_ASSUMED_CHARSET_PATCH and WITH_MUTT_NNTP are not compatible
207
.endif
208
.endif
209
201
210
.if defined (MUTT_LITE)
202
.if defined (MUTT_LITE)
211
WITHOUT_MUTT_XML=			yes
203
WITHOUT_MUTT_XML=			yes
Lines 319-324 Link Here
319
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook
311
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook
320
.endif
312
.endif
321
.if defined(WITH_MUTT_SIGNATURE_MENU)
313
.if defined(WITH_MUTT_SIGNATURE_MENU)
314
IGNORE=	The WITH_MUTT_SIGNATURE_MENU does not work at the moment.
322
XML_NEEDED=	yes
315
XML_NEEDED=	yes
323
post-patch::
316
post-patch::
324
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-signature-menu
317
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-signature-menu
Lines 431-437 Link Here
431
PATCHFILES+=	p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
424
PATCHFILES+=	p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
432
.endif
425
.endif
433
.if defined(WITH_MUTT_SIDEBAR_PATCH)
426
.if defined(WITH_MUTT_SIDEBAR_PATCH)
434
SIDEBAR_PATCH=	patch-1.5.14.sidebar.20070223.txt
427
SIDEBAR_PATCH=	patch-1.5.15.sidebar.20070408.txt
435
DISTFILES+=	${SIDEBAR_PATCH}:tchan
428
DISTFILES+=	${SIDEBAR_PATCH}:tchan
436
XML_NEEDED=	yes
429
XML_NEEDED=	yes
437
pre-patch::
430
pre-patch::
Lines 439-447 Link Here
439
	@${REINPLACE_CMD} -E '/^diff.*\/Makefile.in$$/,/^diff/d' \
432
	@${REINPLACE_CMD} -E '/^diff.*\/Makefile.in$$/,/^diff/d' \
440
		 ${WRKDIR}/patch-sidebar
433
		 ${WRKDIR}/patch-sidebar
441
	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-sidebar
434
	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-sidebar
442
.endif
443
.if defined(WITH_MUTT_ASSUMED_CHARSET_PATCH)
444
PATCHFILES+=	patch-${AC_PATCH_VERSION}.tt.assumed_charset.2.gz:jp
445
.endif
435
.endif
446
436
447
WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
437
WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
(-)./distinfo (-21 / +21 lines)
Lines 1-27 Link Here
1
MD5 (mutt/mutt-1.5.14.tar.gz) = 6d33b4f0074e39772021d947c49b30c6
1
MD5 (mutt/mutt-1.5.15.tar.gz) = b2c1eb45fd958f6589ee52a98f2a3ce1
2
SHA256 (mutt/mutt-1.5.14.tar.gz) = 9dbee28bd48a0f1779ba3b00f98dda74a3f629e8109f1842616d48b85013946a
2
SHA256 (mutt/mutt-1.5.15.tar.gz) = 03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a
3
SIZE (mutt/mutt-1.5.14.tar.gz) = 3441678
3
SIZE (mutt/mutt-1.5.15.tar.gz) = 3517899
4
MD5 (mutt/patch-1.5.14.rr.compressed.gz) = 383897af9c41a95a3c36d76ee206811d
4
MD5 (mutt/patch-1.5.15.rr.compressed.gz) = b2c3af62e5469826e445113bc85ce0c3
5
SHA256 (mutt/patch-1.5.14.rr.compressed.gz) = 34b6f642d1daab31acb655d008ccba92aefadc4730c3b12ee64265285f8f34d7
5
SHA256 (mutt/patch-1.5.15.rr.compressed.gz) = 4542be2062337224783631f5730d97a5a351a69737bf772b81010e5be16277f7
6
SIZE (mutt/patch-1.5.14.rr.compressed.gz) = 10168
6
SIZE (mutt/patch-1.5.15.rr.compressed.gz) = 10084
7
MD5 (mutt/patch-1.5.14.vvv.nntp.gz) = 3c1554f33161329225900fee899cd2b8
7
MD5 (mutt/patch-1.5.15.vvv.nntp.gz) = 758a2822791eed6da8bb48a862b5758f
8
SHA256 (mutt/patch-1.5.14.vvv.nntp.gz) = 415fe575b895a79ddf91ff81566a88b12268076ccf870b1306741e4dfbe781ee
8
SHA256 (mutt/patch-1.5.15.vvv.nntp.gz) = 762a56acc0ca85bd9b224713c2ece006233d30b0a4a1725e58a0f0f2af6827e8
9
SIZE (mutt/patch-1.5.14.vvv.nntp.gz) = 54928
9
SIZE (mutt/patch-1.5.15.vvv.nntp.gz) = 54495
10
MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa
10
MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa
11
SHA256 (mutt/patch-1.5.4.cd.ifdef.1) = 7d11892bcc688bbc82b5996ca0fda2d4446d8e928bec50b2731f8a3a5d9be373
11
SHA256 (mutt/patch-1.5.4.cd.ifdef.1) = 7d11892bcc688bbc82b5996ca0fda2d4446d8e928bec50b2731f8a3a5d9be373
12
SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545
12
SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545
13
MD5 (mutt/patch-1.5.14.vvv.initials.gz) = 60ca699e3959db53dec418ca08d028e1
13
MD5 (mutt/patch-1.5.15.vvv.initials.gz) = 414606ce18de730d1bb6478899532644
14
SHA256 (mutt/patch-1.5.14.vvv.initials.gz) = 0c71d08ff4fa82208f59567c6f2666a58a5bd2664c0ef57f5ababedb0f0bb0f8
14
SHA256 (mutt/patch-1.5.15.vvv.initials.gz) = 9385915adb106abba6f1576be58901f368688b1d55ef454e3993394828ee17e1
15
SIZE (mutt/patch-1.5.14.vvv.initials.gz) = 692
15
SIZE (mutt/patch-1.5.15.vvv.initials.gz) = 684
16
MD5 (mutt/patch-1.5.14.vvv.quote.gz) = fb4bf5bd63d219205447009c2270676b
16
MD5 (mutt/patch-1.5.15.vvv.quote.gz) = 93276f86e544e69a0e83808279f3b175
17
SHA256 (mutt/patch-1.5.14.vvv.quote.gz) = 0b64a611a638ecf1298db85b614454630ffedf26095c9b7c2a77b47db5a5bd9f
17
SHA256 (mutt/patch-1.5.15.vvv.quote.gz) = 4afe6cc178b08ebd735d04053198f6539c87a0cdc1c5a8a51affc3598504e3a5
18
SIZE (mutt/patch-1.5.14.vvv.quote.gz) = 1962
18
SIZE (mutt/patch-1.5.15.vvv.quote.gz) = 1585
19
MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
19
MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
20
SHA256 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = ec9511b86a595f9b4f1f96b05d9e9e12e997bc62b0a0f2b5a36e2817dee61406
20
SHA256 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = ec9511b86a595f9b4f1f96b05d9e9e12e997bc62b0a0f2b5a36e2817dee61406
21
SIZE (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 6405
21
SIZE (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 6405
22
MD5 (mutt/patch-1.5.14.sidebar.20070223.txt) = b4cb93ec7053ca2be1f4253d8c545937
22
MD5 (mutt/patch-1.5.15.rr.compressed.gz) = b2c3af62e5469826e445113bc85ce0c3
23
SHA256 (mutt/patch-1.5.14.sidebar.20070223.txt) = 56c5fc62a50ef2031736e6e4aee81931444e4545b86f05636496284e4a88f331
23
SHA256 (mutt/patch-1.5.15.rr.compressed.gz) = 4542be2062337224783631f5730d97a5a351a69737bf772b81010e5be16277f7
24
SIZE (mutt/patch-1.5.14.sidebar.20070223.txt) = 50978
24
SIZE (mutt/patch-1.5.15.rr.compressed.gz) = 10084
25
MD5 (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 45cacc5155f1865ace31c72e2bffee63
25
MD5 (mutt/patch-1.5.15.sidebar.20070408.txt) = 8fcae5ea38eac45616762d76f7cadacf
26
SHA256 (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 41ae6d049d2d39c3bb01d534a760372ec571bc51e90c259f529c477aa41d3d7e
26
SHA256 (mutt/patch-1.5.15.sidebar.20070408.txt) = 3b61cd21cbe5bd5851a5441ce049ace3329f710bf5224064a6293d379d14c5f8
27
SIZE (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 2555
27
SIZE (mutt/patch-1.5.15.sidebar.20070408.txt) = 51101
(-)./files/extra-patch-aspell (-2 / +2 lines)
Lines 1-5 Link Here
1
--- Muttrc.head.in.orig	Thu Jan 24 13:10:47 2002
1
--- Muttrc.head.orig	Thu Jan 24 13:10:47 2002
2
+++ Muttrc.head.in	Tue Nov  9 08:53:14 2004
2
+++ Muttrc.head	Tue Nov  9 08:53:14 2004
3
@@ -19,6 +19,8 @@
3
@@ -19,6 +19,8 @@
4
 macro index   <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
4
 macro index   <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
5
 macro pager   <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
5
 macro pager   <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
(-)./files/extra-patch-doc-ref (-10 / +10 lines)
Lines 1-12 Link Here
1
--- doc/mutt.man.orig	Mon Jul 13 12:50:38 1998
1
--- doc/mutt.man.orig	Wed Apr  4 07:37:13 2007
2
+++ doc/mutt.man	Thu Oct  1 22:15:40 1998
2
+++ doc/mutt.man	Mon Apr  9 15:39:36 2007
3
@@ -20,7 +20,8 @@
3
@@ -57,7 +57,8 @@
4
 .SH DESCRIPTION
4
 .PP
5
 Mutt is a small but very powerful text based program for reading electronic
5
 Mutt is a small but very powerful text based program for reading and sending electronic
6
 mail under unix operating systems, including support color terminals, MIME,
6
 mail under unix operating systems, including support for color terminals, MIME,
7
-and a threaded sorting mode.
7
-OpenPGP, and a threaded sorting mode.
8
+and a threaded sorting mode.  Details of how to use all of this is
8
+OpenPGP, and a threaded sorting mode. Details of how to use all of this is
9
+available in \fI${DOCSDIR}\fP.
9
+available in \fI${DOCSDIR}\fP.
10
 .SH OPTIONS
10
 .SH OPTIONS
11
 .IP "-a \fIfile\fP"
11
 .PP
12
 Attach a file to your message using MIME.
12
 .IP "-A \fIalias\fP"
(-)./files/patch-examples (-4 / +4 lines)
Lines 48-61 Link Here
48
   ** (S/MIME only)
48
   ** (S/MIME only)
49
   */
49
   */
50
   { "smime_verify_command", 	DT_STR, R_NONE, UL &SmimeVerifyCommand, 0},
50
   { "smime_verify_command", 	DT_STR, R_NONE, UL &SmimeVerifyCommand, 0},
51
--- Makefile.am.orig	Wed Aug 30 14:30:28 2006
51
--- Makefile.am.orig	Mon Apr  9 15:21:50 2007
52
+++ Makefile.am	Wed Aug 30 14:31:49 2006
52
+++ Makefile.am	Mon Apr  9 15:24:06 2007
53
@@ -13,7 +13,7 @@
53
@@ -13,7 +13,7 @@
54
 
54
 
55
 bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
55
 bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
56
 
56
 
57
-BUILT_SOURCES = keymap_defs.h patchlist.c
57
-BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h
58
+BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc
58
+BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h Muttrc
59
 
59
 
60
 bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
60
 bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
61
 mutt_SOURCES = $(BUILT_SOURCES) \
61
 mutt_SOURCES = $(BUILT_SOURCES) \
(-)./files/patch-hcache-db (-6 / +13 lines)
Lines 1-11 Link Here
1
--- configure.in.orig2	Tue Feb  8 09:02:55 2005
1
--- configure.ac.orig2	Mon Apr  9 15:24:59 2007
2
+++ configure.in	Tue Feb  8 09:04:01 2005
2
+++ configure.ac	Mon Apr  9 15:28:42 2007
3
@@ -811,7 +811,7 @@
3
@@ -886,12 +886,12 @@
4
         test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr"
5
         for d in $ac_bdb_prefix; do
6
             bdbpfx="$bdbpfx $d"
7
-            for v in BerkeleyDB.4.3 BerkeleyDB.4.2 BerkeleyDB.4.1; do
8
+            for v in BerkeleyDB.4.2; do
4
                 bdbpfx="$bdbpfx $d/$v"
9
                 bdbpfx="$bdbpfx $d/$v"
5
             done
10
             done
6
         done
11
         done
7
-        BDB_VERSIONS="db-4 db4 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
12
-        BDB_VERSIONS="db-4 db4 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
8
+        BDB_VERSIONS="db-4.2 db4.2 db42 ''"
13
-        AC_MSG_CHECKING([for BerkeleyDB > 4.0])
9
         AC_MSG_CHECKING([for BerkeleyDB > 4.0])
14
+	BDB_VERSIONS="db-4.2 db4.2 db42 ''"
15
+        AC_MSG_CHECKING([for BerkeleyDB = 4.2])
10
         for d in $bdbpfx; do
16
         for d in $bdbpfx; do
11
             BDB_INCLUDE_DIR=""
17
             BDB_INCLUDE_DIR=""
18
             BDB_LIB_DIR=""
(-)./scripts/generate-plist (-1 / +2 lines)
Lines 38-47 Link Here
38
share/locale/da/LC_MESSAGES/mutt.mo
38
share/locale/da/LC_MESSAGES/mutt.mo
39
share/locale/de/LC_MESSAGES/mutt.mo
39
share/locale/de/LC_MESSAGES/mutt.mo
40
share/locale/el/LC_MESSAGES/mutt.mo
40
share/locale/el/LC_MESSAGES/mutt.mo
41
share/locale/eu/LC_MESSAGES/mutt.mo
42
share/locale/eo/LC_MESSAGES/mutt.mo
41
share/locale/eo/LC_MESSAGES/mutt.mo
43
share/locale/es/LC_MESSAGES/mutt.mo
42
share/locale/es/LC_MESSAGES/mutt.mo
44
share/locale/et/LC_MESSAGES/mutt.mo
43
share/locale/et/LC_MESSAGES/mutt.mo
44
share/locale/eu/LC_MESSAGES/mutt.mo
45
share/locale/fr/LC_MESSAGES/mutt.mo
45
share/locale/fr/LC_MESSAGES/mutt.mo
46
share/locale/ga/LC_MESSAGES/mutt.mo
46
share/locale/ga/LC_MESSAGES/mutt.mo
47
share/locale/gl/LC_MESSAGES/mutt.mo
47
share/locale/gl/LC_MESSAGES/mutt.mo
Lines 92-97 Link Here
92
%%EXAMPLESDIR%%/colors.default
92
%%EXAMPLESDIR%%/colors.default
93
%%EXAMPLESDIR%%/colors.linux
93
%%EXAMPLESDIR%%/colors.linux
94
%%EXAMPLESDIR%%/gpg.rc
94
%%EXAMPLESDIR%%/gpg.rc
95
%%EXAMPLESDIR%%/mutt_xtitle
95
%%EXAMPLESDIR%%/pgp2.rc
96
%%EXAMPLESDIR%%/pgp2.rc
96
%%EXAMPLESDIR%%/pgp6.rc
97
%%EXAMPLESDIR%%/pgp6.rc
97
%%EXAMPLESDIR%%/sample.mailcap
98
%%EXAMPLESDIR%%/sample.mailcap

Return to bug 111414