ports/175149: [patch] mail/mutt: adopt optionsNG
Jason Helfman
jgh at FreeBSD.org
Wed Jan 9 00:50:00 UTC 2013
>Number: 175149
>Category: ports
>Synopsis: [patch] mail/mutt: adopt optionsNG
>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: Wed Jan 09 00:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Jason Helfman
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #2 r245102: Sun Jan 6 15:01:33 UTC 2013 root at freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64
>Description:
adopt optionsNG (new options framework)
update documentation
update pkg-desc
For your consideration: MUTT_OPTION -> OPTION (ie. MUTT_NNTP -> NNTP)
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
--- Makefile (revision 310108)
+++ Makefile (working copy)
@@ -7,7 +7,9 @@
#
# 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.
+# "mutt_SET=MUTT_NNTP" will enable mutt's nntp facilities. To exclude an
+# option, you can add a line such as this to /etc/make.conf.
+# "mutt_UNSET=MUTT_NNTP"
#
# 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
@@ -16,105 +18,105 @@
#
# 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 (MUTT_NCURSES)
+# and SLANG (MUTT_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.
+# mutt_SET=MUTT_NCURSES_PORT.
#
# If you want to install the mutt documentation in html and ps format define:
-# WITH_MUTT_HTML
+# mutt_SET=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)
+# mutt_UNSET=MUTT_XML
+# (this can only be stated if mutt_UNSET=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
+# mutt_SET=MUTT_COMPRESSED_FOLDERS
+# This is a default knob and can be disabled by mutt_UNSET=MUTT_COMPRESSED_FOLDERS
#
# If you do not want mutt to use the iconv library define:
-# WITHOUT_MUTT_ICONV
+# mutt_UNSET=MUTT_ICONV
#
# If you want mutt to use the idn library define:
-# WITH_MUTT_IDN
+# mutt_SET=MUTT_IDN
#
# If you want to make use of the gpgme interface define:
-# WITH_MUTT_GPGME
+# mutt_SET=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
+# mutt_SET=MUTT_QUOTE_PATCH
+# This is a default knob and can be disabled by mutt_UNSET=MUTT_QUOTE_PATCH
#
# If you want to have the IMAP header cache define:
-# WITH_MUTT_IMAP_HEADER_CACHE
+# mutt_SET=MUTT_IMAP_HEADER_CACHE
#
# If you want to have the Maildir and the IMAP header cache define:
-# WITH_MUTT_MAILDIR_HEADER_CACHE
+# mutt_SET=MUTT_MAILDIR_HEADER_CACHE
#
# If you want to make SMIME outlook compatible define:
-# WITH_MUTT_SMIME_OUTLOOK_COMPAT
+# mutt_SET=MUTT_SMIME_OUTLOOK_COMPAT
# This is a default knob and can be disabled by
-# WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT
+# mutt_UNSET=MUTT_SMIME_OUTLOOK_COMPAT
#
# If you want to read and post news with mutt define:
-# WITH_MUTT_NNTP
+# mutt_SET=MUTT_NNTP
#
# If you want to use the SASL2 authentication features with your email server
# define
-# WITH_MUTT_CYRUS_SASL2
+# mutt_SET=MUTT_CYRUS_SASL2
#
# If you want mutt to use the GNU aspell spelling checker define:
-# WITH_MUTT_ASPELL
+# mutt_SET=MUTT_ASPELL
#
# If you want mutt to use the ispell spelling checker define:
-# WITH_MUTT_ISPELL
+# mutt_SET=MUTT_ISPELL
#
# If you want to use the signature menu define:
-# WITH_MUTT_SIGNATURE_MENU
+# mutt_SET=MUTT_SIGNATURE_MENU
#
# If you want to use the printf-like enhancement to the mbox-hook command
# define:
-# WITH_MUTT_MBOX_HOOK_PATCH
+# mutt_SET=MUTT_MBOX_HOOK_PATCH
#
# If you want to use the ifdef feature define:
-# WITH_MUTT_IFDEF_PATCH
+# mutt_SET=MUTT_IFDEF_PATCH
#
# If you want to have the Maildir mtime patch define:
-# WITH_MUTT_MAILDIR_MTIME_PATCH
+# mutt_SET=MUTT_MAILDIR_MTIME_PATCH
#
# If you want to have the Mailbox Sidebar patch define:
-# WITH_MUTT_SIDEBAR_PATCH
+# mutt_SET=MUTT_SIDEBAR_PATCH
#
# If you do not want mutt to use the flock() function define:
-# WITHOUT_MUTT_FLOCK
+# mutt_UNSET=MUTT_FLOCK
#
# If you want to enable the reverse_reply option define:
-# WITH_MUTT_REVERSE_REPLY_PATCH
+# mutt_SET=MUTT_REVERSE_REPLY_PATCH
#
# If you want to enable the `greeting' option define:
-# WITH_MUTT_GREETING_PATCH
+# mutt_SET=MUTT_GREETING_PATCH
#
# If you want to enable the parent/child match support define:
-# WITH_MUTT_PARENT_CHILD_MATCH_PATCH
+# mutt_SET=MUTT_PARENT_CHILD_MATCH_PATCH
#
# If you want to be able to use a trash folder for deleted emails (especially useful
# for example for googlemail) define:
-# WITH_MUTT_TRASH_PATCH
+# mutt_SET=MUTT_TRASH_PATCH
#
# If you want to enable the internal SMTP relay support define:
-# WITH_MUTT_SMTP
+# mutt_SET=MUTT_SMTP
#
# If you want to enable debugging capabilities define:
-# WITH_MUTT_DEBUG
+# mutt_SET=MUTT_DEBUG
#
# If you do not want to install the manpages mbox.5 and mmdf.5 (because that
# conflicts with other ports which installed these:
-# WITHOUT_MUTT_MAILBOX_MANPAGES
+# mutt_UNSET=MUTT_MAILBOX_MANPAGES
#
# Use CFLAGS_ADD and LDFLAGS_ADD to append additional CLFAGS and LDFLAGS.
#
@@ -123,9 +125,6 @@
PORTVERSION= 1.5.21
PORTREVISION= 1
CATEGORIES+= mail ipv6
-.if defined(WITH_MUTT_NNTP)
-CATEGORIES+= news
-.endif
MASTER_SITES= ftp://ftp.mutt.org/mutt/devel/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/devel/ \
ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \
@@ -173,45 +172,58 @@
USE_NCURSES_RPATH= yes
.if !defined (MUTT_LITE)
-OPTIONS= MUTT_ASPELL "Enable aspell support" off \
- MUTT_COMPRESSED_FOLDERS "Enable compressed folders" on \
- 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" on \
- 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/mmdf.5 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" on \
- MUTT_NCURSES_PORT "Use ncurses from port" off \
- MUTT_NNTP "Enable news reader" off \
- MUTT_PARENT_CHILD_MATCH_PATCH "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" on \
- MUTT_SMTP "Enable SMTP relay support" off \
- MUTT_TRASH_PATCH "Enable trash folder support" off \
- MUTT_XML "Use XML tools for docu" on
+OPTIONS_DEFINE= MUTT_ASPELL MUTT_COMPRESSED_FOLDERS MUTT_CYRUS_SASL2 MUTT_DEBUG MUTT_FLOCK \
+ MUTT_GPGME MUTT_GREETING_PATCH MUTT_HTML MUTT_ICONV MUTT_IDN MUTT_IFDEF_PATCH \
+ MUTT_IMAP_HEADER_CACHE MUTT_ISPELL MUTT_LOCALES_FIX MUTT_MAILBOX_MANPAGES \
+ MUTT_MAILDIR_HEADER_CACHE MUTT_MAILDIR_MTIME_PATCH MUTT_MBOX_HOOK_PATCH \
+ MUTT_NCURSES MUTT_NCURSES_PORT MUTT_NNTP MUTT_PARENT_CHILD_MATCH_PATCH \
+ MUTT_QUOTE_PATCH MUTT_REVERSE_REPLY_PATCH MUTT_SGMLFORMAT MUTT_SIDEBAR_PATCH \
+ MUTT_SIGNATURE_MENU MUTT_SLANG MUTT_SMIME_OUTLOOK_COMPAT MUTT_SMTP MUTT_TRASH_PATCH \
+ MUTT_XML
+
+MUTT_ASPELL_DESC= Enable aspell support
+MUTT_COMPRESSED_FOLDERS_DESC= Enable compressed folders
+MUTT_CYRUS_SASL2_DESC= Enable SASL2 authentication
+MUTT_DEBUG_DESC= Enable debugging capabilities
+MUTT_FLOCK_DESC= Enable flock() usage
+MUTT_GPGME_DESC= Enable gpgme interface
+MUTT_GREETING_PATCH_DESC= Enable greeting
+MUTT_HTML_DESC= Enable HTML documentation
+MUTT_ICONV_DESC= Enable iconv support
+MUTT_IDN_DESC= Enable idn support
+MUTT_IFDEF_PATCH_DESC= Enable ifdef feature
+MUTT_IMAP_HEADER_CACHE_DESC= Enable imap header cache
+MUTT_ISPELL_DESC= Enable ispell support
+MUTT_LOCALES_FIX_DESC= Enable locales fix
+MUTT_MAILBOX_MANPAGES_DESC= Install mbox.5/mmdf.5 manpages
+MUTT_MAILDIR_HEADER_CACHE_DESC= Enable maildir header cache
+MUTT_MAILDIR_MTIME_PATCH_DESC= Enable Maildir mtime patch
+MUTT_MBOX_HOOK_PATCH_DESC= Enable enhanced mbox-hook
+MUTT_NCURSES_DESC= Enable ncurses support
+MUTT_NCURSES_PORT_DESC= Use ncurses from port
+MUTT_NNTP_DESC= Enable news reader
+MUTT_PARENT_CHILD_MATCH_PATCH_DESC= Enable parent/child match
+MUTT_QUOTE_PATCH_DESC= Enable extended quoting
+MUTT_REVERSE_REPLY_PATCH_DESC= Enable reverse_reply
+MUTT_SGMLFORMAT_DESC= Enable sgml support
+MUTT_SIDEBAR_PATCH_DESC= Enable sidebar
+MUTT_SIGNATURE_MENU_DESC= Enable signature menu
+MUTT_SLANG_DESC= Enable slang support
+MUTT_SMIME_OUTLOOK_COMPAT_DESC= SMIME outlook compatible
+MUTT_SMTP_DESC= Enable SMTP relay support
+MUTT_TRASH_PATCH_DESC= Enable trash folder support
+MUTT_XML_DESC= Use XML tools for docu
+
+OPTIONS_DEFAULT= MUTT_COMPRESSED_FOLDERS MUTT_HTML MUTT_ICONV MUTT_MAILBOX_MANPAGES \
+ MUTT_NCURSES MUTT_QUOTE_PATCH MUTT_SGMLFORMAT MUTT_SMIME_OUTLOOK_COMPAT \
+ MUTT_XML
.endif
PLIST= ${WRKDIR}/PLIST
PKGMESSAGE= ${WRKDIR}/pkg-message
SCRIPTS_ENV= WRKDIR="${WRKDIR}"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
DW_PATCH_VERSION= 1.5.6
AC_PATCH_VERSION= 1.5.9
@@ -231,16 +243,13 @@
.if !defined(AC_PATCH_VERSION)
AC_PATCH_VERSION= ${PORTVERSION}
.endif
-.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
-WITH_MUTT_IMAP_HEADER_CACHE= yes
+.if ${PORT_OPTIONS:MMUTT_MAILDIR_HEADER_CACHE}
+OPTIONS_SET+=MUTT_IMAP_HEADER_CACHE
.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
+OPTIONS_UNSET+=MUTT_XML MUTT_COMPRESSED_FOLDERS MUTT_QUOTE_PATCH MUTT_HTML
+OPTIONS_SET+=NCURSES
PKGNAMESUFFIX= -lite
.endif
@@ -256,19 +265,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
+.if exists(${LOCALBASE}/bin/aspell) && ! ${PORT_OPTIONS:MMUTT_ISPELL}
+OPTIONS_SET+=MUTT_ASPELL
+.elif exists(${LOCALBASE}/bin/ispell) && ! ${PORT_OPTIONS:MMUTT_ASPELL}
+OPTIONS_SET+=MUTT_ISPELL
.endif
-.if defined(PACKAGE_BUILDING) && !defined(WITH_MUTT_ASPELL) && \
- !defined(WITH_MUTT_ISPELL)
-WITH_MUTT_ASPELL= yes
+.if defined(PACKAGE_BUILDING) && ! ${PORT_OPTIONS:MMUTT_ASPELL} && \
+ ! ${PORT_OPTIONS:MMUTT_ISPELL)
+OPTIONS_SET+=MUTT_ASPELL
.endif
-.if defined(WITH_MUTT_ASPELL)
+.if ${PORT_OPTIONS:MMUTT_ASPELL}
BUILD_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
RUN_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
-.elif defined(WITH_MUTT_ISPELL)
+.elif ${PORT_OPTIONS:MMUTT_ISPELL}
BUILD_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
@@ -277,125 +286,125 @@
.endif
.endif
-.if defined(WITH_MUTT_NCURSES_PORT)
-WITH_MUTT_NCURSES= yes
+.if ${PORT_OPTIONS:MMUTT_NCURSES_PORT}
+OPTIONS_SET+=MUTT_NCURSES
.endif
-.if defined(WITH_MUTT_SLANG) || defined(WITH_SLANG)
-MUTT_USES_SLANG= yes
+.if ${PORT_OPTIONS:MMUTT_SLANG)} || defined(WITH_SLANG)
+OPTIONS_SET+=MUTT_USES_SLANG
.endif
-.if defined(WITH_MUTT_NCURSES) && !defined(MUTT_USES_SLANG)
-MUTT_USES_NCURSES= yes
+.if ${PORT_OPTIONS:MMUTT_NCURSES} && ! ${PORT_OPTIONS:MMUTT_USES_SLANG}
+OPTIONS_SET+=MUTT_USES_NCURSES
.endif
-.if !defined(MUTT_USES_SLANG) && !defined(WITHOUT_MUTT_SLANG)
-MUTT_USES_NCURSES= yes
+.if ! ${PORT_OPTIONS:MMUTT_USES_SLANG} && ${PORT_OPTIONS:MMUTT_SLANG}
+OPTIONS_SET+=MUTT_USES_NCURSES
.endif
-.if defined(WITHOUT_MUTT_SGMLFORMAT)
+.if ! ${PORT_OPTIONS:MMUTT_SGMLFORMAT}
XML_USED= no
.endif
-.if defined(WITHOUT_MUTT_XML)
+.if ! ${PORT_OPTIONS:MMUTT_XML)
XML_USED= no
.endif
.if !defined(XML_USED)
XML_USED= no
.endif
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
USE_GETTEXT= yes
.endif
-.if !defined(WITHOUT_MUTT_ICONV)
+.if ${PORT_OPTIONS:MUTT_ICONV)
USE_ICONV= yes
.endif
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
XML_USED= no
.endif
-.if defined(WITH_MUTT_NCURSES_PORT)
-.if !defined(MUTT_USES_SLANG)
-MUTT_USES_NCURSES_PORT= yes
+.if ${PORT_OPTIONS:MMUTT_NCURSES_PORT}
+.if ! ${PORT_OPTIONS:MMUTT_USES_SLANG}
+OPTIONS_SET+=MUTT_USES_NCURSES_PORT
.endif
.endif
-.if defined(MUTT_USES_NCURSES_PORT)
-WITH_NCURSES_PORT= yes
+.if ${PORT_OPTIONS:MMUTT_USES_NCURSES_PORT}
+OPTIONS_SET+=NCURSES_PORT
CFLAGS+= -I${NCURSESINC}
-.elif defined(MUTT_USES_SLANG)
+.elif ${PORT_OPTIONS:MMUTT_USES_SLANG}
LIB_DEPENDS+= slang.2:${PORTSDIR}/devel/libslang2
.endif
-.if defined(WITH_MUTT_CYRUS_SASL2)
+.if ${PORT_OPTIONS:MMUTT_CYRUS_SASL2}
LIB_DEPENDS+= sasl2:${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) && ${PORT_OPTIONS:MMUTT_IDN}
+OPTIONS_SET+=MUTT_IDN
.endif
-.if defined(WITH_MUTT_IDN)
+.if ${PORT_OPTIONS:MMUTT_IDN}
LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn
.endif
-.if defined(WITH_MUTT_GPGME)
+.if ${PORT_OPTIONS:MMUTT_GPGME}
LIB_DEPENDS+= gpgme:${PORTSDIR}/security/gpgme
.endif
-.if ! defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT)
+.if ${PORT_OPTIONS:MMUTT_SMIME_OUTLOOK_COMPAT}
post-patch::
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook
.endif
-.if defined(WITH_MUTT_SIGNATURE_MENU)
+.if ${PORT_OPTIONS:MMUTT_SIGNATURE_MENU}
IGNORE= the WITH_MUTT_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 ${PORT_OPTIONS:MMUTT_MAILDIR_MTIME_PATCH}
post-patch::
-.if defined(WITH_MUTT_NNTP)
+.if ${PORT_OPTIONS:MMUTT_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 ${PORT_OPTIONS:MMUTT_ASPELL}
post-patch::
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-aspell
.endif
-.if defined(WITH_MUTT_REVERSE_REPLY_PATCH)
+.if ${PORT_OPTIONS:MMUTT_REVERSE_REPLY_PATCH}
post-patch::
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-reverse_reply
.endif
-.if defined(WITH_MUTT_PARENT_CHILD_MATCH_PATCH)
+.if ${PORT_OPTIONS:MMUTT_PARENT_CHILD_MATCH_PATCH}
post-patch::
@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-parent-child-match
.endif
-.if defined(WITHOUT_MUTT_FLOCK)
+.if ${PORT_OPTIONS:MMUTT_FLOCK}
+CONFIGURE_ARGS+= --enable-flock
+.else
CONFIGURE_ARGS+= --disable-flock
-.else
-CONFIGURE_ARGS+= --enable-flock
.endif
-.if defined(WITH_MUTT_LOCALES_FIX)
+.if ${PORT_OPTIONS:MMUTT_LOCALES_FIX}
CONFIGURE_ARGS+= --enable-locales-fix
.endif
-.if defined(MUTT_USES_NCURSES_PORT)
+.if ${PORT_OPTIONS:MMUTT_USES_NCURSES_PORT}
CONFIGURE_ARGS+= --with-curses=${NCURSESBASE}
-.elif defined(MUTT_USES_SLANG)
+.elif ${PORT_OPTIONS:MMUTT_USES_SLANG}
CONFIGURE_ARGS+= --with-slang=${LOCALBASE}
.else
CONFIGURE_ARGS+= --with-curses=${NCURSESBASE}
.endif
-.if defined(WITH_MUTT_CYRUS_SASL2)
+.if ${PORT_OPTIONS:MMUTT_CYRUS_SASL2}
CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
.endif
-.if defined(WITHOUT_NLS)
+.if ! ${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS+= --disable-nls
.endif
-.if defined(WITHOUT_MUTT_ICONV)
+.if ${PORT_OPTIONS:MMUTT_ICONV}
+CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE}
+.else
CONFIGURE_ARGS+= --disable-iconv
-.else
-CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE}
.endif
-.if defined(WITH_MUTT_IDN)
+.if ${PORT_OPTIONS:MMUTT_IDN}
CONFIGURE_ARGS+= --with-idn
.else
CONFIGURE_ARGS+= --without-idn
.endif
-.if defined(WITH_MUTT_GPGME)
+.if ${PORT_OPTIONS:MMUTT_GPGME}
CONFIGURE_ARGS+= --enable-gpgme
.else
CONFIGURE_ARGS+= --disable-gpgme
@@ -421,18 +430,18 @@
LDFLAGS+= -L${LOCALBASE}/lib -rpath=${LOCALBASE}/lib:/usr/lib
CFLAGS+= ${CFLAGS_ADD}
LDFLAGS+= ${LDFLAGS_ADD}
-.if defined(WITH_MUTT_SMTP)
+.if ${PORT_OPTIONS:MMUTT_SMTP}
CONFIGURE_ARGS+= --enable-smtp
.else
CONFIGURE_ARGS+= --disable-smtp
.endif
-.if defined(WITH_MUTT_DEBUG)
+.if ${PORT_OPTIONS:MMUTT_DEBUG}
CONFIGURE_ARGS+= --enable-debug
.endif
PATCH_DIST_STRIP= -p1
-.if ! defined (WITHOUT_MUTT_COMPRESSED_FOLDERS)
+.if ${PORT_OPTIONS:MMUTT_COMPRESSED_FOLDERS}
DISTFILES+= patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv
CONFIGURE_ARGS+= --enable-compressed
XML_NEEDED= yes
@@ -442,7 +451,7 @@
${WRKDIR}/patch-compressed
@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-compressed
.endif
-.if defined(WITH_MUTT_NNTP)
+.if ${PORT_OPTIONS:MMUTT_NNTP}
DISTFILES+= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv
CONFIGURE_ARGS+= --enable-nntp
XML_NEEDED= yes
@@ -452,22 +461,22 @@
${WRKDIR}/patch-nntp
@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp
.endif
-.if ! defined(WITHOUT_MUTT_QUOTE_PATCH)
+.if ${PORT_OPTIONS:MMUTT_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 ${PORT_OPTIONS:MMUTT_IFDEF_PATCH}
post-patch::
@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef
.endif
-.if defined(WITH_MUTT_MBOX_HOOK_PATCH)
+.if ${PORT_OPTIONS:MMUTT_MBOX_HOOK_PATCH}
IGNORE= the WITH_MUTT_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 ${PORT_OPTIONS:MMUTT_SIDEBAR_PATCH}
XML_NEEDED= yes
-.if defined(WITH_MUTT_NNTP)
+.if ${PORT_OPTIONS:MMUTT_NNTP}
post-patch::
@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-nntp
.else
@@ -475,11 +484,11 @@
@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar
.endif
.endif
-.if defined(WITH_MUTT_GREETING_PATCH)
+.if ${PORT_OPTIONS:MMUTT_GREETING_PATCH}
post-patch::
@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-greeting
.endif
-.if defined(WITH_MUTT_TRASH_PATCH)
+.if ${PORT_OPTIONS:MMUTT_TRASH_PATCH}
post-patch::
@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-trash-purge
.endif
@@ -487,7 +496,7 @@
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
MAN1= mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1
MAN5= muttrc.5
-.if !defined(WITHOUT_MUTT_MAILBOX_MANPAGES)
+.if ${PORT_OPTIONS:MMUTT_MAILBOX_MANPAGES}
MAN5+= mbox.5 mmdf.5
.endif
@@ -498,7 +507,7 @@
${WRKSRC}/contrib/pgp6.rc
@${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \
${WRKSRC}/contrib/Makefile.am
-.if defined(WITHOUT_MUTT_MAILBOX_MANPAGES)
+.if ! ${PORT_OPTIONS:MMUTT_MAILBOX_MANPAGES}
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-no-mbox-manpage
.endif
@@ -510,20 +519,21 @@
${WRKSRC}/imap/auth_gss.c
.endif
-.if defined(MUTT_SLAVE_HTML_PAGES)
+.if ${PORT_OPTIONS:MMUTT_SLAVE_HTML_PAGES}
SCRIPTS_ENV+= MUTT_SLAVE_HTML_PAGES="${MUTT_SLAVE_HTML_PAGES}"
.endif
-.if defined(WITH_MUTT_NNTP)
+.if ${PORT_OPTIONS:MMUTT_NNTP}
+CATEGORIES+= news
SCRIPTS_ENV+= MUTT_NNTP="yes"
.endif
-.if ! defined (WITHOUT_MUTT_COMPRESSED_FOLDERS)
+.if ${PORT_OPTIONS:MMUTT_COMPRESSED_FOLDERS}
SCRIPTS_ENV+= MUTT_COMPRESSED_FOLDERS="yes"
.endif
-.if ! defined(WITHOUT_MUTT_QUOTE_PATCH)
+.if ${PORT_OPTIONS:MMUTT_QUOTE_PATCH}
SCRIPTS_ENV+= MUTT_QUOTE_PATCH="yes"
.endif
-.if defined(WITH_MUTT_IMAP_HEADER_CACHE)
-.if defined(WITH_TOKYOCABINET)
+.if ${PORT_OPTIONS:MMUTT_IMAP_HEADER_CACHE}
+.if ${PORT_OPTIONS:MTOKYOCABINET}
CONFIGURE_ARGS+= --enable-hcache --without-gdbm --without-bdb --with-tokyocabinet
LIB_DEPENDS+= tokyocabinet.9:${PORTSDIR}/databases/tokyocabinet
.else
@@ -533,29 +543,29 @@
.else
CONFIGURE_ARGS+= --disable-hcache
.endif
-.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
+.if ${PORT_OPTIONS:MMUTT_MAILDIR_HEADER_CACHE}
CONFIGURE_ARGS+= --without-qdbm
.endif
-.if defined(WITH_MUTT_SIDEBAR_PATCH)
+.if ${PORT_OPTIONS:MMUTT_SIDEBAR_PATCH}
SCRIPTS_ENV+= MUTT_SIDEBAR_PATCH="yes"
.endif
-.if defined(WITH_MUTT_SIGNATURE_MENU)
+.if ${PORT_OPTIONS:MMUTT_SIGNATURE_MENU}
SCRIPTS_ENV+= MUTT_SIGNATURE_MENU="yes"
.endif
-.if defined(WITH_MUTT_IFDEF_PATCH)
+.if ${PORT_OPTIONS:MMUTT_IFDEF_PATCH}
SCRIPTS_ENV+= MUTT_IFDEF_PATCH="yes"
.endif
-.if ! defined(WITHOUT_MUTT_HTML)
+.if ${PORT_OPTIONS:MMUTT_HTML}
SCRIPTS_ENV+= MUTT_HTML="yes"
.endif
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
SCRIPTS_ENV+= MUTT_NLS="yes"
.endif
-.if defined(WITH_MUTT_REVERSE_REPLY_PATCH)
+.if ${PORT_OPTIONS:MMUTT_REVERSE_REPLY_PATCH}
SCRIPTS_ENV+= MUTT_REVERSE_REPLY_PATCH="yes"
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
SCRIPTS_ENV+= MUTT_PORTDOCS="yes"
post-build:
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
@@ -567,16 +577,16 @@
-e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
${WRKSRC}/doc/muttrc.man
-.if ! defined(WITHOUT_MUTT_HTML)
+.if ${PORT_OPTIONS:MMUTT_HTML}
XML_USED= yes
.endif
-.if defined(XML_NEEDED) && !defined(WITHOUT_MUTT_XML)
+.if defined(XML_NEEDED) && ${PORT_OPTIONS:MMUTT_XML}
XML_USED= yes
.endif
-.else # ! NOPORTDOCS
+.else # ! DOCS
post-patch::
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
-.endif # ! NOPORTDOCS
+.endif # ! DOCS
.if ${XML_USED} == yes
BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \
@@ -591,20 +601,20 @@
post-install:
${INSTALL_DATA} ${WRKSRC}/doc/Muttrc ${PREFIX}/etc/Muttrc.dist
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${ECHO} "===> Installing Mutt documentation"
@${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 ${PORT_OPTIONS:MMUTT_NNTP}
@cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp ${DOCSDIR}
.endif
-.if ! defined(WITHOUT_MUTT_HTML)
+.if ${PORT_OPTIONS:MMUTT_HTML}
@${MKDIR} ${DOCSDIR}/html && ${CHMOD} a+rx ${DOCSDIR}/html
${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
.endif
.endif
-.if defined(MUTT_USES_SLANG)
+.if ${PORT_OPTIONS:MMUTT_USES_SLANG}
@${ECHO} "=====================================================" >> ${PKGMESSAGE}
@${ECHO} "You have installed ${PORTNAME} with SLANG support." >> ${PKGMESSAGE}
@${ECHO} "This may work for a color terminal only when defining" >> ${PKGMESSAGE}
@@ -612,8 +622,9 @@
@${ECHO} "environment." >> ${PKGMESSAGE}
@${ECHO} "=====================================================" >> ${PKGMESSAGE}
.endif
-.if !defined(BATCH) && defined(MUTT_USES_SLANG)
+
+.if !defined(BATCH) && ${PORT_OPTIONS:MMUTT_USES_SLANG}
@${CAT} ${PKGMESSAGE}
@${ECHO}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: pkg-descr
===================================================================
--- pkg-descr (revision 310108)
+++ pkg-descr (working copy)
@@ -6,7 +6,6 @@
RFC1522 support for encoded headers), customizable key bindings, POP3,
Delivery Status Notification (DSN) support, and PGP/MIME.
-WWW: http://www.mutt.org/
Mutt User Information: http://www.math.fu-berlin.de/~guckes/mutt/
- -- David (obrien at cs.ucdavis.edu)
+WWW: http://www.mutt.org/
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list