ports/146183: [patch] mail/mutt-devel: add OPTIONS support
Frank Wall
fw at moov.de
Fri Apr 30 11:30:02 UTC 2010
>Number: 146183
>Category: ports
>Synopsis: [patch] mail/mutt-devel: add OPTIONS support
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 30 11:30:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Frank Wall
>Release: 7.1-RELEASE-p4
>Organization:
>Environment:
FreeBSD 7.1-RELEASE-p4 FreeBSD 7.1-RELEASE-p4 #0: Sun Mar 22 09:43:46 UTC 2009 root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
- add OPTIONS support
- remove prefix MUTT_ from variables
- remove help message from Makefile in favour of OPTIONS
I have renamed all variables from WITH_MUTT_* to WITH_* according to FreeBSD Porters's Handbook, clause 5.11.1.1:
"When creating a port, do not make knob names specific to a given application. For example in Avahi port, use WITHOUT_MDNS instead of WITHOUT_AVAHI_MDNS."
If there are good reasons for preservering the WITH_MUTT_* variables I'll provide a new patch which will just add OPTIONS support.
>How-To-Repeat:
>Fix:
apply the patch
Patch attached with submission follows:
--- mail/mutt-devel/Makefile.orig 2010-01-28 02:10:07.000000000 +0100
+++ mail/mutt-devel/Makefile 2010-04-30 13:07:52.000000000 +0200
@@ -8,10 +8,6 @@
# There are several knobs which are used to define additions to the core
# mutt functionality.
#
-# As all of the knobs have a unique name which should not interfere with
-# other ports you can add them to /etc/make.conf, e.g. a line like
-# "WITH_MUTT_NNTP=yes" will enable mutt's nntp facilities.
-#
# In addition to the knobs listed below you can enable other configuration
# options of mutt by adding them to the MUTT_CONFIGURE_ARGS variable. For
# example you could say "MUTT_CONFIGURE_ARGS=--with-homespool=MyMail" to
@@ -19,108 +15,20 @@
#
# The two most important knobs are:
#
-# In general you can choose between using ncurses (WITH_MUTT_NCURSES)
-# and SLANG (WITH_MUTT_SLANG). Note that you may have to set the variables
+# In general you can choose between using ncurses (WITH_NCURSES)
+# and SLANG (WITH_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 ncurses is that which comes with the operating
# system. If you want to use the ncurses supplied by the ports-system define
-# WITH_MUTT_NCURSES_PORT.
-#
-# If you want to install the mutt documentation in html and ps format define:
-# WITH_MUTT_HTML
-# This is a default knob and can be disabled by WITHOUT_MUTT_HTML
-#
-# If you do not want that the documentation is rebuilt using the xml tools
-# define:
-# WITHOUT_MUTT_XML
-# (this can only be stated if WITHOUT_MUTT_HTML is defined)
-#
-# If you want to access compressed email folders define:
-# WITH_MUTT_COMPRESSED_FOLDERS
-# This is a default knob and can be disabled by WITHOUT_MUTT_COMPRESSED_FOLDERS
-#
-# If you do not want mutt to use the iconv library define:
-# WITHOUT_MUTT_ICONV
-#
-# If you want mutt to use the idn library define:
-# WITH_MUTT_IDN
-#
-# If you want to make use of the gpgme interface define:
-# WITH_MUTT_GPGME
-#
-# If you want to enable extended quoting functions define:
-# WITH_MUTT_QUOTE_PATCH
-# This is a default knob and can be disabled by WITHOUT_MUTT_QUOTE_PATCH
-#
-# If you want to have the IMAP header cache define:
-# WITH_MUTT_IMAP_HEADER_CACHE
-#
-# If you want to have the Maildir and the IMAP header cache define:
-# WITH_MUTT_MAILDIR_HEADER_CACHE
-#
-# If you want to make SMIME outlook compatible define:
-# WITH_MUTT_SMIME_OUTLOOK_COMPAT
-# This is a default knob and can be disabled by
-# WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT
-#
-# If you want to read and post news with mutt define:
-# WITH_MUTT_NNTP
-#
-# If you want to use the SASL2 authentication features with your email server
-# define
-# WITH_MUTT_CYRUS_SASL2
-#
-# If you want mutt to use the GNU aspell spelling checker define:
-# WITH_MUTT_ASPELL
-#
-# If you want mutt to use the ispell spelling checker define:
-# WITH_MUTT_ISPELL
-#
-# If you want to use the signature menu define:
-# WITH_MUTT_SIGNATURE_MENU
-#
-# If you want to use the printf-like enhancement to the mbox-hook command
-# define:
-# WITH_MUTT_MBOX_HOOK_PATCH
-#
-# If you want to use the ifdef feature define:
-# WITH_MUTT_IFDEF_PATCH
-#
-# If you want to have the Maildir mtime patch define:
-# WITH_MUTT_MAILDIR_MTIME_PATCH
-#
-# If you want to have the Mailbox Sidebar patch define:
-# WITH_MUTT_SIDEBAR_PATCH
-#
-# If you do not want mutt to use the flock() function define:
-# WITHOUT_MUTT_FLOCK
-#
-# If you want to enable the reverse_reply option define:
-# WITH_MUTT_REVERSE_REPLY_PATCH
-#
-# If you want to enable the `greeting' option define:
-# WITH_MUTT_GREETING_PATCH
-#
-# If you want to enable the parent/child match support define:
-# WITH_MUTT_PARENT_CHILD_MATCH_PATCH
-#
-# If you want to enable the internal SMTP relay support define:
-# WITH_MUTT_SMTP
-#
-# If you want to enable debugging capabilities define:
-# WITH_MUTT_DEBUG
-#
-# If you do not want to install the manpages mbox.5 and mdf.8 (because that
-# conflicts with other ports which installed these:
-# WITHOUT_MUTT_MAILBOX_MANPAGES
+# WITH_NCURSES_PORT.
#
PORTNAME= mutt-devel
PORTVERSION= 1.5.20
PORTREVISION?= 3
CATEGORIES+= mail ipv6
-.if defined(WITH_MUTT_NNTP)
+.if defined(WITH_NNTP)
CATEGORIES+= news
.endif
MASTER_SITES= ftp://ftp.mutt.org/mutt/devel/ \
@@ -170,6 +78,38 @@
USE_AUTOTOOLS= automake:110 autoconf:262
USE_OPENSSL= yes
+OPTIONS= ASPELL "Enable aspell support" off \
+ COMPRESSED_FOLDERS "Enable compressed folders" off \
+ CYRUS_SASL2 "Enable SASL2 authentication" off \
+ DEBUG "Enable debugging capabilities" off \
+ FLOCK "Enable flock() usage" off \
+ GPGME "Enable gpgme interface" off \
+ GREETING_PATCH "Enable greeting" off \
+ HTML "Enable HTML documentation" off \
+ ICONV "Enable iconv support" on \
+ IDN "Enable idn support" off \
+ IFDEF_PATCH "Enable ifdef feature" off \
+ IMAP_HEADER_CACHE "Enable imap header cache" off \
+ ISPELL "Enable ispell support" off \
+ LOCALES_FIX "Enable locales fix" off \
+ MAILBOX_MANPAGES "Install mbox.5/mdf.8 manpages" on \
+ MAILDIR_HEADER_CACHE "Enable maildir header cache" off \
+ MAILDIR_MTIME_PATCH "Enable Maildir mtime patch" off \
+ MBOX_HOOK_PATCH "Enable enhanced mbox-hook" off \
+ NCURSES "Enable ncurses support" off \
+ NCURSES_PORT "Use ncurses from port" off \
+ NNTP "Enable news reader" off \
+ PARENT_CHILD_MATCH "Enable parent/child match" off \
+ QUOTE_PATCH "Enable extended quoting" on \
+ REVERSE_REPLY_PATCH "Enable reverse_reply" off \
+ SGMLFORMAT "Enable sgml support" on \
+ SIDEBAR_PATCH "Enable sidebar" off \
+ SIGNATURE_MENU "Enable signature menu" off \
+ SLANG "Enable slang support" off \
+ SMIME_OUTLOOK_COMPAT "SMIME outlook compatible" off \
+ SMTP "Enable SMTP relay support" off \
+ XML "Enable xml-tools" on
+
PLIST= ${WRKDIR}/PLIST
PKGMESSAGE= ${WRKDIR}/pkg-message
SCRIPTS_ENV= WRKDIR="${WRKDIR}"
@@ -198,8 +138,8 @@
.if !defined(VC_PATCH_VERSION)
VC_PATCH_VERSION= ${PORTVERSION}
.endif
-.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
-WITH_MUTT_IMAP_HEADER_CACHE= yes
+.if defined(WITH_MAILDIR_HEADER_CACHE)
+WITH_IMAP_HEADER_CACHE= yes
.endif
.if ${OSVERSION} >= 700033 || (${OSVERSION} < 700000 && ${OSVERSION} >= 602107)
NCURSES_IS_DEFAULT= yes
@@ -208,11 +148,11 @@
.endif
.if defined (MUTT_LITE)
-WITHOUT_MUTT_XML= yes
-WITHOUT_MUTT_COMPRESSED_FOLDERS= yes
-WITHOUT_MUTT_QUOTE_PATCH= yes
-WITHOUT_MUTT_HTML= yes
-WITH_MUTT_NCURSES= yes
+WITHOUT_XML= yes
+WITHOUT_COMPRESSED_FOLDERS= yes
+WITHOUT_QUOTE_PATCH= yes
+WITHOUT_HTML= yes
+WITH_NCURSES= yes
PKGNAMESUFFIX= -lite
.endif
@@ -228,19 +168,19 @@
RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
.if !defined (MUTT_LITE)
-.if exists(${LOCALBASE}/bin/aspell) && !defined(WITH_MUTT_ISPELL)
-WITH_MUTT_ASPELL= yes
-.elif exists(${LOCALBASE}/bin/ispell) && !defined(WITH_MUTT_ASPELL)
-WITH_MUTT_ISPELL= yes
-.endif
-.if defined(PACKAGE_BUILDING) && !defined(WITH_MUTT_ASPELL) && \
- !defined(WITH_MUTT_ISPELL)
-WITH_MUTT_ASPELL= yes
+.if exists(${LOCALBASE}/bin/aspell) && !defined(WITH_ISPELL)
+WITH_ASPELL= yes
+.elif exists(${LOCALBASE}/bin/ispell) && !defined(WITH_ASPELL)
+WITH_ISPELL= yes
+.endif
+.if defined(PACKAGE_BUILDING) && !defined(WITH_ASPELL) && \
+ !defined(WITH_ISPELL)
+WITH_ASPELL= yes
.endif
-.if defined(WITH_MUTT_ASPELL)
+.if defined(WITH_ASPELL)
BUILD_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
RUN_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
-.elif defined(WITH_MUTT_ISPELL)
+.elif defined(WITH_ISPELL)
BUILD_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
@@ -249,26 +189,26 @@
.endif
.endif
-.if defined(WITH_MUTT_NCURSES_PORT)
-WITH_MUTT_NCURSES= yes
+.if defined(WITH_NCURSES_PORT)
+WITH_NCURSES= yes
.endif
-.if defined(WITH_MUTT_SLANG) || defined(WITH_SLANG)
+.if defined(WITH_SLANG)
MUTT_USES_SLANG= yes
.endif
-.if defined(WITH_MUTT_NCURSES) && !defined(MUTT_USES_SLANG)
+.if defined(WITH_NCURSES) && !defined(MUTT_USES_SLANG)
MUTT_USES_NCURSES= yes
.endif
-.if !defined(MUTT_USES_SLANG) && !defined(WITHOUT_MUTT_SLANG) && !defined(MUTT_USES_NCURSES)
+.if !defined(MUTT_USES_SLANG) && !defined(WITHOUT_SLANG) && !defined(MUTT_USES_NCURSES)
.if defined(SLANG_IS_DEFAULT)
MUTT_USES_SLANG= yes
.elif defined(NCURSES_IS_DEFAULT)
MUTT_USES_NCURSES= yes
.endif
.endif
-.if defined(WITHOUT_MUTT_SGMLFORMAT)
+.if defined(WITHOUT_SGMLFORMAT)
XML_USED= no
.endif
-.if defined(WITHOUT_MUTT_XML)
+.if defined(WITHOUT_XML)
XML_USED= no
.endif
.if !defined(XML_USED)
@@ -277,14 +217,14 @@
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
.endif
-.if !defined(WITHOUT_MUTT_ICONV)
+.if !defined(WITHOUT_ICONV)
USE_ICONV= yes
.endif
.if defined(NOPORTDOCS)
XML_USED= no
.endif
.if defined(MUTT_USES_NCURSES)
-.if defined(WITH_MUTT_NCURSES_PORT)
+.if defined(WITH_NCURSES_PORT)
MUTT_USES_NCURSES_PORT= yes
.endif
.endif
@@ -294,58 +234,58 @@
.elif defined(MUTT_USES_SLANG)
LIB_DEPENDS+= slang.2:${PORTSDIR}/devel/libslang2
.endif
-.if defined(WITH_MUTT_CYRUS_SASL2)
+.if defined(WITH_CYRUS_SASL2)
LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
.endif
-.if exists(${LOCALBASE}/lib/libidn.so) && !defined(WITHOUT_MUTT_IDN)
-WITH_MUTT_IDN= yes
+.if exists(${LOCALBASE}/lib/libidn.so) && !defined(WITHOUT_IDN)
+WITH_IDN= yes
.endif
-.if defined(WITH_MUTT_IDN)
+.if defined(WITH_IDN)
LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn
.endif
-.if defined(WITH_MUTT_GPGME)
+.if defined(WITH_GPGME)
LIB_DEPENDS+= gpgme:${PORTSDIR}/security/gpgme
.endif
-.if ! defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT)
+.if ! defined(WITHOUT_SMIME_OUTLOOK_COMPAT)
post-patch::
@${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
+.if defined(WITH_SIGNATURE_MENU)
+IGNORE= The WITH_SIGNATURE_MENU does not work at the moment
XML_NEEDED= yes
post-patch::
@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-signature-menu
.endif
-.if defined(WITH_MUTT_MAILDIR_MTIME_PATCH)
+.if defined(WITH_MAILDIR_MTIME_PATCH)
post-patch::
-.if defined(WITH_MUTT_NNTP)
+.if defined(WITH_NNTP)
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
.else
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-maildir-mtime
.endif
.endif
-.if defined(WITH_MUTT_ASPELL)
+.if defined(WITH_ASPELL)
post-patch::
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-aspell
.endif
-.if defined(WITH_MUTT_REVERSE_REPLY_PATCH)
+.if defined(WITH_REVERSE_REPLY_PATCH)
post-patch::
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-reverse_reply
.endif
-.if defined(WITH_MUTT_PARENT_CHILD_MATCH_PATCH)
+.if defined(WITH_PARENT_CHILD_MATCH_PATCH)
post-patch::
@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-parent-child-match
.endif
-.if defined(WITHOUT_MUTT_FLOCK)
+.if defined(WITHOUT_FLOCK)
CONFIGURE_ARGS+= --disable-flock
.else
CONFIGURE_ARGS+= --enable-flock
.endif
-.if defined(WITH_MUTT_LOCALES_FIX)
+.if defined(WITH_LOCALES_FIX)
CONFIGURE_ARGS+= --enable-locales-fix
.endif
.if defined(MUTT_USES_NCURSES_PORT)
@@ -353,23 +293,23 @@
.elif defined(MUTT_USES_SLANG)
CONFIGURE_ARGS+= --with-slang=${LOCALBASE}
.endif
-.if defined(WITH_MUTT_CYRUS_SASL2)
+.if defined(WITH_CYRUS_SASL2)
CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
.endif
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
.endif
-.if defined(WITHOUT_MUTT_ICONV)
+.if defined(WITHOUT_ICONV)
CONFIGURE_ARGS+= --disable-iconv
.else
CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE}
.endif
-.if defined(WITH_MUTT_IDN)
+.if defined(WITH_IDN)
CONFIGURE_ARGS+= --with-idn
.else
CONFIGURE_ARGS+= --without-idn
.endif
-.if defined(WITH_MUTT_GPGME)
+.if defined(WITH_GPGME)
CONFIGURE_ARGS+= --enable-gpgme
.else
CONFIGURE_ARGS+= --disable-gpgme
@@ -383,18 +323,18 @@
USE_KRB5_SYS=YES
.endif
.endif
-.if defined(WITH_MUTT_SMTP)
+.if defined(WITH_SMTP)
CONFIGURE_ARGS+= --enable-smtp
.else
CONFIGURE_ARGS+= --disable-smtp
.endif
-.if defined(WITH_MUTT_DEBUG)
+.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-debug
.endif
PATCH_DIST_STRIP= -p1
-.if ! defined (WITHOUT_MUTT_COMPRESSED_FOLDERS)
+.if ! defined (WITHOUT_COMPRESSED_FOLDERS)
DISTFILES+= patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv
CONFIGURE_ARGS+= --enable-compressed
XML_NEEDED= yes
@@ -404,7 +344,7 @@
${WRKDIR}/patch-compressed
@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-compressed
.endif
-.if defined(WITH_MUTT_NNTP)
+.if defined(WITH_NNTP)
DISTFILES+= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv
CONFIGURE_ARGS+= --enable-nntp
XML_NEEDED= yes
@@ -414,22 +354,22 @@
${WRKDIR}/patch-nntp
@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp
.endif
-.if ! defined(WITHOUT_MUTT_QUOTE_PATCH)
+.if ! defined(WITHOUT_QUOTE_PATCH)
PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
XML_NEEDED= yes
.endif
-.if defined(WITH_MUTT_IFDEF_PATCH)
+.if defined(WITH_IFDEF_PATCH)
post-patch::
@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef
.endif
-.if defined(WITH_MUTT_MBOX_HOOK_PATCH)
-IGNORE= The WITH_MUTT_MBOX_HOOK_PATCH does not work at the moment
+.if defined(WITH_MBOX_HOOK_PATCH)
+IGNORE= The WITH_MBOX_HOOK_PATCH does not work at the moment
#PATCHFILES+= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
.endif
-.if defined(WITH_MUTT_SIDEBAR_PATCH)
+.if defined(WITH_SIDEBAR_PATCH)
XML_NEEDED= yes
-.if defined(WITH_MUTT_NNTP)
+.if defined(WITH_NNTP)
post-patch::
@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-nntp
.else
@@ -437,10 +377,10 @@
@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar
.endif
.endif
-.if defined(WITH_MUTT_GREETING_PATCH)
+.if defined(WITH_GREETING_PATCH)
PATCHFILES+= mutt-${VC_PATCH_VERSION}.vc.greeting:vc
.endif
-.if defined(WITH_MUTT_TRASH_PATCH)
+.if defined(WITH_TRASH_PATCH)
post-patch::
@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-trash-purge
.endif
@@ -448,7 +388,7 @@
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
MAN1= mutt.1 mutt_dotlock.1 flea.1 muttbug.1
MAN5= muttrc.5
-.if !defined(WITHOUT_MUTT_MAILBOX_MANPAGES)
+.if !defined(WITHOUT_MAILBOX_MANPAGES)
MAN5+= mbox.5 mmdf.5
.endif
@@ -459,7 +399,7 @@
${WRKSRC}/contrib/pgp6.rc
@${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \
${WRKSRC}/contrib/Makefile.am
-.if defined(WITHOUT_MUTT_MAILBOX_MANPAGES)
+.if defined(WITHOUT_MAILBOX_MANPAGES)
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-no-mbox-manpage
.endif
@@ -474,16 +414,16 @@
.if defined(MUTT_SLAVE_HTML_PAGES)
SCRIPTS_ENV+= MUTT_SLAVE_HTML_PAGES="${MUTT_SLAVE_HTML_PAGES}"
.endif
-.if defined(WITH_MUTT_NNTP)
+.if defined(WITH_NNTP)
SCRIPTS_ENV+= MUTT_NNTP="yes"
.endif
-.if ! defined (WITHOUT_MUTT_COMPRESSED_FOLDERS)
+.if ! defined (WITHOUT_COMPRESSED_FOLDERS)
SCRIPTS_ENV+= MUTT_COMPRESSED_FOLDERS="yes"
.endif
-.if ! defined(WITHOUT_MUTT_QUOTE_PATCH)
+.if ! defined(WITHOUT_QUOTE_PATCH)
SCRIPTS_ENV+= MUTT_QUOTE_PATCH="yes"
.endif
-.if defined(WITH_MUTT_IMAP_HEADER_CACHE)
+.if defined(WITH_IMAP_HEADER_CACHE)
.if defined(WITH_TOKYOCABINET)
CONFIGURE_ARGS+= --enable-hcache --without-gdbm --without-bdb --with-tokyocabinet
LIB_DEPENDS+= tokyocabinet.9:${PORTSDIR}/databases/tokyocabinet
@@ -494,25 +434,25 @@
.else
CONFIGURE_ARGS+= --disable-hcache
.endif
-.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
+.if defined(WITH_MAILDIR_HEADER_CACHE)
CONFIGURE_ARGS+= --without-qdbm
.endif
-.if defined(WITH_MUTT_SIDEBAR_PATCH)
+.if defined(WITH_SIDEBAR_PATCH)
SCRIPTS_ENV+= MUTT_SIDEBAR_PATCH="yes"
.endif
-.if defined(WITH_MUTT_SIGNATURE_MENU)
+.if defined(WITH_SIGNATURE_MENU)
SCRIPTS_ENV+= MUTT_SIGNATURE_MENU="yes"
.endif
-.if defined(WITH_MUTT_IFDEF_PATCH)
+.if defined(WITH_IFDEF_PATCH)
SCRIPTS_ENV+= MUTT_IFDEF_PATCH="yes"
.endif
-.if ! defined(WITHOUT_MUTT_HTML)
+.if ! defined(WITHOUT_HTML)
SCRIPTS_ENV+= MUTT_HTML="yes"
.endif
.if !defined(WITHOUT_NLS)
SCRIPTS_ENV+= MUTT_NLS="yes"
.endif
-.if defined(WITH_MUTT_REVERSE_REPLY_PATCH)
+.if defined(WITH_REVERSE_REPLY_PATCH)
SCRIPTS_ENV+= MUTT_REVERSE_REPLY_PATCH="yes"
.endif
@@ -528,10 +468,10 @@
-e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
${WRKSRC}/doc/muttrc.man
-.if ! defined(WITHOUT_MUTT_HTML)
+.if ! defined(WITHOUT_HTML)
XML_USED= yes
.endif
-.if defined(XML_NEEDED) && !defined(WITHOUT_MUTT_XML)
+.if defined(XML_NEEDED) && !defined(WITHOUT_XML)
XML_USED= yes
.endif
.else # ! NOPORTDOCS
@@ -558,10 +498,10 @@
@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}
@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
../ABOUT-NLS ../contrib/language* ${DOCSDIR}
-.if defined(WITH_MUTT_NNTP)
+.if defined(WITH_NNTP)
@cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp ${DOCSDIR}
.endif
-.if ! defined(WITHOUT_MUTT_HTML)
+.if ! defined(WITHOUT_HTML)
@${MKDIR} ${DOCSDIR}/html && ${CHMOD} a+rx ${DOCSDIR}/html
${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list