Date: Tue, 26 Feb 2002 12:43:25 +0100 (CET) From: Udo Schweigert <udo.schweigert@siemens.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/35342: maintainer-update of mail/mutt-devel Message-ID: <200202261143.g1QBhPwB075081@reims.mchp.siemens.de>
next in thread | raw e-mail | index | archive | help
>Number: 35342 >Category: ports >Synopsis: maintainer-update of mail/mutt-devel >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Feb 26 03:50:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Udo Schweigert >Release: FreeBSD 4.5-STABLE i386 >Organization: >Environment: System: FreeBSD alaska.cert.siemens.de 4.5-STABLE FreeBSD 4.5-STABLE #47: Sat Feb 23 13:17:01 CET 2002 ust@alaska.cert.siemens.de:/usr/obj/work/src/RELENG_4/sys/alaska i386 >Description: Update of the mutt-devel port: - Automagically determine when to use sgmlformat. - Add the pgp outlook compat patch via the new knob MUTT_WITH_PGP_OUTLOOK_PATCH which is on by default if pgp is installed. Patch submitted by: Stefan Walter <dunkelkammer@gmx.de> - Fix some trailing whitespaces to make portlint a little happier. - Increment PORTREVISION COMMITTER: new file files/extra-patch-pgp-outlook >How-To-Repeat: >Fix: diff -ruN --exclude=CVS /usr/ports/mail/mutt-devel/Makefile mutt-devel/Makefile --- /usr/ports/mail/mutt-devel/Makefile Tue Jan 29 21:50:37 2002 +++ mutt-devel/Makefile Tue Feb 26 12:24:53 2002 @@ -9,10 +9,10 @@ # There are several knobs which are used to define additions to the core # mutt functionality. The two most important are: # -# In general you can choose between using the SLANG port (which is really +# In general you can choose between using the SLANG port (which is really # recommended and is now the default) and ncurses (WITH_MUTT_NCURSES). If you # don't want to use SLANG define WITHOUT_MUTT_SLANG. -# +# # If you want to install the mutt documentation in html format define: # WITH_MUTT_HTML # @@ -23,7 +23,7 @@ # # If you want to read news with mutt define: # WITH_MUTT_NNTP -# (note that this implies building of the inn-stable port to be able to +# (note that this implies building of the inn-stable port to be able to # post new articles) # # WITH_MUTT_SSL can be enabled if your IMAP/POP server is SSL capable. @@ -40,11 +40,13 @@ # # If you want to enable extended functions for the ru locale define: # WITH_MUTT_RU_PATCH - +# +# If you want to enable the pgp_outlook_compat function for use with pgp define: +# MUTT_WITH_PGP_OUTLOOK_PATCH PORTNAME= mutt-devel PORTVERSION= 1.3.27 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES+= mail .if defined(WITH_MUTT_NNTP) CATEGORIES+= news @@ -54,10 +56,8 @@ ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \ ftp://ftp.parodius.com/pub/mutt/devel/ \ ftp://ftp.mutt.org/pub/mutt/ \ - ftp://ftp.mutt.org/pub/mutt/devel/ - + ftp://ftp.mutt.org/pub/mutt/devel/ DISTNAME= mutt-${PORTVERSION}i -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= udo.schweigert@siemens.com @@ -114,15 +114,18 @@ .if !defined(USE_SLANG) && !defined(WITHOUT_MUTT_SLANG) && !defined(USE_NCURSES) USE_SLANG= yes .endif +.if defined(WITHOUT_MUTT_SGMLFORMAT) +SGML_USED= no +.endif +.if !defined(SGML_USED) +SGML_USED= no +.endif LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \ giconv.2:${PORTSDIR}/converters/libiconv .if defined(NOPORTDOCS) -WITHOUT_MUTT_SGMLFORMAT= yes -.endif -.if !defined(WITHOUT_MUTT_SGMLFORMAT) -BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat +SGML_USED= no .endif .if defined(USE_SLANG) LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang @@ -141,6 +144,13 @@ .if defined(WITH_MUTT_CYRUS_SASL) LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl .endif +.if exists(${LOCALBASE}/bin/pgp) +MUTT_WITH_PGP_OUTLOOK_PATCH= yes +.endif +.if defined(MUTT_WITH_PGP_OUTLOOK_PATCH) +pre-configure:: + ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-pgp-outlook +.endif CONFIGURE_ARGS+= --enable-pop --enable-imap .if defined(WITH_MUTT_LOCALES_FIX) @@ -163,6 +173,9 @@ .if defined(WITH_MUTT_COMPRESSED_FOLDERS) PATCHFILES+= patch-${PATCH_VERSION}.rr.compressed.gz CONFIGURE_ARGS+= --enable-compressed +.if !defined(WITHOUT_MUTT_SGMLFORMAT) +SGML_USED= yes +.endif .endif .if defined(WITH_MUTT_NNTP) PATCHFILES+= patch-${PATCH_VERSION}.vvv.nntp.gz @@ -193,19 +206,15 @@ printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \ ed -s ${WRKSRC}/doc/mutt.man .if defined(WITH_MUTT_NNTP) +.if !defined(WITHOUT_MUTT_SGMLFORMAT) +SGML_USED= yes +.endif PLIST_SUB+= SUB_NNTP="" .else PLIST_SUB+= SUB_NNTP="@comment " .endif -.if defined(WITHOUT_MUTT_SGMLFORMAT) -.if defined(WITH_MUTT_HTML) -.error You can't say both: WITH_MUTT_HTML and WITHOUT_MUTT_SGMLFORMAT -.endif -PLIST_SUB+= SUB_SGML="@comment " -.else -PLIST_SUB+= SUB_SGML="" -.endif .if defined(WITH_MUTT_HTML) +SGML_USED= yes PLIST_SUB+= SUB_HTML="" .if defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \ defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) @@ -373,7 +382,6 @@ .else # NOPORTDOCS PLIST_SUB+= SUB_HTML="@comment " PLIST_SUB+= SUB_NNTP="@comment " -PLIST_SUB+= SUB_SGML="@comment " PLIST_SUB+= SUB_ADD_A="@comment " PLIST_SUB+= SUB_ADD_B="@comment " PLIST_SUB+= SUB_ADD_C="@comment " @@ -382,10 +390,18 @@ PLIST_SUB+= SUB_ADD_F="@comment " PLIST_SUB+= SUB_ADD_G="@comment " post-patch:: - ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib .endif +.if ${SGML_USED} == yes +BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat +post-patch:: + ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-sgmlformat +PLIST_SUB+= SUB_SGML="" +.else +PLIST_SUB+= SUB_SGML="@comment " +.endif + post-install: @strip ${PREFIX}/bin/mutt .if !defined(NOPORTDOCS) @@ -395,7 +411,7 @@ @cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt \ PGP-Notes.txt ../ABOUT-NLS ../contrib/language* \ ${PREFIX}/share/doc/mutt -.if !defined(WITHOUT_MUTT_SGMLFORMAT) +.if ${SGML_USED} == yes @cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.latin1 \ ${PREFIX}/share/doc/mutt .endif @@ -407,17 +423,16 @@ @${MKDIR} ${PREFIX}/share/doc/mutt/html && \ ${CHMOD} a+rx ${PREFIX}/share/doc/mutt/html ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html - ${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt .endif .endif .if defined(WITH_MUTT_NNTP) - @${ECHO} + @${ECHO} @${ECHO} "------------------------------------------------" @${ECHO} "Be sure to define NNTPSERVER in your environment" @${ECHO} "and to be part of the group news in /etc/group" @${ECHO} "if you want to post news with mutt" @${ECHO} "------------------------------------------------" - @${ECHO} + @${ECHO} .endif .include <bsd.port.post.mk> diff -ruN --exclude=CVS /usr/ports/mail/mutt-devel/files/extra-patch-pgp-outlook mutt-devel/files/extra-patch-pgp-outlook --- /usr/ports/mail/mutt-devel/files/extra-patch-pgp-outlook Thu Jan 1 01:00:00 1970 +++ mutt-devel/files/extra-patch-pgp-outlook Tue Feb 26 11:53:07 2002 @@ -0,0 +1,82 @@ +--- init.h.orig Mon Feb 12 08:54:57 2001 ++++ init.h Sat Feb 24 18:03:32 2001 +@@ -1227,6 +1227,13 @@ + ** \fBdeprecated\fP. + */ + ++ { "pgp_outlook_compat", DT_QUAD, R_NONE, OPT_PGPOUTLOOK, M_NO }, ++ /* ++ ** .pp ++ ** If pgp_create_traditional is defined above, this option causes mutt ++ ** to generate messages readable by users of MS Outlook using PGP. ++ */ ++ + /* XXX Default values! */ + + { "pgp_decode_command", DT_STR, R_NONE, UL &PgpDecodeCommand, 0}, +--- mutt.h.orig Mon Feb 12 08:52:29 2001 ++++ mutt.h Sat Feb 24 18:05:56 2001 +@@ -249,7 +249,9 @@ + #ifdef HAVE_PGP + OPT_VERIFYSIG, /* verify PGP signatures */ + OPT_PGPTRADITIONAL, /* create old-style PGP messages */ ++ OPT_PGPOUTLOOK, /* Create even older broken outlook compatible messages */ + #endif ++ + + OPT_PRINT, + OPT_INCLUDE, +--- pgp.c.orig Mon Feb 12 08:55:21 2001 ++++ pgp.c Sat Feb 24 18:11:40 2001 +@@ -1501,12 +1501,20 @@ + + b->encoding = ENC7BIT; + +- b->type = TYPEAPPLICATION; +- b->subtype = safe_strdup ("pgp"); +- +- mutt_set_parameter ("format", "text", &b->parameter); +- mutt_set_parameter ("x-action", flags & PGPENCRYPT ? "encrypt" : "sign", +- &b->parameter); ++ /* Outlook seems to work by scanning the message itself for PGP information, */ ++ /* not the headers. If the headers are anything but text/plain, it will */ ++ /* not recognize the message. */ ++ if (flags & PGPOUTLOOK) { ++ b->type = TYPETEXT; ++ b->subtype = safe_strdup ("plain"); ++ } else { ++ b->type = TYPEAPPLICATION; ++ b->subtype = safe_strdup ("pgp"); ++ ++ mutt_set_parameter ("format", "text", &b->parameter); ++ mutt_set_parameter ("x-action", flags & PGPENCRYPT ? "encrypt" : "sign", ++ &b->parameter); ++ } + + b->filename = safe_strdup (pgpoutfile); + +@@ -1559,8 +1567,13 @@ + { + if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create an application/pgp message?"))) == -1) + return -1; +- else if (i == M_YES) ++ else if (i == M_YES) { + traditional = 1; ++ if ((i = query_quadoption (OPT_PGPOUTLOOK, _("Create an Outlook compatible message?"))) == -1) ++ return -1; ++ else if (i == M_YES) ++ flags |= PGPOUTLOOK; ++ } + } + + mutt_message _("Invoking PGP..."); +--- pgplib.h.orig Mon Feb 12 08:56:00 2001 ++++ pgplib.h Sat Feb 24 18:12:25 2001 +@@ -23,6 +23,7 @@ + #define PGPSIGN (1 << 1) + #define PGPKEY (1 << 2) + #define PGPGOODSIGN (1 << 3) ++#define PGPOUTLOOK (1 << 4) + + #define KEYFLAG_CANSIGN (1 << 0) + #define KEYFLAG_CANENCRYPT (1 << 1) diff -ruN --exclude=CVS /usr/ports/mail/mutt-devel/files/patch-02 mutt-devel/files/patch-02 --- /usr/ports/mail/mutt-devel/files/patch-02 Wed Jan 23 00:12:14 2002 +++ mutt-devel/files/patch-02 Sat Feb 2 18:43:22 2002 @@ -1,11 +1,11 @@ --- doc/Makefile.in.orig Tue Nov 6 20:12:31 2001 -+++ doc/Makefile.in Tue Jan 22 20:47:07 2002 ++++ doc/Makefile.in Sat Feb 2 17:39:31 2002 @@ -60,13 +60,19 @@ topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \ README NEWS TODO README.SECURITY README.SSL -all: muttrc.man try-html try-txt -+all: muttrc.man try-html try-txt try-latin1 ++all: try-html: ../makedoc - test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200202261143.g1QBhPwB075081>