Date: Wed, 17 Jul 2002 18:53:56 +0200 (CEST) From: Udo Schweigert <udo.schweigert@siemens.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/40698: maintainer-update of mail/mutt-devel Message-ID: <200207171653.g6HGruPc096931@alaska.cert.siemens.de>
next in thread | raw e-mail | index | archive | help
>Number: 40698 >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: Wed Jul 17 10:00:06 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Udo Schweigert >Release: FreeBSD 4.6-STABLE i386 >Organization: >Environment: System: FreeBSD alaska.cert.siemens.de 4.6-STABLE FreeBSD 4.6-STABLE #99: Mon Jul 8 10:18:07 CEST 2002 ust@alaska.cert.siemens.de:/usr/obj/work/src/RELENG_4/sys/alaska i386 >Description: Maintainer update of mail/mutt-devel: - Fix package plist when only using WITH_MUTT_PGP_OUTLOOK_PATCH - Do not use -pedantic in CFLAGS when building the port - Add the new knob WITH_MUTT_EDIT_THREADS (suggested by Roman Neuhauser <neuhauser@bellavista.cz>) >How-To-Repeat: >Fix: diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile --- /usr/ports/mail/mutt-devel/Makefile Tue Jul 9 18:48:49 2002 +++ ./Makefile Wed Jul 17 18:38:10 2002 @@ -49,10 +49,13 @@ # # If you want to enable the pgp_outlook_compat function for use with pgp define: # WITH_MUTT_PGP_OUTLOOK_PATCH +# +# If you want to use the rethreading functions define: +# WITH_MUTT_EDIT_THREADS PORTNAME= mutt-devel PORTVERSION= 1.5.1 -#PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES+= mail .if defined(WITH_MUTT_NNTP) CATEGORIES+= news @@ -88,6 +91,10 @@ ftp://ftp2.mutt.org.ua/pub/mutt/mutt-${PATCH_VERSION}/ .endif +.if defined(WITH_MUTT_EDIT_THREADS) +PATCH_SITES+= http://cedricduval.free.fr/download/mutt/ +.endif + # XXX # this should be done automagically by aclocal but .... # for now, this will have to do @@ -187,6 +194,10 @@ PATCHFILES+= patch-${PATCH_VERSION}.vvv.initials.gz \ patch-${PATCH_VERSION}.vvv.quote.gz .endif +.if defined(WITH_MUTT_EDIT_THREADS) +PATCHFILES+= patch-${PATCH_VERSION}.cd.edit_threads.9.2 +CONFIGURE_ARGS+= --enable-imap-edit-threads +.endif WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} MAN1= flea.1 mutt.1 mutt_dotlock.1 muttbug.1 @@ -225,7 +236,7 @@ PLIST_SUB+= SUB_ADD_D="@comment " PLIST_SUB+= SUB_ADD_E="@comment " PLIST_SUB+= SUB_ADD_F="@comment " -PLIST_SUB+= SUB_PGP_A="@comment " +PLIST_SUB+= SUB_PATCHES="@comment " .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \ !defined(WITH_MUTT_QUOTE_PATCH) PLIST_SUB+= SUB_ADD_F="" @@ -235,7 +246,7 @@ PLIST_SUB+= SUB_ADD_D="@comment " PLIST_SUB+= SUB_ADD_E="@comment " PLIST_SUB+= SUB_ADD_G="@comment " -PLIST_SUB+= SUB_PGP_A="@comment " +PLIST_SUB+= SUB_PATCHES="@comment " .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \ defined(WITH_MUTT_QUOTE_PATCH) PLIST_SUB+= SUB_ADD_C="" @@ -245,7 +256,7 @@ PLIST_SUB+= SUB_ADD_E="@comment " PLIST_SUB+= SUB_ADD_F="@comment " PLIST_SUB+= SUB_ADD_G="@comment " -PLIST_SUB+= SUB_PGP_A="@comment " +PLIST_SUB+= SUB_PATCHES="@comment " .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \ !defined(WITH_MUTT_QUOTE_PATCH) PLIST_SUB+= SUB_ADD_B="" @@ -255,7 +266,7 @@ PLIST_SUB+= SUB_ADD_E="@comment " PLIST_SUB+= SUB_ADD_F="@comment " PLIST_SUB+= SUB_ADD_G="@comment " -PLIST_SUB+= SUB_PGP_A="@comment " +PLIST_SUB+= SUB_PATCHES="@comment " .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \ defined(WITH_MUTT_QUOTE_PATCH) PLIST_SUB+= SUB_ADD_E="" @@ -265,7 +276,7 @@ PLIST_SUB+= SUB_ADD_D="@comment " PLIST_SUB+= SUB_ADD_F="@comment " PLIST_SUB+= SUB_ADD_G="@comment " -PLIST_SUB+= SUB_PGP_A="@comment " +PLIST_SUB+= SUB_PATCHES="@comment " .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \ !defined(WITH_MUTT_QUOTE_PATCH) PLIST_SUB+= SUB_ADD_D="" @@ -275,7 +286,7 @@ PLIST_SUB+= SUB_ADD_E="@comment " PLIST_SUB+= SUB_ADD_F="@comment " PLIST_SUB+= SUB_ADD_G="@comment " -PLIST_SUB+= SUB_PGP_A="@comment " +PLIST_SUB+= SUB_PATCHES="@comment " .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \ defined(WITH_MUTT_QUOTE_PATCH) PLIST_SUB+= SUB_ADD_A="" @@ -285,7 +296,7 @@ PLIST_SUB+= SUB_ADD_E="@comment " PLIST_SUB+= SUB_ADD_F="@comment " PLIST_SUB+= SUB_ADD_G="@comment " -PLIST_SUB+= SUB_PGP_A="@comment " +PLIST_SUB+= SUB_PATCHES="@comment " .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \ !defined(WITH_MUTT_QUOTE_PATCH) PLIST_SUB+= SUB_ADD_A="@comment " @@ -295,7 +306,7 @@ PLIST_SUB+= SUB_ADD_E="@comment " PLIST_SUB+= SUB_ADD_F="@comment " PLIST_SUB+= SUB_ADD_G="@comment " -PLIST_SUB+= SUB_PGP_A="@comment " +PLIST_SUB+= SUB_PATCHES="" .else # patches PLIST_SUB+= SUB_ADD_A="@comment " PLIST_SUB+= SUB_ADD_B="@comment " @@ -304,7 +315,7 @@ PLIST_SUB+= SUB_ADD_E="@comment " PLIST_SUB+= SUB_ADD_F="@comment " PLIST_SUB+= SUB_ADD_G="@comment " -PLIST_SUB+= SUB_PGP_A="" +PLIST_SUB+= SUB_PATCHES="" .endif .else # HTML PLIST_SUB+= SUB_HTML="@comment " @@ -315,7 +326,7 @@ PLIST_SUB+= SUB_ADD_E="@comment " PLIST_SUB+= SUB_ADD_F="@comment " PLIST_SUB+= SUB_ADD_G="@comment " -PLIST_SUB+= SUB_PGP_A="@comment " +PLIST_SUB+= SUB_PATCHES="@comment " .endif .else # NOPORTDOCS PLIST_SUB+= SUB_HTML="@comment " @@ -327,14 +338,24 @@ PLIST_SUB+= SUB_ADD_E="@comment " PLIST_SUB+= SUB_ADD_F="@comment " PLIST_SUB+= SUB_ADD_G="@comment " -PLIST_SUB+= SUB_PGP_A="@comment " +PLIST_SUB+= SUB_PATCHES="@comment " post-patch:: ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib .endif -.if defined(WITH_MUTT_PGP_OUTLOOK_PATCH) +.if defined(WITH_MUTT_PGP_OUTLOOK_PATCH) && !defined(WITH_MUTT_EDIT_THREADS) PLIST_SUB+= SUB_PGP="" .else PLIST_SUB+= SUB_PGP="@comment " +.endif +.if defined(WITH_MUTT_EDIT_THREADS) && !defined(WITH_MUTT_PGP_OUTLOOK_PATCH) +PLIST_SUB+= SUB_THREAD="" +.else +PLIST_SUB+= SUB_THREAD="@comment " +.endif +.if defined(WITH_MUTT_EDIT_THREADS) && defined(WITH_MUTT_PGP_OUTLOOK_PATCH) +PLIST_SUB+= SUB_THREAD_PGP="" +.else +PLIST_SUB+= SUB_THREAD_PGP="@comment " .endif .if ${SGML_USED} == yes BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat diff -ru /usr/ports/mail/mutt-devel/distinfo ./distinfo --- /usr/ports/mail/mutt-devel/distinfo Sun Jun 16 15:05:25 2002 +++ ./distinfo Wed Jul 17 14:59:59 2002 @@ -3,3 +3,4 @@ MD5 (mutt/patch-1.5.1.vvv.nntp.gz) = 5bce8bf3d320808cfa7b822ebcc5086d MD5 (mutt/patch-1.5.1.vvv.initials.gz) = 39cd4f8beff1664a3078d4a1a08c7b5e MD5 (mutt/patch-1.5.1.vvv.quote.gz) = 83aa6b5a9c1117d7f15df0c59037c318 +MD5 (mutt/patch-1.5.1.cd.edit_threads.9.2) = cbbae803c62b3304cac76a6185745f8f diff -ru /usr/ports/mail/mutt-devel/files/patch-01 ./files/patch-01 --- /usr/ports/mail/mutt-devel/files/patch-01 Sun Mar 31 15:42:22 2002 +++ ./files/patch-01 Wed Jul 17 17:09:53 2002 @@ -1,6 +1,6 @@ ---- configure.in.orig Thu Nov 8 23:39:59 2001 -+++ configure.in Mon Nov 26 20:29:39 2001 -@@ -569,7 +569,7 @@ +--- configure.in.orig Thu May 2 01:21:49 2002 ++++ configure.in Wed Jul 17 17:08:49 2002 +@@ -591,7 +591,7 @@ then if test "$with_sasl" != "yes" then @@ -8,3 +8,13 @@ + CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl" LDFLAGS="$LDFLAGS -L$with_sasl/lib" fi + +@@ -644,7 +644,7 @@ + fi]) + + if test x$GCC = xyes -a $mutt_cv_warnings = yes; then +- CFLAGS="-Wall -pedantic $CFLAGS" ++ CFLAGS="-Wall $CFLAGS" + fi + + AC_ARG_ENABLE(nfs-fix, [ --enable-nfs-fix Work around an NFS with broken attributes caching ], diff -ru /usr/ports/mail/mutt-devel/pkg-plist ./pkg-plist --- /usr/ports/mail/mutt-devel/pkg-plist Sun Jun 16 15:05:25 2002 +++ ./pkg-plist Wed Jul 17 18:41:15 2002 @@ -450,16 +450,37 @@ %%SUB_HTML%%share/doc/mutt/html/manual359.html %%SUB_HTML%%share/doc/mutt/html/manual360.html %%SUB_HTML%%share/doc/mutt/html/manual361.html -%%SUB_HTML%%%%SUB_PGP_A%%%%SUB_PGP%%share/doc/mutt/html/manual362.html +%%SUB_HTML%%%%SUB_PATCHES%%%%SUB_PGP%%share/doc/mutt/html/manual362.html +%%SUB_HTML%%%%SUB_PATCHES%%%%SUB_THREAD%%share/doc/mutt/html/manual362.html +%%SUB_HTML%%%%SUB_PATCHES%%%%SUB_THREAD%%share/doc/mutt/html/manual363.html +%%SUB_HTML%%%%SUB_PATCHES%%%%SUB_THREAD%%share/doc/mutt/html/manual364.html +%%SUB_HTML%%%%SUB_PATCHES%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual362.html +%%SUB_HTML%%%%SUB_PATCHES%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual363.html +%%SUB_HTML%%%%SUB_PATCHES%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual364.html +%%SUB_HTML%%%%SUB_PATCHES%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual365.html %%SUB_ADD_A%%share/doc/mutt/html/manual362.html %%SUB_ADD_A%%share/doc/mutt/html/manual363.html %%SUB_ADD_A%%%%SUB_PGP%%share/doc/mutt/html/manual364.html +%%SUB_ADD_A%%%%SUB_THREAD%%share/doc/mutt/html/manual364.html +%%SUB_ADD_A%%%%SUB_THREAD%%share/doc/mutt/html/manual365.html +%%SUB_ADD_A%%%%SUB_THREAD%%share/doc/mutt/html/manual366.html +%%SUB_ADD_A%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual364.html +%%SUB_ADD_A%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual365.html +%%SUB_ADD_A%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual366.html +%%SUB_ADD_A%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual367.html %%SUB_ADD_B%%share/doc/mutt/html/manual362.html %%SUB_ADD_B%%share/doc/mutt/html/manual363.html %%SUB_ADD_B%%share/doc/mutt/html/manual364.html %%SUB_ADD_B%%share/doc/mutt/html/manual365.html %%SUB_ADD_B%%share/doc/mutt/html/manual366.html %%SUB_ADD_B%%%%SUB_PGP%%share/doc/mutt/html/manual367.html +%%SUB_ADD_B%%%%SUB_THREAD%%share/doc/mutt/html/manual367.html +%%SUB_ADD_B%%%%SUB_THREAD%%share/doc/mutt/html/manual368.html +%%SUB_ADD_B%%%%SUB_THREAD%%share/doc/mutt/html/manual369.html +%%SUB_ADD_B%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual367.html +%%SUB_ADD_B%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual368.html +%%SUB_ADD_B%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual369.html +%%SUB_ADD_B%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual370.html %%SUB_ADD_C%%share/doc/mutt/html/manual362.html %%SUB_ADD_C%%share/doc/mutt/html/manual363.html %%SUB_ADD_C%%share/doc/mutt/html/manual364.html @@ -468,6 +489,13 @@ %%SUB_ADD_C%%share/doc/mutt/html/manual367.html %%SUB_ADD_C%%share/doc/mutt/html/manual368.html %%SUB_ADD_C%%%%SUB_PGP%%share/doc/mutt/html/manual369.html +%%SUB_ADD_C%%%%SUB_THREAD%%share/doc/mutt/html/manual369.html +%%SUB_ADD_C%%%%SUB_THREAD%%share/doc/mutt/html/manual370.html +%%SUB_ADD_C%%%%SUB_THREAD%%share/doc/mutt/html/manual371.html +%%SUB_ADD_C%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual369.html +%%SUB_ADD_C%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual370.html +%%SUB_ADD_C%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual371.html +%%SUB_ADD_C%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual372.html %%SUB_ADD_D%%share/doc/mutt/html/manual362.html %%SUB_ADD_D%%share/doc/mutt/html/manual363.html %%SUB_ADD_D%%share/doc/mutt/html/manual364.html @@ -491,6 +519,13 @@ %%SUB_ADD_D%%share/doc/mutt/html/manual382.html %%SUB_ADD_D%%share/doc/mutt/html/manual383.html %%SUB_ADD_D%%%%SUB_PGP%%share/doc/mutt/html/manual384.html +%%SUB_ADD_D%%%%SUB_THREAD%%share/doc/mutt/html/manual384.html +%%SUB_ADD_D%%%%SUB_THREAD%%share/doc/mutt/html/manual385.html +%%SUB_ADD_D%%%%SUB_THREAD%%share/doc/mutt/html/manual386.html +%%SUB_ADD_D%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual384.html +%%SUB_ADD_D%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual385.html +%%SUB_ADD_D%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual386.html +%%SUB_ADD_D%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual387.html %%SUB_ADD_E%%share/doc/mutt/html/manual362.html %%SUB_ADD_E%%share/doc/mutt/html/manual363.html %%SUB_ADD_E%%share/doc/mutt/html/manual364.html @@ -516,6 +551,13 @@ %%SUB_ADD_E%%share/doc/mutt/html/manual384.html %%SUB_ADD_E%%share/doc/mutt/html/manual385.html %%SUB_ADD_E%%%%SUB_PGP%%share/doc/mutt/html/manual386.html +%%SUB_ADD_E%%%%SUB_THREAD%%share/doc/mutt/html/manual386.html +%%SUB_ADD_E%%%%SUB_THREAD%%share/doc/mutt/html/manual387.html +%%SUB_ADD_E%%%%SUB_THREAD%%share/doc/mutt/html/manual388.html +%%SUB_ADD_E%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual386.html +%%SUB_ADD_E%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual387.html +%%SUB_ADD_E%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual388.html +%%SUB_ADD_E%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual389.html %%SUB_ADD_F%%share/doc/mutt/html/manual362.html %%SUB_ADD_F%%share/doc/mutt/html/manual363.html %%SUB_ADD_F%%share/doc/mutt/html/manual364.html @@ -544,6 +586,13 @@ %%SUB_ADD_F%%share/doc/mutt/html/manual387.html %%SUB_ADD_F%%share/doc/mutt/html/manual388.html %%SUB_ADD_F%%%%SUB_PGP%%share/doc/mutt/html/manual389.html +%%SUB_ADD_F%%%%SUB_THREAD%%share/doc/mutt/html/manual389.html +%%SUB_ADD_F%%%%SUB_THREAD%%share/doc/mutt/html/manual390.html +%%SUB_ADD_F%%%%SUB_THREAD%%share/doc/mutt/html/manual391.html +%%SUB_ADD_F%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual389.html +%%SUB_ADD_F%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual390.html +%%SUB_ADD_F%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual391.html +%%SUB_ADD_F%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual392.html %%SUB_ADD_G%%share/doc/mutt/html/manual362.html %%SUB_ADD_G%%share/doc/mutt/html/manual363.html %%SUB_ADD_G%%share/doc/mutt/html/manual364.html @@ -574,5 +623,12 @@ %%SUB_ADD_G%%share/doc/mutt/html/manual389.html %%SUB_ADD_G%%share/doc/mutt/html/manual390.html %%SUB_ADD_G%%%%SUB_PGP%%share/doc/mutt/html/manual391.html +%%SUB_ADD_G%%%%SUB_THREAD%%share/doc/mutt/html/manual391.html +%%SUB_ADD_G%%%%SUB_THREAD%%share/doc/mutt/html/manual392.html +%%SUB_ADD_G%%%%SUB_THREAD%%share/doc/mutt/html/manual393.html +%%SUB_ADD_G%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual391.html +%%SUB_ADD_G%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual392.html +%%SUB_ADD_G%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual393.html +%%SUB_ADD_G%%%%SUB_THREAD_PGP%%share/doc/mutt/html/manual394.html %%SUB_HTML%%@dirrm share/doc/mutt/html %%PORTDOCS%%@dirrm share/doc/mutt >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?200207171653.g6HGruPc096931>