From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 1 11:30:07 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 59044106566B for ; Tue, 1 Jun 2010 11:30:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (unknown [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 481EB8FC1F for ; Tue, 1 Jun 2010 11:30:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o51BU68Z042248 for ; Tue, 1 Jun 2010 11:30:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o51BU6ue042243; Tue, 1 Jun 2010 11:30:06 GMT (envelope-from gnats) Date: Tue, 1 Jun 2010 11:30:06 GMT Message-Id: <201006011130.o51BU6ue042243@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Frank Wall Cc: Subject: Re: ports/146183: [patch] mail/mutt-devel: add OPTIONS support X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Frank Wall List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jun 2010 11:30:07 -0000 The following reply was made to PR ports/146183; it has been noted by GNATS. From: Frank Wall To: "Schweigert, Udo CERT" Cc: bug-followup@FreeBSD.org Subject: Re: ports/146183: [patch] mail/mutt-devel: add OPTIONS support Date: Tue, 1 Jun 2010 13:06:54 +0200 --qMm9M+Fa2AknHoGS Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, > - Should code be added to still support the long option names, e.g. > WITH_MUTT_COMPRESSED_FOLDERS equally to WITH_COMPRESSED_FOLDERS? > Or is a respective hint in UPDATING enough? attached is a new patch which does not break POLA. It just adds OPTIONS support and is still using the long knob-names. I think this way it's much easier to introduce OPTIONS support. > - Can the code for OSVERSION less than 602107 been deleted? I think the code should just be updated to match 604000, which is the last release of the 6-series. My patch addresses this too. Regards Frank Wall --qMm9M+Fa2AknHoGS Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" --- mail/mutt-devel/Makefile.orig 2010-06-01 12:51:54.000000000 +0200 +++ mail/mutt-devel/Makefile 2010-06-01 13:07:16.000000000 +0200 @@ -170,6 +170,38 @@ USE_AUTOTOOLS= automake:110 autoconf:262 USE_OPENSSL= yes +OPTIONS= MUTT_ASPELL "Enable aspell support" off \ + MUTT_COMPRESSED_FOLDERS "Enable compressed folders" off \ + MUTT_CYRUS_SASL2 "Enable SASL2 authentication" off \ + MUTT_DEBUG "Enable debugging capabilities" off \ + MUTT_FLOCK "Enable flock() usage" off \ + MUTT_GPGME "Enable gpgme interface" off \ + MUTT_GREETING_PATCH "Enable greeting" off \ + MUTT_HTML "Enable HTML documentation" off \ + MUTT_ICONV "Enable iconv support" on \ + MUTT_IDN "Enable idn support" off \ + MUTT_IFDEF_PATCH "Enable ifdef feature" off \ + MUTT_IMAP_HEADER_CACHE "Enable imap header cache" off \ + MUTT_ISPELL "Enable ispell support" off \ + MUTT_LOCALES_FIX "Enable locales fix" off \ + MUTT_MAILBOX_MANPAGES "Install mbox.5/mdf.8 manpages" on \ + MUTT_MAILDIR_HEADER_CACHE "Enable maildir header cache" off \ + MUTT_MAILDIR_MTIME_PATCH "Enable Maildir mtime patch" off \ + MUTT_MBOX_HOOK_PATCH "Enable enhanced mbox-hook" off \ + MUTT_NCURSES "Enable ncurses support" off \ + MUTT_NCURSES_PORT "Use ncurses from port" off \ + MUTT_NNTP "Enable news reader" off \ + MUTT_PARENT_CHILD_MATCH "Enable parent/child match" off \ + MUTT_QUOTE_PATCH "Enable extended quoting" on \ + MUTT_REVERSE_REPLY_PATCH "Enable reverse_reply" off \ + MUTT_SGMLFORMAT "Enable sgml support" on \ + MUTT_SIDEBAR_PATCH "Enable sidebar" off \ + MUTT_SIGNATURE_MENU "Enable signature menu" off \ + MUTT_SLANG "Enable slang support" off \ + MUTT_SMIME_OUTLOOK_COMPAT "SMIME outlook compatible" off \ + MUTT_SMTP "Enable SMTP relay support" off \ + MUTT_XML "Enable xml-tools" on + PLIST= ${WRKDIR}/PLIST PKGMESSAGE= ${WRKDIR}/pkg-message SCRIPTS_ENV= WRKDIR="${WRKDIR}" @@ -201,7 +233,7 @@ .if defined(WITH_MUTT_MAILDIR_HEADER_CACHE) WITH_MUTT_IMAP_HEADER_CACHE= yes .endif -.if ${OSVERSION} >= 700033 || (${OSVERSION} < 700000 && ${OSVERSION} >= 602107) +.if ${OSVERSION} >= 700033 || (${OSVERSION} < 700000 && ${OSVERSION} >= 604000 ) NCURSES_IS_DEFAULT= yes .else SLANG_IS_DEFAULT= yes --qMm9M+Fa2AknHoGS--