[Midnightbsd-cvs] mports: mail/mutt-devel: update to 1.5.16

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Oct 29 14:38:07 EDT 2007 

Log Message:
-----------
update to 1.5.16

Modified Files:
--------------
    mports/mail/mutt-devel:
        Makefile (r1.2 -> r1.3)
        distinfo (r1.1 -> r1.2)
    mports/mail/mutt-devel/files:
        extra-patch-aspell (r1.1 -> r1.2)
        extra-patch-doc-ref (r1.1 -> r1.2)
        extra-patch-doc-xml (r1.1 -> r1.2)
        extra-patch-nodoc-contrib (r1.1 -> r1.2)
        patch-02 (r1.1 -> r1.2)
        patch-Makefile.am (r1.1 -> r1.2)
        patch-examples (r1.1 -> r1.2)
    mports/mail/mutt-devel/scripts:
        generate-plist (r1.1 -> r1.2)

Removed Files:
-------------
    mports/mail/mutt-devel/files:
        patch-hcache-db

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/mail/mutt-devel/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lmail/mutt-devel/Makefile -Lmail/mutt-devel/Makefile -u -r1.2 -r1.3
--- mail/mutt-devel/Makefile
+++ mail/mutt-devel/Makefile
@@ -4,7 +4,7 @@
 # Whom:				  Udo Schweigert
 #
 # $MidnightBSD$
-# $FreeBSD: ports/mail/mutt-devel/Makefile,v 1.272 2006/09/01 13:46:21 garga Exp $
+# $FreeBSD: ports/mail/mutt-devel/Makefile,v 1.289 2007/10/03 23:34:15 edwin Exp $
 #
 # There are several knobs which are used to define additions to the core
 # mutt functionality.
@@ -21,9 +21,9 @@
 # The two most important knobs are:
 #
 # In general you can choose between using ncurses (WITH_MUTT_NCURSES)
-# and SLANG (WITH_MUTT_SLANG) which is the default. Note that you may
-# have to set the variables COLORTERM=yes and COLORFGBG="color1;color2" in your
-# environment to get slang function properly.
+# and SLANG (WITH_MUTT_SLANG). Note that you may have to set the variables
+# COLORTERM=yes and COLORFGBG="color1;color2" in your environment to get slang
+# function properly.
 # The default version for slang is 1.x. Define WITH_MUTT_SLANG2 if you want
 # to use the slang version 2.x
 # The default version for ncurses is that which comes with the operating
@@ -102,13 +102,15 @@
 # If you want to enable the reverse_reply option define:
 #  WITH_MUTT_REVERSE_REPLY_PATCH
 #
-# If you want to enable the assumed_charset option define:
-#  WITH_MUTT_ASSUMED_CHARSET_PATCH
+# If you want to enable the `greeting' option define:
+#  WITH_MUTT_GREETING_PATCH
+#
+# If you want to enable the internal SMTP relay support define:
+#  WITH_MUTT_SMTP
 #
 
 PORTNAME=	mutt-devel
-PORTVERSION=	1.5.13
-PORTREVISION?=	0
+PORTVERSION=	1.5.16
 CATEGORIES+=	mail ipv6
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
@@ -137,7 +139,9 @@
 		http://cedricduval.free.fr/mutt/patches/download/:cd \
 		http://home.woolridge.ca/mutt/patches/:dw \
 		http://www.spinnaker.de/mutt/compressed/:rr \
-		http://www.emaillab.org/mutt/${AC_PATCH_VERSION}/:jp
+		http://www.emaillab.org/mutt/${AC_PATCH_VERSION}/:jp \
+		http://vc.org.ua/mutt/:vc \
+		http://yz.kiev.ua/mutt/:vc
 
 MAINTAINER?=	ports at MidnightBSD.org
 COMMENT?=	The Mongrel of Mail User Agents (development version)
@@ -157,7 +161,7 @@
 CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
 .endif
 
-USE_AUTOTOOLS=	automake:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 autoconf:261
 USE_OPENSSL=	yes
 
 PLIST=		${WRKDIR}/PLIST
@@ -191,6 +195,9 @@
 .if !defined(AC_PATCH_VERSION)
 AC_PATCH_VERSION=	${PORTVERSION}
 .endif
+.if !defined(VC_PATCH_VERSION)
+VC_PATCH_VERSION=	${PORTVERSION}
+.endif
 .if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
 WITH_MUTT_IMAP_HEADER_CACHE=	yes
 .endif
@@ -199,11 +206,7 @@
 IGNORE=	cannot install: the WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_NNTP are not compatible
 .endif
 .endif
-.if defined(WITH_MUTT_ASSUMED_CHARSET_PATCH)
-.if defined(WITH_MUTT_NNTP)
-IGNORE=	cannot install: the WITH_MUTT_ASSUMED_CHARSET_PATCH and WITH_MUTT_NNTP are not compatible
-.endif
-.endif
+SLANG_IS_DEFAULT=	yes
 
 .if defined (MUTT_LITE)
 WITHOUT_MUTT_XML=			yes
@@ -250,7 +253,7 @@
 .if defined(WITH_MUTT_NCURSES_PORT)
 WITH_MUTT_NCURSES=	yes
 .endif
-.if defined(WITH_MUTT_SLANG)
+.if defined(WITH_MUTT_SLANG) || defined(WITH_SLANG)
 MUTT_USES_SLANG=	yes
 MUTT_USES_SLANG1=	yes
 .endif
@@ -262,8 +265,12 @@
 MUTT_USES_NCURSES=	yes
 .endif
 .if !defined(MUTT_USES_SLANG) && !defined(WITHOUT_MUTT_SLANG) && !defined(MUTT_USES_NCURSES)
+.if defined(SLANG_IS_DEFAULT)
 MUTT_USES_SLANG=	yes
 MUTT_USES_SLANG1=	yes
+.elif defined(NCURSES_IS_DEFAULT)
+MUTT_USES_NCURSES=	yes
+.endif
 .endif
 .if defined(WITHOUT_MUTT_SGMLFORMAT)
 XML_USED=	no
@@ -300,8 +307,7 @@
 LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 .endif
 .if defined(WITH_MUTT_IMAP_HEADER_CACHE)
-LIB_DEPENDS+=	db-4.2.2:${PORTSDIR}/databases/db42
-CFLAGS+=	-I${LOCALBASE}/include/db42
+USE_BDB=	42+
 .endif
 .if exists(${LOCALBASE}/lib/libidn.so)
 WITH_MUTT_IDN=	yes
@@ -317,6 +323,7 @@
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook
 .endif
 .if defined(WITH_MUTT_SIGNATURE_MENU)
+IGNORE=	The WITH_MUTT_SIGNATURE_MENU does not work at the moment.
 XML_NEEDED=	yes
 post-patch::
 	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-signature-menu
@@ -374,25 +381,39 @@
 .else
 CONFIGURE_ARGS+=	--disable-gpgme
 .endif
+.if !defined(WITHOUT_GSSAPI)
+.if exists(${LOCALBASE}/bin/krb5-config)
+LIB_DEPENDS+=		gssapi_krb5:${PORTSDIR}/security/krb5
+CONFIGURE_ARGS+=	--with-gss=${LOCALBASE}
+.elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a)
+CONFIGURE_ARGS+=	--with-gss
+USE_KRB5_SYS=YES
+.endif
+.endif
+.if defined(WITH_MUTT_SMTP)
+CONFIGURE_ARGS+=	--enable-smtp
+.else
+CONFIGURE_ARGS+=	--disable-smtp
+.endif
 
 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.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.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
@@ -415,7 +436,7 @@
 PATCHFILES+=	p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
 .endif
 .if defined(WITH_MUTT_SIDEBAR_PATCH)
-SIDEBAR_PATCH=	patch-1.5.13.sidebar.20060828.txt
+SIDEBAR_PATCH=	patch-1.5.16.sidebar.20070704.txt
 DISTFILES+=	${SIDEBAR_PATCH}:tchan
 XML_NEEDED=	yes
 pre-patch::
@@ -424,8 +445,8 @@
 		 ${WRKDIR}/patch-sidebar
 	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-sidebar
 .endif
-.if defined(WITH_MUTT_ASSUMED_CHARSET_PATCH)
-PATCHFILES+=	patch-${AC_PATCH_VERSION}.tt.assumed_charset.2.gz:jp
+.if defined(WITH_MUTT_GREETING_PATCH)
+PATCHFILES+=	mutt-${VC_PATCH_VERSION}.vc.greeting:vc
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
@@ -442,6 +463,11 @@
 
 pre-configure::
 	@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
+.if defined(USE_KRB5_SYS)
+	@${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h.in
+	@${REINPLACE_CMD} -e 's|<gssapi/gssapi\.h>|<gssapi.h>|' \
+		${WRKSRC}/imap/auth_gss.c
+.endif
 
 .if defined(MUTT_SLAVE_HTML_PAGES)
 SCRIPTS_ENV+=	MUTT_SLAVE_HTML_PAGES="${MUTT_SLAVE_HTML_PAGES}"
@@ -513,8 +539,8 @@
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-xml
 .endif
 
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/generate-plist > ${PLIST}
+#pre-install:
+#	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/generate-plist > ${PLIST}
 
 post-install:
 	@${ECHO} > ${PKGMESSAGE}
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/mail/mutt-devel/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lmail/mutt-devel/distinfo -Lmail/mutt-devel/distinfo -u -r1.1 -r1.2
--- mail/mutt-devel/distinfo
+++ mail/mutt-devel/distinfo
@@ -1,27 +1,27 @@
-MD5 (mutt/mutt-1.5.13.tar.gz) = 456a138680a6726f14983cb3e9ff4e22
-SHA256 (mutt/mutt-1.5.13.tar.gz) = e0481690c0caf23b5c88359b2dbac70308f8f138663e8fee482b163562fe8da9
-SIZE (mutt/mutt-1.5.13.tar.gz) = 3442681
-MD5 (mutt/patch-1.5.13.rr.compressed.gz) = 2f1d2b9defc3ad81ab3893aefdaa8fe4
-SHA256 (mutt/patch-1.5.13.rr.compressed.gz) = 236ea2ed2c5b0195d1f72647d17de5c4cbe7faf78de4cdeb983ab6799baf2f7d
-SIZE (mutt/patch-1.5.13.rr.compressed.gz) = 10058
-MD5 (mutt/patch-1.5.13.vvv.nntp.gz) = 68af2e3641d2e46546ad29d66781a700
-SHA256 (mutt/patch-1.5.13.vvv.nntp.gz) = bfd8431c35dfd47fe8de502ae93cb9969c18ea464ed1fe832c6443f9e12a5577
-SIZE (mutt/patch-1.5.13.vvv.nntp.gz) = 54834
+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.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
-MD5 (mutt/patch-1.5.13.vvv.initials.gz) = 52df400d31e225c02bea2f575db03b2a
-SHA256 (mutt/patch-1.5.13.vvv.initials.gz) = b6e1dc90fc871ea6227da33f7c69d12175836eac0d98154096f51dfee5568914
-SIZE (mutt/patch-1.5.13.vvv.initials.gz) = 682
-MD5 (mutt/patch-1.5.13.vvv.quote.gz) = 3afa1bb8065ff207420ba9bc4fe2ae8c
-SHA256 (mutt/patch-1.5.13.vvv.quote.gz) = 77f3d497796a1112f1908ac9bdc12babaa6146824e878f8cb284accda0499de7
-SIZE (mutt/patch-1.5.13.vvv.quote.gz) = 1965
+MD5 (mutt/patch-1.5.16.vvv.initials.gz) = ff11da4b723127647c986cd027f7fdd2
+SHA256 (mutt/patch-1.5.16.vvv.initials.gz) = c6788b1092c0ab4f8d28d5e570804bbedf880a4172452b8231da5bed65bb74de
+SIZE (mutt/patch-1.5.16.vvv.initials.gz) = 679
+MD5 (mutt/patch-1.5.16.vvv.quote.gz) = 41f8945f5114687974e2a86bcf415f27
+SHA256 (mutt/patch-1.5.16.vvv.quote.gz) = b08db26c185693aefd0d398eef9cfd8a90a01d627dc5e2223cee2076d2ed0ef3
+SIZE (mutt/patch-1.5.16.vvv.quote.gz) = 2036
 MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
 SHA256 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = ec9511b86a595f9b4f1f96b05d9e9e12e997bc62b0a0f2b5a36e2817dee61406
 SIZE (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 6405
-MD5 (mutt/patch-1.5.13.sidebar.20060828.txt) = b1e18dcdfdb33cfcf8965f332b9f3f9f
-SHA256 (mutt/patch-1.5.13.sidebar.20060828.txt) = bafb6fed5057d1b78544a06c192bc67fca259c5cccd15312b292824849e3aa20
-SIZE (mutt/patch-1.5.13.sidebar.20060828.txt) = 49483
-MD5 (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 45cacc5155f1865ace31c72e2bffee63
-SHA256 (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 41ae6d049d2d39c3bb01d534a760372ec571bc51e90c259f529c477aa41d3d7e
-SIZE (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 2555
+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
Index: patch-examples
===================================================================
RCS file: /home/cvs/mports/mail/mutt-devel/files/patch-examples,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lmail/mutt-devel/files/patch-examples -Lmail/mutt-devel/files/patch-examples -u -r1.1 -r1.2
--- mail/mutt-devel/files/patch-examples
+++ mail/mutt-devel/files/patch-examples
@@ -48,14 +48,14 @@
    ** (S/MIME only)
    */
    { "smime_verify_command", 	DT_STR, R_NONE, UL &SmimeVerifyCommand, 0},
---- Makefile.am.orig	Wed Aug 30 14:30:28 2006
-+++ Makefile.am	Wed Aug 30 14:31:49 2006
+--- Makefile.am.orig	Mon Apr  9 15:21:50 2007
++++ Makefile.am	Mon Apr  9 15:24:06 2007
 @@ -13,7 +13,7 @@
  
  bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
  
--BUILT_SOURCES = keymap_defs.h patchlist.c
-+BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc
+-BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h
++BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h Muttrc
  
  bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
  mutt_SOURCES = $(BUILT_SOURCES) \
@@ -77,27 +77,27 @@
  
  into your system's global Muttrc, which normally resides in /etc or
  /usr/local/etc.
---- doc/manual.txt.orig	Mon Aug 14 16:10:04 2006
-+++ doc/manual.txt	Wed Aug 30 14:34:46 2006
-@@ -5971,8 +5971,8 @@
- 
-    For examples on how to configure these formats for the various versions of
-    PGP which are floating around, see the pgp*.rc and gpg.rc files in the
--   samples/ subdirectory which has been installed on your system alongside the
--   documentation. (PGP only)
-+   share/examples/mutt/ subdirectory which has been installed on your system
-+   alongside the documentation. (PGP only)
+--- doc/manual.txt.orig	Fri Feb 23 18:15:51 2007
++++ doc/manual.txt	Wed Feb 28 14:30:48 2007
+@@ -6219,8 +6219,8 @@
+ 
+    For examples on how to configure these formats for the various
+    versions of PGP which are floating around, see the pgp*.rc and gpg.rc
+-   files in the samples/ subdirectory which has been installed on your
+-   system alongside the documentation. (PGP only)
++   files in the share/examples/mutt/ subdirectory which has been installed
++   on your system alongside the documentation. (PGP only)
  
  3.163. pgp_getkeys_command
  
-@@ -6164,8 +6164,8 @@
-           "-CAfile $smime_ca_location".
+@@ -6418,8 +6418,8 @@
+           $$ssmmiimmee__ccaa__llooccaattiioonn" or "-CAfile $$ssmmiimmee__ccaa__llooccaattiioonn".
  
-    For examples on how to configure these formats, see the smime.rc in the
--   samples/ subdirectory which has been installed on your system alongside the
--   documentation. (S/MIME only)
-+   share/examples/mutt/ subdirectory which has been installed on your system
-+   alongside the documentation. (S/MIME only)
+    For examples on how to configure these formats, see the smime.rc in
+-   the samples/ subdirectory which has been installed on your system
+-   alongside the documentation. (S/MIME only)
++   the share/examples/mutt/ subdirectory which has been installed on your
++   system alongside the documentation. (S/MIME only)
  
  3.182. smime_verify_command
  
Index: extra-patch-doc-xml
===================================================================
RCS file: /home/cvs/mports/mail/mutt-devel/files/extra-patch-doc-xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lmail/mutt-devel/files/extra-patch-doc-xml -Lmail/mutt-devel/files/extra-patch-doc-xml -u -r1.1 -r1.2
--- mail/mutt-devel/files/extra-patch-doc-xml
+++ mail/mutt-devel/files/extra-patch-doc-xml
@@ -1,11 +1,11 @@
---- doc/Makefile.in.orig2	Mon Jul 17 15:50:28 2006
-+++ doc/Makefile.in	Mon Jul 17 15:50:57 2006
-@@ -71,7 +71,7 @@
+--- doc/Makefile.am.orig2	Tue Mar  6 17:40:41 2007
++++ doc/Makefile.am	Tue Mar  6 17:42:51 2007
+@@ -42,7 +42,7 @@
  all: ../makedoc$(EXEEXT)
  	$(MAKE) makedoc-all
  
 -makedoc-all: mutt.1 muttrc.man
 +makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
  
- install: makedoc-all instdoc
+ install-data-local: makedoc-all instdoc
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
Index: patch-02
===================================================================
RCS file: /home/cvs/mports/mail/mutt-devel/files/patch-02,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lmail/mutt-devel/files/patch-02 -Lmail/mutt-devel/files/patch-02 -u -r1.1 -r1.2
--- mail/mutt-devel/files/patch-02
+++ mail/mutt-devel/files/patch-02
@@ -1,36 +1,15 @@
---- doc/Makefile.am.orig	Mon Aug 14 16:06:21 2006
-+++ doc/Makefile.am	Wed Aug 30 14:52:04 2006
-@@ -63,9 +63,6 @@
- 		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
- 	done
- 	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
--	-for f in $(HTML_DOCFILES) ; do \
--		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
--	done
- 
- uninstall-local:
- 	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
-@@ -82,7 +79,7 @@
- 
- check:
- manual.txt: manual.html
--	-lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
-+	-lynx -dump -nolist -with_backspaces manual.html > $@ || w3m -dump $^ > $@
- 
- manual.html: $(srcdir)/html.xsl stamp-doc-xml
- 	-xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
---- doc/Makefile.in.orig1	Wed Jul  5 10:40:07 2006
-+++ doc/Makefile.in	Mon Jul 17 15:49:28 2006
-@@ -71,7 +71,7 @@
- all: ../makedoc$(EXEEXT)
+--- doc/Makefile.am.orig	Wed Jun 13 10:15:07 2007
++++ doc/Makefile.am	Wed Jun 13 10:17:15 2007
+@@ -41,7 +41,7 @@
+ all:
  	$(MAKE) makedoc-all
  
 -makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
 +makedoc-all: mutt.1 muttrc.man
  
- install: makedoc-all instdoc
+ install-data-local: makedoc-all instdoc
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -92,9 +92,6 @@
+@@ -62,9 +62,6 @@
  		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
  	done
  	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
@@ -38,13 +17,15 @@
 -		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
 -	done
  
- uninstall:
+ uninstall-local:
  	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
-@@ -111,7 +108,7 @@
+@@ -81,9 +78,7 @@
  
  check:
  manual.txt: manual.html
--	-lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
+-	-lynx -dump -nolist -with_backspaces $^ > $@ || \
+-	w3m -dump $^ > $@ || \
+-	elinks -dump -no-numbering -no-references $^ > $@
 +	-lynx -dump -nolist -with_backspaces manual.html > $@
  
  manual.html: $(srcdir)/html.xsl stamp-doc-xml
Index: extra-patch-doc-ref
===================================================================
RCS file: /home/cvs/mports/mail/mutt-devel/files/extra-patch-doc-ref,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lmail/mutt-devel/files/extra-patch-doc-ref -Lmail/mutt-devel/files/extra-patch-doc-ref -u -r1.1 -r1.2
--- mail/mutt-devel/files/extra-patch-doc-ref
+++ mail/mutt-devel/files/extra-patch-doc-ref
@@ -1,12 +1,12 @@
---- doc/mutt.man.orig	Mon Jul 13 12:50:38 1998
-+++ doc/mutt.man	Thu Oct  1 22:15:40 1998
-@@ -20,7 +20,8 @@
- .SH DESCRIPTION
- Mutt is a small but very powerful text based program for reading electronic
- mail under unix operating systems, including support color terminals, MIME,
--and a threaded sorting mode.
-+and a threaded sorting mode.  Details of how to use all of this is
+--- doc/mutt.man.orig	Wed Apr  4 07:37:13 2007
++++ doc/mutt.man	Mon Apr  9 15:39:36 2007
+@@ -57,7 +57,8 @@
+ .PP
+ Mutt is a small but very powerful text based program for reading and sending electronic
+ mail under unix operating systems, including support for color terminals, MIME,
+-OpenPGP, and a threaded sorting mode.
++OpenPGP, and a threaded sorting mode. Details of how to use all of this is
 +available in \fI${DOCSDIR}\fP.
  .SH OPTIONS
- .IP "-a \fIfile\fP"
- Attach a file to your message using MIME.
+ .PP
+ .IP "-A \fIalias\fP"
Index: patch-Makefile.am
===================================================================
RCS file: /home/cvs/mports/mail/mutt-devel/files/patch-Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lmail/mutt-devel/files/patch-Makefile.am -Lmail/mutt-devel/files/patch-Makefile.am -u -r1.1 -r1.2
--- mail/mutt-devel/files/patch-Makefile.am
+++ mail/mutt-devel/files/patch-Makefile.am
@@ -1,10 +1,10 @@
---- Makefile.am.orig2	Fri Sep  1 14:27:36 2006
-+++ Makefile.am	Fri Sep  1 14:28:47 2006
-@@ -145,16 +145,12 @@
+--- Makefile.am.orig	Wed Feb 28 14:24:22 2007
++++ Makefile.am	Wed Feb 28 14:26:20 2007
+@@ -146,16 +146,12 @@
  install-data-local: Muttrc
  	$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
- 	$(INSTALL) -m644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
--	$(INSTALL) -m644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist
+ 	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
+-	$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist
  	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
  		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
  	elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
Index: extra-patch-aspell
===================================================================
RCS file: /home/cvs/mports/mail/mutt-devel/files/extra-patch-aspell,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lmail/mutt-devel/files/extra-patch-aspell -Lmail/mutt-devel/files/extra-patch-aspell -u -r1.1 -r1.2
--- mail/mutt-devel/files/extra-patch-aspell
+++ mail/mutt-devel/files/extra-patch-aspell
@@ -1,5 +1,5 @@
---- Muttrc.head.in.orig	Thu Jan 24 13:10:47 2002
-+++ Muttrc.head.in	Tue Nov  9 08:53:14 2004
+--- Muttrc.head.orig	Thu Jan 24 13:10:47 2002
++++ Muttrc.head	Tue Nov  9 08:53:14 2004
 @@ -19,6 +19,8 @@
  macro index   <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
  macro pager   <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
Index: extra-patch-nodoc-contrib
===================================================================
RCS file: /home/cvs/mports/mail/mutt-devel/files/extra-patch-nodoc-contrib,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lmail/mutt-devel/files/extra-patch-nodoc-contrib -Lmail/mutt-devel/files/extra-patch-nodoc-contrib -u -r1.1 -r1.2
--- mail/mutt-devel/files/extra-patch-nodoc-contrib
+++ mail/mutt-devel/files/extra-patch-nodoc-contrib
@@ -9,9 +9,9 @@
  
  bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
  
---- doc/Makefile.in.orig	Sun Sep 18 16:56:56 2005
-+++ doc/Makefile.in	Sun Sep 18 17:00:01 2005
-@@ -81,14 +81,6 @@
+--- doc/Makefile.am.orig3	Tue Mar  6 17:51:02 2007
++++ doc/Makefile.am	Tue Mar  6 17:51:45 2007
+@@ -55,14 +55,6 @@
  	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
  	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
  	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
@@ -24,5 +24,5 @@
 -	done
 -	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
  
- uninstall:
+ uninstall-local:
  	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
--- mail/mutt-devel/files/patch-hcache-db
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig2	Tue Feb  8 09:02:55 2005
-+++ configure.in	Tue Feb  8 09:04:01 2005
-@@ -811,7 +811,7 @@
-                 bdbpfx="$bdbpfx $d/$v"
-             done
-         done
--        BDB_VERSIONS="db-4 db4 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
-+        BDB_VERSIONS="db-4.2 db4.2 db42 ''"
-         AC_MSG_CHECKING([for BerkeleyDB > 4.0])
-         for d in $bdbpfx; do
-             BDB_INCLUDE_DIR=""
Index: generate-plist
===================================================================
RCS file: /home/cvs/mports/mail/mutt-devel/scripts/generate-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lmail/mutt-devel/scripts/generate-plist -Lmail/mutt-devel/scripts/generate-plist -u -r1.1 -r1.2
--- mail/mutt-devel/scripts/generate-plist
+++ mail/mutt-devel/scripts/generate-plist
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/mail/mutt-devel/scripts/generate-plist,v 1.36 2006/07/18 15:16:43 erwin Exp $
+# $FreeBSD: ports/mail/mutt-devel/scripts/generate-plist,v 1.38 2007/04/11 20:11:51 miwi Exp $
 #
 # set -x
 
@@ -38,10 +38,10 @@
 share/locale/da/LC_MESSAGES/mutt.mo
 share/locale/de/LC_MESSAGES/mutt.mo
 share/locale/el/LC_MESSAGES/mutt.mo
-share/locale/eu/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/eu/LC_MESSAGES/mutt.mo
 share/locale/fr/LC_MESSAGES/mutt.mo
 share/locale/ga/LC_MESSAGES/mutt.mo
 share/locale/gl/LC_MESSAGES/mutt.mo
@@ -92,6 +92,7 @@
 %%EXAMPLESDIR%%/colors.default
 %%EXAMPLESDIR%%/colors.linux
 %%EXAMPLESDIR%%/gpg.rc
+%%EXAMPLESDIR%%/mutt_xtitle
 %%EXAMPLESDIR%%/pgp2.rc
 %%EXAMPLESDIR%%/pgp6.rc
 %%EXAMPLESDIR%%/sample.mailcap
@@ -133,6 +134,7 @@
     echo "%%DOCSDIR%%/html/mimesupport.html" >> $tmp_first
     echo "%%DOCSDIR%%/html/miscellany.html" >> $tmp_first
     echo "%%DOCSDIR%%/html/reference.html" >> $tmp_first
+    echo "%%DOCSDIR%%/html/tuning.html" >> $tmp_first
     if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then
       echo "%%DOCSDIR%%/html/compressed-folders.html" >> $tmp_first
     fi

More information about the Midnightbsd-cvs mailing list