Upgrade to version 1.2.5.

Submitted by:	Jim

9 files changed, 42 insertions, 48 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index b66c9af42ecc..5ff09453e175 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -7,24 +7,24 @@
 #
 
 PORTNAME=	mutt
-PORTVERSION= 	1.2.4
+PORTVERSION= 	1.2.5
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/  \
-		ftp://ftp.uib.no/pub/mutt/  \
-		ftp://pgp.rasip.fer.hr/pub/mutt/international/  \
-		ftp://ftp.gbnet.net/pub/mutt-international/  \
-		ftp://riemann.iam.uni-bonn.de/pub/mutt/  \
+MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/ \
+		ftp://ftp.uib.no/pub/mutt/ \
+		ftp://pgp.rasip.fer.hr/pub/mutt/international/ \
+		ftp://ftp.gbnet.net/pub/mutt-international/ \
+		ftp://riemann.iam.uni-bonn.de/pub/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/mutt-international/ \
-		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/
 DISTNAME=	${PKGNAME}i
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} charmaps-0.0.tar.gz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-PATCH_SITES=	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-//}/  \
+PATCH_SITES=	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_DIST_STRIP=	-p1
@@ -56,7 +56,7 @@ DIST_SUBDIR=	mutt
 GNU_CONFIGURE=	yes
 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  \
+CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \
 		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${PREFIX}/share/doc/mutt --with-charmaps
 .if defined(WITH_LOCALES_FIX)
@@ -107,8 +107,6 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html
 	${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt
 .endif
-	@cd ${WRKSRC}/contrib ; ${INSTALL_DATA} sample.muttrc Mush.rc Pine.rc \
-		${PREFIX}/share/doc/mutt
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 9e1f1fda9191..08735b479c16 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (mutt/mutt-1.2.4i.tar.gz) = 30968eeb985c074d03078a3d6ae982c9
+MD5 (mutt/mutt-1.2.5i.tar.gz) = 0ba5367059abdd55daceb82dce6be42f
 MD5 (mutt/charmaps-0.0.tar.gz) = e79b9f57da1f6a4d0a63ff60a4ef7da8
diff --git a/mail/mutt-devel/pkg-comment b/mail/mutt-devel/pkg-comment
index c04a3dff7269..ab9538328bb4 100644
--- a/mail/mutt-devel/pkg-comment
+++ b/mail/mutt-devel/pkg-comment
@@ -1 +1 @@
-"The Mongrel of Mail User Agents" (part Elm, Pine, mh)
+The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.)
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index b66c9af42ecc..5ff09453e175 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -7,24 +7,24 @@
 #
 
 PORTNAME=	mutt
-PORTVERSION= 	1.2.4
+PORTVERSION= 	1.2.5
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/  \
-		ftp://ftp.uib.no/pub/mutt/  \
-		ftp://pgp.rasip.fer.hr/pub/mutt/international/  \
-		ftp://ftp.gbnet.net/pub/mutt-international/  \
-		ftp://riemann.iam.uni-bonn.de/pub/mutt/  \
+MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/ \
+		ftp://ftp.uib.no/pub/mutt/ \
+		ftp://pgp.rasip.fer.hr/pub/mutt/international/ \
+		ftp://ftp.gbnet.net/pub/mutt-international/ \
+		ftp://riemann.iam.uni-bonn.de/pub/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/mutt-international/ \
-		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/
 DISTNAME=	${PKGNAME}i
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} charmaps-0.0.tar.gz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-PATCH_SITES=	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-//}/  \
+PATCH_SITES=	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_DIST_STRIP=	-p1
@@ -56,7 +56,7 @@ DIST_SUBDIR=	mutt
 GNU_CONFIGURE=	yes
 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  \
+CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \
 		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${PREFIX}/share/doc/mutt --with-charmaps
 .if defined(WITH_LOCALES_FIX)
@@ -107,8 +107,6 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html
 	${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt
 .endif
-	@cd ${WRKSRC}/contrib ; ${INSTALL_DATA} sample.muttrc Mush.rc Pine.rc \
-		${PREFIX}/share/doc/mutt
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 9e1f1fda9191..08735b479c16 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,2 +1,2 @@
-MD5 (mutt/mutt-1.2.4i.tar.gz) = 30968eeb985c074d03078a3d6ae982c9
+MD5 (mutt/mutt-1.2.5i.tar.gz) = 0ba5367059abdd55daceb82dce6be42f
 MD5 (mutt/charmaps-0.0.tar.gz) = e79b9f57da1f6a4d0a63ff60a4ef7da8
diff --git a/mail/mutt/pkg-comment b/mail/mutt/pkg-comment
index c04a3dff7269..ab9538328bb4 100644
--- a/mail/mutt/pkg-comment
+++ b/mail/mutt/pkg-comment
@@ -1 +1 @@
-"The Mongrel of Mail User Agents" (part Elm, Pine, mh)
+The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.)
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index b66c9af42ecc..5ff09453e175 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -7,24 +7,24 @@
 #
 
 PORTNAME=	mutt
-PORTVERSION= 	1.2.4
+PORTVERSION= 	1.2.5
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/  \
-		ftp://ftp.uib.no/pub/mutt/  \
-		ftp://pgp.rasip.fer.hr/pub/mutt/international/  \
-		ftp://ftp.gbnet.net/pub/mutt-international/  \
-		ftp://riemann.iam.uni-bonn.de/pub/mutt/  \
+MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/ \
+		ftp://ftp.uib.no/pub/mutt/ \
+		ftp://pgp.rasip.fer.hr/pub/mutt/international/ \
+		ftp://ftp.gbnet.net/pub/mutt-international/ \
+		ftp://riemann.iam.uni-bonn.de/pub/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/mutt-international/ \
-		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/
 DISTNAME=	${PKGNAME}i
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} charmaps-0.0.tar.gz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-PATCH_SITES=	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-//}/  \
+PATCH_SITES=	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_DIST_STRIP=	-p1
@@ -56,7 +56,7 @@ DIST_SUBDIR=	mutt
 GNU_CONFIGURE=	yes
 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  \
+CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \
 		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${PREFIX}/share/doc/mutt --with-charmaps
 .if defined(WITH_LOCALES_FIX)
@@ -107,8 +107,6 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html
 	${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt
 .endif
-	@cd ${WRKSRC}/contrib ; ${INSTALL_DATA} sample.muttrc Mush.rc Pine.rc \
-		${PREFIX}/share/doc/mutt
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo
index 9e1f1fda9191..08735b479c16 100644
--- a/mail/mutt14/distinfo
+++ b/mail/mutt14/distinfo
@@ -1,2 +1,2 @@
-MD5 (mutt/mutt-1.2.4i.tar.gz) = 30968eeb985c074d03078a3d6ae982c9
+MD5 (mutt/mutt-1.2.5i.tar.gz) = 0ba5367059abdd55daceb82dce6be42f
 MD5 (mutt/charmaps-0.0.tar.gz) = e79b9f57da1f6a4d0a63ff60a4ef7da8
diff --git a/mail/mutt14/pkg-comment b/mail/mutt14/pkg-comment
index c04a3dff7269..ab9538328bb4 100644
--- a/mail/mutt14/pkg-comment
+++ b/mail/mutt14/pkg-comment
@@ -1 +1 @@
-"The Mongrel of Mail User Agents" (part Elm, Pine, mh)
+The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.)