aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2007-07-06 15:26:40 +0800
committermiwi <miwi@FreeBSD.org>2007-07-06 15:26:40 +0800
commit1826a96f44f4f2b9d0ec6dc99ea8d086703ae9ae (patch)
tree5e8725985919acf9b2e70ac07c9a4f83e773b033 /mail
parentdd48de83b64f5090fbe1a70de11d7497fde8432b (diff)
downloadfreebsd-ports-gnome-1826a96f44f4f2b9d0ec6dc99ea8d086703ae9ae.tar.gz
freebsd-ports-gnome-1826a96f44f4f2b9d0ec6dc99ea8d086703ae9ae.tar.zst
freebsd-ports-gnome-1826a96f44f4f2b9d0ec6dc99ea8d086703ae9ae.zip
- Fix errors in compressed folders and NNTP support which possibly caused SIGSEGV.
- Fix SIDEBAR_PATCH PR: 114298 Submitted by: Udo Schweigert <Udo.Schweigert@siemens.com> (maintainer)
Diffstat (limited to 'mail')
-rw-r--r--mail/mutt-devel/Makefile13
-rw-r--r--mail/mutt-devel/distinfo15
2 files changed, 15 insertions, 13 deletions
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index bce808a48282..7df10dd92115 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -107,7 +107,7 @@
PORTNAME= mutt-devel
PORTVERSION= 1.5.16
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES+= mail ipv6
.if defined(WITH_MUTT_NNTP)
CATEGORIES+= news
@@ -199,7 +199,6 @@ VC_PATCH_VERSION= ${PORTVERSION}
WITH_MUTT_IMAP_HEADER_CACHE= yes
.endif
.if defined(WITH_MUTT_SIDEBAR_PATCH)
-IGNORE= the WITH_MUTT_SIDEBAR_PATCH does not work at the moment
.if defined(WITH_MUTT_NNTP)
IGNORE= cannot install: the WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_NNTP are not compatible
.endif
@@ -387,21 +386,21 @@ USE_KRB5_SYS=YES
PATCH_DIST_STRIP= -p1
.if ! defined (WITHOUT_MUTT_COMPRESSED_FOLDERS)
-DISTFILES+= patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv
+DISTFILES+= patch-${RR_PATCH_VERSION}.rr.compressed.2.gz:vvv
CONFIGURE_ARGS+= --enable-compressed
XML_NEEDED= yes
pre-patch::
- @${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.gz > ${WRKDIR}/patch-compressed
+ @${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.2.gz > ${WRKDIR}/patch-compressed
@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
${WRKDIR}/patch-compressed
@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-compressed
.endif
.if defined(WITH_MUTT_NNTP)
-DISTFILES+= patch-${VVV_PATCH_VERSION}.vvv.nntp.2.gz:vvv
+DISTFILES+= patch-${VVV_PATCH_VERSION}.vvv.nntp.3.gz:vvv
CONFIGURE_ARGS+= --enable-nntp
XML_NEEDED= yes
pre-patch::
- @${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.2.gz > ${WRKDIR}/patch-nntp
+ @${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.3.gz > ${WRKDIR}/patch-nntp
@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
${WRKDIR}/patch-nntp
@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp
@@ -424,7 +423,7 @@ pre-patch::
PATCHFILES+= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
.endif
.if defined(WITH_MUTT_SIDEBAR_PATCH)
-SIDEBAR_PATCH= patch-1.5.15.sidebar.20070408.txt
+SIDEBAR_PATCH= patch-1.5.16.sidebar.20070704.txt
DISTFILES+= ${SIDEBAR_PATCH}:tchan
XML_NEEDED= yes
pre-patch::
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 2cce123ea8d0..40f8774b07dc 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,12 +1,12 @@
MD5 (mutt/mutt-1.5.16.tar.gz) = 10eff7024dbb7ce1f773d688a69ea9db
SHA256 (mutt/mutt-1.5.16.tar.gz) = 825e920b394db6f56fa8deb45977c061331f59d953944e27ff595625bbad3e83
SIZE (mutt/mutt-1.5.16.tar.gz) = 3534894
-MD5 (mutt/patch-1.5.16.rr.compressed.gz) = 37c6bc11b35ef49d098de891c51a810c
-SHA256 (mutt/patch-1.5.16.rr.compressed.gz) = fc0cc13df532eef75e7c39849f7de0898af7f57fc0566786e71d8142e022cc3b
-SIZE (mutt/patch-1.5.16.rr.compressed.gz) = 10110
-MD5 (mutt/patch-1.5.16.vvv.nntp.2.gz) = bc0358da1d71ddd0b3c8bc11bd32259a
-SHA256 (mutt/patch-1.5.16.vvv.nntp.2.gz) = dd9153f35099fd7686698541ff40fdcc79cea9e9154ca2000b9e818573c968da
-SIZE (mutt/patch-1.5.16.vvv.nntp.2.gz) = 55176
+MD5 (mutt/patch-1.5.16.rr.compressed.2.gz) = 555677215aae09cb48cae2dcf7a41182
+SHA256 (mutt/patch-1.5.16.rr.compressed.2.gz) = 64e119a50a6eb72ab6893ef8a1af8d196567116c123fbce7e0afc825c19aa65e
+SIZE (mutt/patch-1.5.16.rr.compressed.2.gz) = 10117
+MD5 (mutt/patch-1.5.16.vvv.nntp.3.gz) = 93a828111ce0b17d80ee9f6396708552
+SHA256 (mutt/patch-1.5.16.vvv.nntp.3.gz) = fe71626d7a91f85e0434a866c7a1b31cbd6866d6d006c5214b7a39d834b5ac16
+SIZE (mutt/patch-1.5.16.vvv.nntp.3.gz) = 55200
MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa
SHA256 (mutt/patch-1.5.4.cd.ifdef.1) = 7d11892bcc688bbc82b5996ca0fda2d4446d8e928bec50b2731f8a3a5d9be373
SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545
@@ -22,3 +22,6 @@ SIZE (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 6405
MD5 (mutt/mutt-1.5.16.vc.greeting) = 4bd9beeb74d075e4418e86e8ed887aa0
SHA256 (mutt/mutt-1.5.16.vc.greeting) = cf05aeab5f1813864aa72b68f59a579c46dacf2fbd8e5fd064b920012320b986
SIZE (mutt/mutt-1.5.16.vc.greeting) = 4526
+MD5 (mutt/patch-1.5.16.sidebar.20070704.txt) = e6e1a6e258ec6ce6ee489b0f3ff8e2cf
+SHA256 (mutt/patch-1.5.16.sidebar.20070704.txt) = 49123e14bebd33d0e8c7733cab319f3e5bfa591d5f5d74a3dd8964b44bf34ae7
+SIZE (mutt/patch-1.5.16.sidebar.20070704.txt) = 51103