From owner-freebsd-ports Tue Aug 13 8:11: 3 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE30A37B401 for ; Tue, 13 Aug 2002 08:10:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 367D643E72 for ; Tue, 13 Aug 2002 08:10:03 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7DFA3JU015132 for ; Tue, 13 Aug 2002 08:10:03 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7DFA3ds015131; Tue, 13 Aug 2002 08:10:03 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D6B4137B401 for ; Tue, 13 Aug 2002 08:06:04 -0700 (PDT) Received: from david.siemens.de (david.siemens.de [192.35.17.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id E891B43E86 for ; Tue, 13 Aug 2002 08:06:02 -0700 (PDT) (envelope-from ust@cert.siemens.de) Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by david.siemens.de (8.11.6/8.11.6) with ESMTP id g7DF61H25200 for ; Tue, 13 Aug 2002 17:06:01 +0200 (MEST) Received: from mars.cert.siemens.de (ust.mchp.siemens.de [139.23.201.17]) by mail2.siemens.de (8.11.6/8.11.6) with ESMTP id g7DF60A12454 for ; Tue, 13 Aug 2002 17:06:00 +0200 (MEST) Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [139.23.202.134]) by mars.cert.siemens.de (8.12.5/8.12.5/Siemens CERT [ $Revision: 1.25 ]) with ESMTP id g7DF60fg035388 for ; Tue, 13 Aug 2002 17:06:00 +0200 (CEST) (envelope-from ust@alaska.cert.siemens.de) Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [127.0.0.1]) by alaska.cert.siemens.de (8.12.5/8.12.5/alaska [ $Revision: 1.14 ]) with ESMTP id g7DF60aU098703 for ; Tue, 13 Aug 2002 17:06:00 +0200 (CEST) (envelope-from ust@alaska.cert.siemens.de) Received: (from ust@localhost) by alaska.cert.siemens.de (8.12.5/8.12.5/alaska [ $Revision: 1.3 ]) id g7DF60NM098702; Tue, 13 Aug 2002 17:06:00 +0200 (CEST) (envelope-from ust) Message-Id: <200208131506.g7DF60NM098702@alaska.cert.siemens.de> Date: Tue, 13 Aug 2002 17:06:00 +0200 (CEST) From: Udo Schweigert Reply-To: Udo Schweigert To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/41621: maintainer-update of mail/mutt-devel Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 41621 >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 Aug 13 08:10:02 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 #9: Mon Aug 12 14:40:56 CEST 2002 ust@alaska.cert.siemens.de:/usr/obj/work/src/RELENG_4/sys/alaska i386 >Description: Maintainer update of mail/mutt-devel: - Add new knobs WITH_MUTT_SIGNATURE_MENU and WITH_MUTT_IFDEF_PATCH - Generate the pkg-plist by using a script, so the whole port is much more maintainable. - PORTREVISION++ Committer: - Added directory (mkdir; cvs add): scripts - Added files (cvs add): scripts/generate-plist - Removed files (cvs rm): pkg-plist >How-To-Repeat: >Fix: diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile --- /usr/ports/mail/mutt-devel/Makefile Thu Aug 1 18:22:17 2002 +++ ./Makefile Tue Aug 13 15:52:04 2002 @@ -55,10 +55,16 @@ # # If you want to use the rethreading functions define: # WITH_MUTT_EDIT_THREADS +# +# If you want to use the signature menu define: +# WITH_MUTT_SIGNATURE_MENU +# +# If you want to use the ifdef feature define: +# WITH_MUTT_IFDEF_PATCH PORTNAME= mutt-devel PORTVERSION= 1.5.1 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES+= mail .if defined(WITH_MUTT_NNTP) CATEGORIES+= news @@ -84,6 +90,9 @@ USE_REINPLACE= yes USE_AUTOMAKE= yes +PLIST= ${WRKDIR}/PLIST +SCRIPTS_ENV= WRKDIR="${WRKDIR}" + .include .if defined(WITH_MUTT_COMPRESSED_FOLDERS) || defined(WITH_MUTT_NNTP) || \ @@ -94,7 +103,8 @@ ftp://ftp2.mutt.org.ua/pub/mutt/mutt-${PATCH_VERSION}/ .endif -.if defined(WITH_MUTT_EDIT_THREADS) +.if defined(WITH_MUTT_EDIT_THREADS) || defined(WITH_MUTT_SIGNATURE_MENU) || \ + defined(WITH_MUTT_IFDEF_PATCH) PATCH_SITES+= http://cedricduval.free.fr/download/mutt/ .endif @@ -205,6 +215,12 @@ PATCHFILES+= patch-${PATCH_VERSION}.cd.edit_threads.9.2 CONFIGURE_ARGS+= --enable-imap-edit-threads .endif +.if defined(WITH_MUTT_SIGNATURE_MENU) +PATCHFILES+= patch-${PATCH_VERSION}.cd.signatures_menu.2.1 +.endif +.if defined(WITH_MUTT_IFDEF_PATCH) +PATCHFILES+= patch-${PATCH_VERSION}.cd.ifdef.1 +.endif WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} MAN1= flea.1 mutt.1 mutt_dotlock.1 muttbug.1 @@ -218,160 +234,57 @@ pre-configure:: @(cd ${WRKSRC}; ${ACLOCAL} -I m4) +.if defined(WITH_MUTT_NNTP) +SCRIPTS_ENV+= MUTT_NNTP="yes" +.endif +.if defined(WITH_MUTT_COMPRESSED_FOLDERS) +SCRIPTS_ENV+= MUTT_COMPRESSED_FOLDERS="yes" +.endif +.if defined(WITH_MUTT_QUOTE_PATCH) +SCRIPTS_ENV+= MUTT_QUOTE_PATCH="yes" +.endif +.if defined(WITH_MUTT_PGP_OUTLOOK_PATCH) +SCRIPTS_ENV+= MUTT_PGP_OUTLOOK_PATCH="yes" +.endif +.if defined(WITH_MUTT_EDIT_THREADS) +SCRIPTS_ENV+= MUTT_EDIT_THREADS="yes" +.endif +.if defined(WITH_MUTT_SIGNATURE_MENU) +SCRIPTS_ENV+= MUTT_SIGNATURE_MENU="yes" +.endif +.if defined(WITH_MUTT_IFDEF_PATCH) +SCRIPTS_ENV+= MUTT_IFDEF_PATCH="yes" +.endif +.if defined(WITH_MUTT_HTML) +SCRIPTS_ENV+= MUTT_HTML="yes" +.endif + .if !defined(NOPORTDOCS) +SCRIPTS_ENV+= MUTT_PORTDOCS="yes" post-build: ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref 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) +.if defined(WITH_MUTT_NNTP) && !defined(WITHOUT_MUTT_SGMLFORMAT) SGML_USED= yes .endif -PLIST_SUB+= SUB_NNTP="" -.else -PLIST_SUB+= SUB_NNTP="@comment " -.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_QUOTE_PATCH) -PLIST_SUB+= SUB_ADD_G="" -PLIST_SUB+= SUB_ADD_A="@comment " -PLIST_SUB+= SUB_ADD_B="@comment " -PLIST_SUB+= SUB_ADD_C="@comment " -PLIST_SUB+= SUB_ADD_D="@comment " -PLIST_SUB+= SUB_ADD_E="@comment " -PLIST_SUB+= SUB_ADD_F="@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="" -PLIST_SUB+= SUB_ADD_A="@comment " -PLIST_SUB+= SUB_ADD_B="@comment " -PLIST_SUB+= SUB_ADD_C="@comment " -PLIST_SUB+= SUB_ADD_D="@comment " -PLIST_SUB+= SUB_ADD_E="@comment " -PLIST_SUB+= SUB_ADD_G="@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="" -PLIST_SUB+= SUB_ADD_A="@comment " -PLIST_SUB+= SUB_ADD_B="@comment " -PLIST_SUB+= SUB_ADD_D="@comment " -PLIST_SUB+= SUB_ADD_E="@comment " -PLIST_SUB+= SUB_ADD_F="@comment " -PLIST_SUB+= SUB_ADD_G="@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="" -PLIST_SUB+= SUB_ADD_A="@comment " -PLIST_SUB+= SUB_ADD_C="@comment " -PLIST_SUB+= SUB_ADD_D="@comment " -PLIST_SUB+= SUB_ADD_E="@comment " -PLIST_SUB+= SUB_ADD_F="@comment " -PLIST_SUB+= SUB_ADD_G="@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="" -PLIST_SUB+= SUB_ADD_A="@comment " -PLIST_SUB+= SUB_ADD_B="@comment " -PLIST_SUB+= SUB_ADD_C="@comment " -PLIST_SUB+= SUB_ADD_D="@comment " -PLIST_SUB+= SUB_ADD_F="@comment " -PLIST_SUB+= SUB_ADD_G="@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="" -PLIST_SUB+= SUB_ADD_A="@comment " -PLIST_SUB+= SUB_ADD_B="@comment " -PLIST_SUB+= SUB_ADD_C="@comment " -PLIST_SUB+= SUB_ADD_E="@comment " -PLIST_SUB+= SUB_ADD_F="@comment " -PLIST_SUB+= SUB_ADD_G="@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="" -PLIST_SUB+= SUB_ADD_B="@comment " -PLIST_SUB+= SUB_ADD_C="@comment " -PLIST_SUB+= SUB_ADD_D="@comment " -PLIST_SUB+= SUB_ADD_E="@comment " -PLIST_SUB+= SUB_ADD_F="@comment " -PLIST_SUB+= SUB_ADD_G="@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 " -PLIST_SUB+= SUB_ADD_B="@comment " -PLIST_SUB+= SUB_ADD_C="@comment " -PLIST_SUB+= SUB_ADD_D="@comment " -PLIST_SUB+= SUB_ADD_E="@comment " -PLIST_SUB+= SUB_ADD_F="@comment " -PLIST_SUB+= SUB_ADD_G="@comment " -PLIST_SUB+= SUB_PATCHES="" -.else # patches -PLIST_SUB+= SUB_ADD_A="@comment " -PLIST_SUB+= SUB_ADD_B="@comment " -PLIST_SUB+= SUB_ADD_C="@comment " -PLIST_SUB+= SUB_ADD_D="@comment " -PLIST_SUB+= SUB_ADD_E="@comment " -PLIST_SUB+= SUB_ADD_F="@comment " -PLIST_SUB+= SUB_ADD_G="@comment " -PLIST_SUB+= SUB_PATCHES="" -.endif -.else # HTML -PLIST_SUB+= SUB_HTML="@comment " -PLIST_SUB+= SUB_ADD_A="@comment " -PLIST_SUB+= SUB_ADD_B="@comment " -PLIST_SUB+= SUB_ADD_C="@comment " -PLIST_SUB+= SUB_ADD_D="@comment " -PLIST_SUB+= SUB_ADD_E="@comment " -PLIST_SUB+= SUB_ADD_F="@comment " -PLIST_SUB+= SUB_ADD_G="@comment " -PLIST_SUB+= SUB_PATCHES="@comment " -.endif -.else # NOPORTDOCS -PLIST_SUB+= SUB_HTML="@comment " -PLIST_SUB+= SUB_NNTP="@comment " -PLIST_SUB+= SUB_ADD_A="@comment " -PLIST_SUB+= SUB_ADD_B="@comment " -PLIST_SUB+= SUB_ADD_C="@comment " -PLIST_SUB+= SUB_ADD_D="@comment " -PLIST_SUB+= SUB_ADD_E="@comment " -PLIST_SUB+= SUB_ADD_F="@comment " -PLIST_SUB+= SUB_ADD_G="@comment " -PLIST_SUB+= SUB_PATCHES="@comment " +.endif +.else # ! NOPORTDOCS post-patch:: ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib -.endif -.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 +.endif # ! NOPORTDOCS + .if ${SGML_USED} == yes +SCRIPTS_ENV+= MUTT_SGML="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 + +pre-install: + @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/generate-plist > ${PLIST} post-install: @strip ${PREFIX}/bin/mutt diff -ru /usr/ports/mail/mutt-devel/distinfo ./distinfo --- /usr/ports/mail/mutt-devel/distinfo Thu Jul 18 00:14:40 2002 +++ ./distinfo Tue Aug 13 15:53:12 2002 @@ -4,3 +4,5 @@ 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 +MD5 (mutt/patch-1.5.1.cd.signatures_menu.2.1) = 599637b340de9d57ce75545384ad51f3 +MD5 (mutt/patch-1.5.1.cd.ifdef.1) = 3ee107f5ce66f7fb6a5bab698c5b7f90 diff -ru /usr/ports/mail/mutt-devel/scripts/generate-plist ./scripts/generate-plist --- /usr/ports/mail/mutt-devel/scripts/generate-plist Thu Jan 1 01:00:00 1970 +++ ./scripts/generate-plist Tue Aug 13 16:03:22 2002 @@ -0,0 +1,164 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# set -x + +trap ' cleanup ' 0 +trap ' echo_signal; exit 1' 1 2 3 15 + +tmp_first=$(mktemp ${WRKDIR:=/tmp}/.plist-first.XXXXXXXXXX) +tmp_last=$(mktemp ${WRKDIR}/.plist-last.XXXXXXXXXX) + +cleanup() { + rm -f $tmp_first $tmp_last +} + +echo_signal() { + echo "Got Signal -- aborting `basename $0`" +} + +PATH=/bin:/usr/bin + +cat > $tmp_first <> $tmp_first <> $tmp_first +fi +if [ "$MUTT_SGML" = "yes" ]; then +echo "share/doc/mutt/manual.latin1" >> $tmp_first +fi + +if [ "$MUTT_HTML" = "yes" ]; then + html=361 + if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then + html=$(($html + 5)) + fi + if [ "$MUTT_NNTP" = "yes" ]; then + html=$(($html + 22)) + fi + if [ "$MUTT_QUOTE_PATCH" = "yes" ]; then + html=$(($html + 2)) + fi + if [ "$MUTT_EDIT_THREADS" = "yes" ]; then + html=$(($html + 3)) + fi + if [ "$MUTT_SIGNATURE_MENU" = "yes" ]; then + html=$(($html + 1)) + fi + if [ "$MUTT_IFDEF_PATCH" = "yes" ]; then + html=$(($html + 1)) + fi + if [ "$MUTT_PGP_OUTLOOK_PATCH" = "yes" ]; then + html=$(($html + 1)) + fi + echo "share/doc/mutt/html/manual.html" >> $tmp_first + echo "share/doc/mutt/html/manual_toc.html" >> $tmp_first + i=1 + while [ $i -le $html ]; do + echo "share/doc/mutt/html/manual$i.html" >> $tmp_first + i=$(($i + 1)) + done + echo "@dirrm share/doc/mutt/html" >> $tmp_last +fi + +if [ "$MUTT_PORTDOCS" = "yes" ]; then +cat >> $tmp_last <Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message