Index: head/devel/otrs/Makefile
===================================================================
--- head/devel/otrs/Makefile	(revision 341582)
+++ head/devel/otrs/Makefile	(revision 341583)
@@ -1,217 +1,217 @@
 # Created by: Sergey Skvortsov <skv@protey.ru>
 # $FreeBSD$
 
 PORTNAME=	otrs
 PORTVERSION=	3.2.13
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.otrs.org/pub/otrs/ \
 		ftp://ftp.samurai.com/pub/otrs/ \
 		http://ftp.gwdg.de/pub/misc/otrs/ \
 		http://mirror.xaranet.de/otrs/
 
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Open Ticket Request System
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	p5-Date-Pcalc>=0:${PORTSDIR}/devel/p5-Date-Pcalc \
 		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
 		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
 		p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
 		p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
 		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
 		p5-MIME-Tools>=5.427:${PORTSDIR}/mail/p5-MIME-Tools \
 		p5-Net-DNS>=0.66:${PORTSDIR}/dns/p5-Net-DNS \
 		p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff \
 		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
 		p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
 		p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS \
 		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
 		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
 		p5-CSS-Minifier-XS>=0:${PORTSDIR}/textproc/p5-CSS-Minifier-XS \
 		p5-JavaScript-Minifier-XS>=0:${PORTSDIR}/textproc/p5-JavaScript-Minifier-XS \
 		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
 		p5-XML-FeedPP>=0:${PORTSDIR}/textproc/p5-XML-FeedPP \
 		p5-IO-Interactive>=0:${PORTSDIR}/devel/p5-IO-Interactive \
 		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
 		p5-YAML-LibYAML>=0:${PORTSDIR}/textproc/p5-YAML-LibYAML \
 		p5-Email-Valid>=0:${PORTSDIR}/mail/p5-Email-Valid
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		shebangfix
 SHEBANG_FILES=	bin/cgi-bin/*.pl bin/fcgi-bin/*.pl bin/*.pl \
 		scripts/auto_build/*.pl scripts/tools/*.pl scripts/*.pl
 
 OPTIONS_DEFINE=		MYSQL PGSQL REPORTS_MODULES SMTP POP3 IMAP LDAP PDF \
 			GNUPG DOCS
 OPTIONS_DEFAULT=	MYSQL REPORTS_MODULES SMTP POP3 IMAP PDF ASPELL
 OPTIONS_RADIO=		SPELL
 OPTIONS_RADIO_SPELL=	ASPELL ISPELL
 
 IMAP_DESC=		Fetch email via IMAP
 POP3_DESC=		Fetch email via POP3
 SMTP_DESC=		Send email via SMTP
 REPORTS_MODULES_DESC=	Reports support
 
 USE_BZIP2=	yes
 
 OTRSDIR=	${PREFIX}/otrs
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
 
 SUB_FILES=	pkg-install pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 ROOT_DIRS_LIST=	Kernel bin scripts
 BIN_DIRS_LIST=	"" cgi-bin fcgi-bin
 PM_DIRS_LIST=	Kernel Kernel/Config Kernel/Config/Files Kernel/Language \
 		Modules Kernel/Output/HTML Kernel/Output/HTML/Lite \
 		Kernel/Output/HTML/Standard System System/Auth System/AuthSession \
 		System/Crypt System/CustomerAuth System/CustomerUser \
 		System/CustomerUser/ System/
 DOCS_DIRS_LIST=	"" manual/en
 DOCS_FILES_LIST=	C[A-Z]* INSTALL.md RE* UPGRADING.md
 
 SCRIPTS_DIRS_LIST=	"" database/update test tools
 CLEAN_FILES=	scripts/suse* scripts/redhat* \
 		var/httpd/htdocs/js/thirdparty/ckeditor-4.0/_source \
 		var/httpd/htdocs/skins/Agent/*/img/source
 
 USES=		perl5
 USE_APACHE_RUN=	22+
 
 PLIST_SUB+=	VER_CKEDITOR="4.0"
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
 RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 USE_MYSQL=	yes
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 USE_PGSQL=	yes
 .endif
 
 RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:${PORTSDIR}/www/mod_perl2
 
 .if ${PORT_OPTIONS:MREPORTS_MODULES}
 RUN_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
 		p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
 		p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil
 .endif
 
 .if ${PORT_OPTIONS:MSMTP}
 RUN_DEPENDS+=	p5-Net-SMTP-SSL>=0:${PORTSDIR}/mail/p5-Net-SMTP-SSL \
 		p5-Net-SMTP-TLS>=0:${PORTSDIR}/mail/p5-Net-SMTP-TLS \
 		p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL
 .endif
 
 .if ${PORT_OPTIONS:MPOP3}
 RUN_DEPENDS+=	p5-Mail-POP3Client>=0:${PORTSDIR}/mail/p5-Mail-POP3Client \
 		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
 .endif
 
 .if ${PORT_OPTIONS:MIMAP}
 RUN_DEPENDS+=	p5-Net-IMAP-Simple-SSL>=0:${PORTSDIR}/mail/p5-Net-IMAP-Simple-SSL
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
 RUN_DEPENDS+=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
 .if ${PORT_OPTIONS:MPDF}
 RUN_DEPENDS+=	p5-PDF-API2>=0.57:${PORTSDIR}/textproc/p5-PDF-API2
 . if ${PERL_LEVEL} < 500903
 RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
 . endif
 .endif
 
 .if ${PORT_OPTIONS:MISPELL}
-RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
+RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/aspell-ispell
 .endif
 
 .if ${PORT_OPTIONS:MASPELL}
 RUN_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
 .endif
 
 .if ${PORT_OPTIONS:MGNUPG}
 RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg1
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.pm" | \
 		${XARGS} ${REINPLACE_CMD} -i '' \
       			-e 's|Digest::SHA::PurePerl|Digest::SHA|g'
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 	@${RM} -rf ${WRKSRC}/Kernel/cpan-lib/ \
 		${CLEAN_FILES:S!^!${WRKSRC}/!}
 	#shebang file only gets the first instance of /usr/bin/perl
 	@${REINPLACE_CMD} -i '' -e "s|/usr/bin/perl|${LOCALBASE}/bin/perl|g" \
 		${WRKSRC}/bin/otrs.CreateApacheStartupFile.pl
 
 do-build:
 	@${FIND} ${WRKSRC}/Kernel -type d | ${XARGS} ${CHMOD} 0755
 	@${FIND} ${WRKSRC}/Kernel -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \
 		-e "s=/opt/=${PREFIX}/=g;s=wwwrun=${WWWOWN}=g;"
 .if ${PORT_OPTIONS:MISPELL}
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \
 		-e "s=/usr/bin/ispell=${PREFIX}/bin/ispell=g"
 .endif
 .if ${PORT_OPTIONS:MASPELL}
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \
 		-e "s=/usr/bin/ispell=${PREFIX}/bin/aspell=g"
 .endif
 .if ${PORT_OPTIONS:MGNUPG}
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \
 		-e "s=/usr/bin/gpg=${PREFIX}/bin/gpg=g"
 .endif
 
 do-install:
 	@${MKDIR} ${ROOT_DIRS_LIST:S!^!${OTRSDIR}/!} ${BIN_DIRS_LIST:S!^!${OTRSDIR}/bin/!} \
 		${SCRIPTS_DIRS_LIST:S!^!${OTRSDIR}/scripts/!}
 	@${INSTALL_DATA} ${WRKSRC}/.*.dist ${OTRSDIR}/
 	@${INSTALL_DATA} ${WRKSRC}/RELEASE ${OTRSDIR}/
 .for D in ${BIN_DIRS_LIST}
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/${D}/*.* ${OTRSDIR}/bin/${D}/
 .endfor
 	@(cd ${WRKSRC} && ${PAX} -r -w Kernel var ${OTRSDIR})
 .if !exists(${OTRSDIR}/Kernel/Config.pm)
 	@${CP} ${OTRSDIR}/Kernel/Config.pm.dist ${OTRSDIR}/Kernel/Config.pm
 .endif
 .if !exists(${OTRSDIR}/Kernel/Config/GenericAgent.pm)
 	@${CP} ${OTRSDIR}/Kernel/Config/GenericAgent.pm.dist ${OTRSDIR}/Kernel/Config/GenericAgent.pm
 .endif
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${OTRSDIR}/Kernel
 	@${INSTALL_SCRIPT} ${WRKSRC}/scripts/*.[ps][lh] ${OTRSDIR}/scripts/
 	@${INSTALL_DATA} ${WRKSRC}/scripts/apache* \
 		${WRKSRC}/scripts/*.sql ${OTRSDIR}/scripts/
 	@${INSTALL_DATA} ${WRKSRC}/scripts/database/update/*.* ${OTRSDIR}/scripts/database/update/
 	@${INSTALL_DATA} ${WRKSRC}/scripts/database/*.* ${OTRSDIR}/scripts/database/
 	@${INSTALL_SCRIPT} ${WRKSRC}/scripts/test/*.t ${OTRSDIR}/scripts/test/
 	@${INSTALL_SCRIPT} ${WRKSRC}/scripts/tools/*.pl ${OTRSDIR}/scripts/tools/
 .if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
 	@${MKDIR} ${DOCS_DIRS_LIST:S!^!${DOCSDIR}/!}
 	@${INSTALL_DATA} ${DOCS_FILES_LIST:S!^!${WRKSRC}/!} ${DOCSDIR}/
 .for D in ${DOCS_DIRS_LIST}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${D}/*.* ${DOCSDIR}/${D}/
 .endfor
 .endif
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 x-generate-plist:
 	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
 	| ${SED} -E '\
 		s=share/doc/${PORTNAME}=%%DOCSDIR%%=; \
 	')> temp-pkg-plist
 
 .include <bsd.port.post.mk>
Index: head/mail/horde3-imp/Makefile
===================================================================
--- head/mail/horde3-imp/Makefile	(revision 341582)
+++ head/mail/horde3-imp/Makefile	(revision 341583)
@@ -1,115 +1,115 @@
 # Created by: Thierry Thomas (<thierry@thomas.as>)
 # $FreeBSD$
 
 PORTNAME=	imp
 PORTVERSION=	4.3.11
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail www
 DISTFILES=	${PORTNAME}-h3-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Webmail system for IMAP/POP3 mailboxes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-h3-${PORTVERSION}
 
 #-----------------------------------------------------------------------
 NO_STAGE=	yes
 # You may define these options:
 #
 # - WITHOUT_LDAP	: if you do not need OpenLDAP;
 #
 # - WITHOUT_SMIME	: disable S/MIME;
 #
 # - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree;
 #
 # - WITHOUT_ASPELL	: for spelling bees...
 #
 # - WITH_ISPELL		: if you prefer ispell;
 #
 # - NOCRYPT		: if crypto is restricted in your country;
 #
 # - WITHOUT_SSL		: if you have not installed c-client WITH_SSL;
 #
 # - WITH_VALID_CERT	: if you own a valid SSL certificate;
 #
 # - WITH_HTML		: enable HTML composition mode;
 #-----------------------------------------------------------------------
 
 RUN_DEPENDS+=	${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL
 
 USE_PHP=	imap
 . if !defined(WITHOUT_LDAP)
 USE_PHP+=	ldap
 . endif
 
 .if !defined(WITHOUT_SMIME)
 USE_PHP+=	openssl
 .endif
 
 .if !defined(NOCRYPT)
 RUN_DEPENDS+=	${PEARDIR}/Mail/mimeDecode.php:${PORTSDIR}/mail/pear-Mail_mimeDecode \
 		${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
 .endif
 
 .if !defined(WITHOUT_ASPELL)
 RUN_DEPENDS+=	${LOCALBASE}/bin/aspell:${PORTSDIR}/textproc/aspell
 .elif defined(WITH_ISPELL)
-RUN_DEPENDS+=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell
+RUN_DEPENDS+=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/aspell-ispell
 .endif
 
 .if defined(WITH_HTML)
 RUN_DEPENDS+=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
 .endif
 
 CONFLICTS=	imp-3.*
 USE_HORDE=	base
 USES=		gettext
 PORTDOCS=	README CHANGES CREDITS INSTALL	\
 		RELEASE_NOTES  TODO  UPGRADING
 
 pre-configure:
 .if !defined(WITHOUT_ASPELL)
 	@${REINPLACE_CMD} -e "s:%%ASPELL%%:${LOCALBASE}/bin/aspell:" \
 		${WRKSRC}/config/conf.xml
 .elif defined(WITH_ISPELL)
 	@${REINPLACE_CMD} -e "s:%%ASPELL%%:${LOCALBASE}/bin/ispell:" \
 		${WRKSRC}/config/conf.xml
 .else
 	@${REINPLACE_CMD} -e "s:%%ASPELL%%::" ${WRKSRC}/config/conf.xml
 .endif
 .if !defined(NOCRYPT)
 	@${REINPLACE_CMD} -e "s:%%GPG%%:${LOCALBASE}/bin/gpg:" \
 		${WRKSRC}/config/conf.xml
 .else
 	@${REINPLACE_CMD} -e "s:%%GPG%%::" ${WRKSRC}/config/conf.xml
 .endif
 	@${REINPLACE_CMD} -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':"	\
 		${WRKSRC}/lib/MIME/Headers.php
 	@${REINPLACE_CMD} -e "s:example.com:${HOSTNAME}:g"	\
 		${WRKSRC}/config/servers.php.dist
 .if defined(WITHOUT_SSL)
 	@${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/notls:;s:%%IMAPPORT%%:143:"	\
 		${WRKSRC}/config/servers.php.dist
 .else
 	@${REINPLACE_CMD} -e "s:%%IMAPPORT%%:993:" ${WRKSRC}/config/servers.php.dist
 . if defined(WITH_VALID_CERT)
 	@${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl:" ${WRKSRC}/config/servers.php.dist
 . else
 	@${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl/novalidate-cert:"	\
 		${WRKSRC}/config/servers.php.dist
 . endif
 .endif
 
 pre-install:
 .if !defined(BATCH) && !defined(WITHOUT_SSL)
 	@if ! ${GREP} -q -e 'CCLIENT_SSLENABLED "yes"' ${PORTREV_H}; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please configure c-client with SSL support." ; \
 	    ${ECHO_MSG} "" ; \
 	    ${FALSE} ; \
 	fi
 .endif
 
 .include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
Index: head/mail/mutt/Makefile
===================================================================
--- head/mail/mutt/Makefile	(revision 341582)
+++ head/mail/mutt/Makefile	(revision 341583)
@@ -1,499 +1,499 @@
 # Created by: Udo Schweigert
 # $FreeBSD$
 
 PORTNAME=	mutt
 PORTVERSION=	1.5.22
 PORTREVISION=	0
 CATEGORIES+=	mail ipv6
 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/ \
 		http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
 		http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
 		http://www3.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
 		ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
 		ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
 		http://www.spinnaker.de/mutt/compressed/:rr \
 		http://lunar-linux.org/~tchan/mutt/:tchan
 DISTNAME=	mutt-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES+=	http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
 		http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
 		http://www3.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
 		ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
 		ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
 		http://home.woolridge.ca/mutt/patches/:dw \
 		http://www.spinnaker.de/mutt/compressed/:rr \
 		http://www.emaillab.org/mutt/${AC_PATCH_VERSION}/:jp
 
 MAINTAINER?=	udo.schweigert@siemens.com
 COMMENT?=	The Mongrel of Mail User Agents (development version)
 
 CONFLICTS?=	ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-1.4* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]*
 
 DIST_SUBDIR=	mutt
 DOCSDIR?=	${PREFIX}/share/doc/mutt
 EXAMPLESDIR?=	${PREFIX}/share/examples/mutt
 DATADIR?=	${PREFIX}/share/mutt
 CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--disable-fcntl --with-ssl=${OPENSSLBASE} \
 		--with-docdir=${DOCSDIR} --sysconfdir=${PREFIX}/etc \
 		--enable-external-dotlock --enable-pop --enable-imap \
 		--disable-warnings
 .if defined(MUTT_CONFIGURE_ARGS)
 CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
 .endif
 
 USE_AUTOTOOLS=	automake autoconf
 AUTOMAKE_ARGS=	--add-missing
 USE_OPENSSL=	yes
 
 .if defined (MUTT_LITE)
 LITE=	YES
 .endif
 .if !defined (LITE)
 OPTIONS_DEFINE=	COMPRESSED_FOLDERS SASL DEBUG FLOCK \
 		GPGME GREETING_PATCH GSSAPI HTML ICONV IDN IFDEF_PATCH \
 		IMAP_HEADER_CACHE LOCALES_FIX MAILBOX_MANPAGES \
 		MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH \
 		NNTP PARENT_CHILD_MATCH_PATCH \
 		QUOTE_PATCH REVERSE_REPLY_PATCH SGMLFORMAT SIDEBAR_PATCH \
 		SIGNATURE_MENU SMART_DATE SMIME_OUTLOOK_COMPAT SMTP \
 		TOKYOCABINET TRASH_PATCH XML
 
 OPTIONS_SINGLE=	SCREEN
 OPTIONS_RADIO=	SPELL
 OPTIONS_RADIO_SPELL=	ASPELL ISPELL
 OPTIONS_SINGLE_SCREEN=	NCURSES SLANG
 
 COMPRESSED_FOLDERS_DESC=	Compressed folders
 SASL_DESC=	SASL authentication
 DEBUG_DESC=	Debugging capabilities
 FLOCK_DESC=	flock() usage
 GPGME_DESC=	Gpgme interface
 GREETING_PATCH_DESC=	Greeting support
 GSSAPI_DESC=	Use the gss API
 HTML_DESC=	HTML documentation
 IFDEF_PATCH_DESC=	ifdef feature
 IMAP_HEADER_CACHE_DESC=	IMAP header cache
 LOCALES_FIX_DESC=	Locales fix
 MAILBOX_MANPAGES_DESC=	Install mbox.5/mmdf.5 manpages
 MAILDIR_HEADER_CACHE_DESC=	Maildir header cache
 MAILDIR_MTIME_PATCH_DESC=	Maildir mtime patch
 MBOX_HOOK_PATCH_DESC=	Enhanced mbox-hook
 NCURSES_DESC=	Ncurses support
 PARENT_CHILD_MATCH_PATCH_DESC=	Parent/child match
 QUOTE_PATCH_DESC=	Extended quoting
 REVERSE_REPLY_PATCH_DESC=	Reverse_reply
 SGMLFORMAT_DESC=	SGML support
 SIDEBAR_PATCH_DESC=	Sidebar support
 SIGNATURE_MENU_DESC=	Signature menu
 SLANG_DESC=	SLANG support
 SMART_DATE_DESC=	Dynamic date formatting with "%@"
 SMIME_OUTLOOK_COMPAT_DESC=	SMIME outlook compatibility
 SMTP_DESC=	SMTP relay support
 TOKYOCABINET_DESC=	Use tokyocabinet instead of Berkley DB
 TRASH_PATCH_DESC=	Trash folder support
 XML_DESC=	Use XML tools for building documentation
 
 OPTIONS_DEFAULT=	COMPRESSED_FOLDERS HTML ICONV MAILBOX_MANPAGES \
 		NCURSES QUOTE_PATCH SGMLFORMAT SMIME_OUTLOOK_COMPAT \
 		NLS XML SMTP
 .endif
 
 PLIST=		${WRKDIR}/PLIST
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SCRIPTS_ENV=	WRKDIR="${WRKDIR}"
 
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 DW_PATCH_VERSION=	1.5.6
 AC_PATCH_VERSION=	1.5.9
 DW_MBOX_PATCH_VERSION=	1.5.18
 .if !defined(VVV_PATCH_VERSION)
 VVV_PATCH_VERSION=	${PORTVERSION}
 .endif
 .if !defined(RR_PATCH_VERSION)
 RR_PATCH_VERSION=	${PORTVERSION}
 .endif
 .if !defined(DW_PATCH_VERSION)
 DW_PATCH_VERSION=	${PORTVERSION}
 .endif
 .if !defined(DW_MBOX_PATCH_VERSION)
 DW_MBOX_PATCH_VERSION=	${DW_PATCH_VERSION}
 .endif
 .if !defined(AC_PATCH_VERSION)
 AC_PATCH_VERSION=	${PORTVERSION}
 .endif
 
 .if defined (LITE)
 PKGNAMESUFFIX=	-lite
 .endif
 
 # XXX
 # this should be done automagically by aclocal but ....
 # for now, this will have to do
 pre-build:
 	@${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \
 			-e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \
 			-e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \
 			-e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \
 		${BUILD_WRKSRC}/Makefile
 
 RUN_DEPENDS+=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
 
 .if !defined (LITE)
 .if ${PORT_OPTIONS:MASPELL}
 BUILD_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
 RUN_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
 .elif ${PORT_OPTIONS:MISPELL}
-BUILD_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
-RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
+BUILD_DEPENDS+=	ispell:${PORTSDIR}/textproc/aspell-ispell
+RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/aspell-ispell
 .endif
 .if defined(PACKAGE_BUILDING)
 RUN_DEPENDS+=	urlview:${PORTSDIR}/textproc/urlview
 .endif
 .endif
 
 # Handle ncurses/ncurses-port/slang
 .if ${PORT_OPTIONS:MSLANG}
 CONFIGURE_ARGS+=	--with-slang=${LOCALBASE}
 LIB_DEPENDS+=	libslang.so:${PORTSDIR}/devel/libslang2
 .endif
 
 .if ${PORT_OPTIONS:MNCURSES}
 USES=		ncurses
 .endif
 
 .if ! ${PORT_OPTIONS:MSGMLFORMAT} || ! ${PORT_OPTIONS:MXML} || !defined(XML_USED) \
 	|| ! ${PORT_OPTIONS:MDOCS}
 XML_USED=	no
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 SCRIPTS_ENV+=	NLS="yes"
 .else
 CONFIGURE_ARGS+=	--disable-nls
 .endif
 
 .if ${PORT_OPTIONS:MSASL}
 LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MSMIME_OUTLOOK_COMPAT}
 post-patch::
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook
 .endif
 
 .if ${PORT_OPTIONS:MSMART_DATE}
 post-patch::
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smartdate
 .endif
 
 .if ${PORT_OPTIONS:MSIGNATURE_MENU}
 IGNORE=	the WITH_SIGNATURE_MENU does not work at the moment
 XML_NEEDED=	yes
 SCRIPTS_ENV+=	SIGNATURE_MENU="yes"
 post-patch::
 	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-signature-menu
 .endif
 
 .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
 post-patch::
 .if ${PORT_OPTIONS:MNNTP}
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
 .else
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-maildir-mtime
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MASPELL}
 post-patch::
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-aspell
 .endif
 
 .if ${PORT_OPTIONS:MREVERSE_REPLY_PATCH}
 post-patch::
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-reverse_reply
 .endif
 
 .if ${PORT_OPTIONS:MPARENT_CHILD_MATCH_PATCH}
 post-patch::
 	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-parent-child-match
 .endif
 
 .if ${PORT_OPTIONS:MFLOCK}
 CONFIGURE_ARGS+=	--enable-flock
 .else
 CONFIGURE_ARGS+=	--disable-flock
 .endif
 
 .if ${PORT_OPTIONS:MLOCALES_FIX}
 CONFIGURE_ARGS+=	--enable-locales-fix
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
 USES+=			iconv
 CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
 .else
 CONFIGURE_ARGS+=	--disable-iconv
 .endif
 
 .if ${PORT_OPTIONS:MIDN}
 LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
 CONFIGURE_ARGS+=	--with-idn
 .else
 CONFIGURE_ARGS+=	--without-idn
 .endif
 
 .if ${PORT_OPTIONS:MGPGME}
 LIB_DEPENDS+=	libgpgme.so:${PORTSDIR}/security/gpgme
 CONFIGURE_ARGS+=	--enable-gpgme
 .else
 CONFIGURE_ARGS+=	--disable-gpgme
 .endif
 LDFLAGS=
 
 .if ${PORT_OPTIONS:MGSSAPI}
 .if exists(${LOCALBASE}/bin/krb5-config)
 LIB_DEPENDS+=		libgssapi_krb5.so:${PORTSDIR}/security/krb5
 CONFIGURE_ARGS+=	--with-gss=${LOCALBASE}
 .elif exists(${KRB5_HOME}/bin/krb5-config)
 LIB_DEPENDS+=		libgssapi_krb5.so:${PORTSDIR}/security/krb5
 CONFIGURE_ARGS+=	--with-gss=${KRB5_HOME}
 LDFLAGS+=		-L${KRB5_HOME}/lib -rpath=${KRB5_HOME}/lib -ltinfow
 .elif exists(${HEIMDAL_HOME}/bin/krb5-config)
 LIB_DEPENDS+=		libgssapi_krb5.so:${PORTSDIR}/security/krb5
 CONFIGURE_ARGS+=	--with-gss=${HEIMDAL_HOME}
 LDFLAGS+=		-L${HEIMDAL_HOME}/lib -rpath=${HEIMDAL_HOME}/lib -ltinfow
 .elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=	--with-gss
 WITH_KRB5_SYS=YES
 .endif
 .endif
 
 LDFLAGS+=		-L${LOCALBASE}/lib -rpath=${LOCALBASE}/lib:/usr/lib -ltinfow
 CFLAGS+=		${CFLAGS_ADD}
 LDFLAGS+=		${LDFLAGS_ADD}
 
 .if ${PORT_OPTIONS:MSMTP}
 CONFIGURE_ARGS+=	--enable-smtp
 .else
 CONFIGURE_ARGS+=	--disable-smtp
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 PATCH_DIST_STRIP=	-p1
 
 .if ${PORT_OPTIONS:MCOMPRESSED_FOLDERS}
 DISTFILES+=	patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv
 CONFIGURE_ARGS+=	--enable-compressed
 XML_NEEDED=	yes
 pre-patch::
 	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.gz > ${WRKDIR}/patch-compressed
 	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
 		 ${WRKDIR}/patch-compressed
 	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-compressed
 .endif
 
 .if ${PORT_OPTIONS:MNNTP}
 DISTFILES+=	patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv
 DISTFILES+=	patch-${VVV_PATCH_VERSION}.vvv.nntp_ru.gz:vvv
 CONFIGURE_ARGS+=	--enable-nntp
 XML_NEEDED=	yes
 CATEGORIES+=	news
 SCRIPTS_ENV+=	NNTP="yes"
 pre-patch::
 	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.gz > ${WRKDIR}/patch-nntp
 	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
 		${WRKDIR}/patch-nntp
 	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp
 .endif
 
 .if ${PORT_OPTIONS:MQUOTE_PATCH}
 PATCHFILES+=	patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
 		patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
 XML_NEEDED=	yes
 .endif
 
 .if ${PORT_OPTIONS:MIFDEF_PATCH}
 post-patch::
 	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef
 .endif
 
 .if ${PORT_OPTIONS:MMBOX_HOOK_PATCH}
 IGNORE=	the MBOX_HOOK_PATCH does not work at the moment
 #PATCHFILES+=	p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
 .endif
 
 .if ${PORT_OPTIONS:MSIDEBAR_PATCH}
 XML_NEEDED=	yes
 .if ${PORT_OPTIONS:MNNTP}
 post-patch::
 	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-nntp
 .else
 post-patch::
 	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MGREETING_PATCH}
 post-patch::
 	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-greeting
 .endif
 .if ${PORT_OPTIONS:MTRASH_PATCH}
 post-patch::
 	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-trash-purge
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
 MAN1=		mutt.1 mutt_dotlock.1 flea.1 muttbug.1 pgpewrap.1 pgpring.1 smime_keys.1
 MAN5=		muttrc.5
 .if ${PORT_OPTIONS:MMAILBOX_MANPAGES}
 MAN5+=		mbox.5 mmdf.5
 .endif
 
 post-patch::
 	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
 		${WRKSRC}/contrib/gpg.rc
 	@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
 		${WRKSRC}/contrib/pgp6.rc
 	@${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \
 		${WRKSRC}/contrib/Makefile.am
 .if ! ${PORT_OPTIONS:MMAILBOX_MANPAGES}
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-no-mbox-manpage
 .endif
 
 pre-configure::
 	@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
 .if defined(WITH_KRB5_SYS)
 	@${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h.in
 	@${REINPLACE_CMD} -e 's|<gssapi/gssapi\.h>|<gssapi.h>|' \
 		${WRKSRC}/imap/auth_gss.c
 .endif
 
 .if ${PORT_OPTIONS:MSLAVE_HTML_PAGES}
 SCRIPTS_ENV+=	SLAVE_HTML_PAGES="${SLAVE_HTML_PAGES}"
 .endif
 
 .if ${PORT_OPTIONS:MCOMPRESSED_FOLDERS}
 SCRIPTS_ENV+=	COMPRESSED_FOLDERS="yes"
 .endif
 
 .if ${PORT_OPTIONS:MQUOTE_PATCH}
 SCRIPTS_ENV+=	QUOTE_PATCH="yes"
 .endif
 
 .if ${PORT_OPTIONS:MIMAP_HEADER_CACHE} || ${PORT_OPTIONS:MMAILDIR_HEADER_CACHE}
 .if ${PORT_OPTIONS:MTOKYOCABINET}
 CONFIGURE_ARGS+=	--enable-hcache --without-gdbm --without-bdb --with-tokyocabinet
 LIB_DEPENDS+=		libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
 .else
 USE_BDB=		42+
 CONFIGURE_ARGS+=	--enable-hcache --without-gdbm --with-bdb
 .endif
 .else
 CONFIGURE_ARGS+=	--disable-hcache
 .endif
 
 .if ${PORT_OPTIONS:MMAILDIR_HEADER_CACHE}
 CONFIGURE_ARGS+=	--without-qdbm
 .endif
 
 .if ${PORT_OPTIONS:MSIDEBAR_PATCH}
 SCRIPTS_ENV+=	SIDEBAR_PATCH="yes"
 .endif
 
 .if ${PORT_OPTIONS:MIFDEF_PATCH}
 SCRIPTS_ENV+=	IFDEF_PATCH="yes"
 .endif
 
 .if ${PORT_OPTIONS:MREVERSE_REPLY_PATCH}
 SCRIPTS_ENV+=	REVERSE_REPLY_PATCH="yes"
 .endif
 
 .if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
 XML_USED=	yes
 .endif
 .if ${PORT_OPTIONS:MHTML}
 XML_USED=	yes
 .endif
 
 .if ${PORT_OPTIONS:MDOCS} || ${XML_USED} == yes
 INSTALL_DOCS=	yes
 .else
 INSTALL_DOCS=	no
 .endif
 
 .if ${INSTALL_DOCS} == yes
 SCRIPTS_ENV+=	PORTDOCS="yes"
 .if ${PORT_OPTIONS:MHTML}
 SCRIPTS_ENV+=	HTML="yes"
 .endif
 post-build:
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
 	@${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \
 		-e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
 		-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
 		${WRKSRC}/doc/mutt.man
 	@${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \
 		-e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
 		-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
 		${WRKSRC}/doc/muttrc.man
 .else 	# ! INSTALL_DOCS
 post-patch::
 .if ${PORT_OPTIONS:MMAILBOX_MANPAGES}
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-mailbox-contrib
 .else
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
 .endif
 .endif # ! INSTALL_DOCS
 
 .if ${XML_USED} == yes
 BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
 		lynx:${PORTSDIR}/www/lynx
 post-patch::
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-xml
 .endif
 
 pre-install:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/generate-plist > ${PLIST}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/Muttrc ${PREFIX}/etc/Muttrc.dist
 .if ${INSTALL_DOCS} == yes
 	@${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 ${PORT_OPTIONS:MNNTP}
 	@cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp ${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MHTML}
 	@${MKDIR} ${DOCSDIR}/html && ${CHMOD} a+rx ${DOCSDIR}/html
 	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
 .endif
 .endif
 .if ${PORT_OPTIONS:MSLANG}
 	@${ECHO} "=====================================================" > ${PKGMESSAGE}
 	@${ECHO} "You have installed ${PORTNAME} with SLANG support." >> ${PKGMESSAGE}
 	@${ECHO} "This may work for a color terminal only when defining" >> ${PKGMESSAGE}
 	@${ECHO} "COLORTERM=yes and COLORFGBG=\"color1;color2\" in your" >> ${PKGMESSAGE}
 	@${ECHO} "environment." >> ${PKGMESSAGE}
 	@${ECHO} "=====================================================" >> ${PKGMESSAGE}
 .endif
 
 .if !defined(BATCH) && ${PORT_OPTIONS:MSLANG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO}
 .endif
 .include <bsd.port.mk>
Index: head/mail/mutt14/Makefile
===================================================================
--- head/mail/mutt14/Makefile	(revision 341582)
+++ head/mail/mutt14/Makefile	(revision 341583)
@@ -1,227 +1,227 @@
 # Created by: David O'Brien (obrien@NUXI.com)
 # $FreeBSD$
 
 PORTNAME=	mutt
 PORTVERSION=	1.4.2.3
 PORTREVISION=	1
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
 		ftp://ftp.demon.co.uk/pub/mirrors/mutt/
 
 PATCHVERSION=	1.4.2.2
 PATCH_SITES=	http://www.mutt.org.ua/download/mutt-${PATCHVERSION}/:vvv \
 		http://www2.mutt.org.ua/download/mutt-${PATCHVERSION}/:vvv \
 		http://www3.mutt.org.ua/download/mutt-${PATCHVERSION}/:vvv \
 		ftp://ftp.mutt.org.ua/pub/mutt/mutt-${PATCHVERSION}/:vvv \
 		ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${PATCHVERSION}/:vvv
 PATCHFILES=	patch-${PATCHVERSION}.rr.compressed.gz:vvv \
 		patch-${PATCHVERSION}.vvv.initials.gz:vvv
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER?=	udo.schweigert@siemens.com
 COMMENT?=	The Mongrel of Mailers (part Elm, Pine, Mush, mh, etc.)
 
 CONFLICTS?=	ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-devel-[0-9]* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]* mutt-[^1].[^4]*
 PKGNAMESUFFIX=	14
 
 OPTIONS_DEFINE=	NLS SGML_DOCS LOCALES_FIX MUTT_XFACE MUTT_FLOCK MUTT_ICONV GSSAPI
 OPTIONS_DEFAULT=	MUTT_FLOCK MUTT_ICONV GSSAPI
 
 OPTIONS_RADIO=		CONS
 OPTIONS_RADIO_CONS=	SLANG NCURSES
 
 .if defined(PACKAGE_BUILDING) && !defined (MUTT_LITE)
 OPTIONS_DEFAULT+=	SLANG
 .endif
 
 CONS_DESC=	Console driver (if none chosen, uses ncurses from base system)
 SLANG_DESC=	Adds display/screen management via S-Lang
 NCURSES_DESC=	Adds console graphics support with ncurses from ports
 SGML_DOCS_DESC=	Build mutt's SGML documentation
 LOCALES_FIX_DESC=	Enable locales fixes
 MUTT_XFACE_DESC=	Adds mutt X-Face support
 MUTT_FLOCK_DESC=	Use flock() for file locks
 MUTT_ICONV_DESC=	Enable mutt's iconv character conversion feature
 
 USE_OPENSSL=	yes
 
 .if defined (MUTT_LITE)
 PKGNAMESUFFIX=	14-lite
 OPTIONS_EXCLUDE=	SGML_DOCS
 .endif
 
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
 .if defined(PACKAGE_BUILDING) && !defined (MUTT_LITE)
 WITH_SLANG=	yes
-BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
-RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell \
+BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
+RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/aspell-ispell \
 		urlview:${PORTSDIR}/textproc/urlview
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext iconv
 .if ! ${PORT_OPTIONS:MMUTT_ICONV}
 IGNORE=	the MUTT_ICONV options of the mutt port only be disabled if \
 	NLS is also disabled
 .endif
 .elif ${PORT_OPTIONS:MMUTT_ICONV}
 USES+=	iconv
 .endif
 
 .if ${PORT_OPTIONS:MSLANG}
 LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
 .elif ${PORT_OPTIONS:MNCURSES}
 USES+=	ncurses:port
 .else
 USES+=	ncurses
 .endif
 .if !defined (MUTT_LITE)
 .if defined(WITH_MUTT_CYRUS_SASL)
 IGNORE=	the SASL support for mutt has been withdrawn. Please use the mutt-devel port instead
 .endif
 .if ${PORT_OPTIONS:MSGML_DOCS}
 BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
 .endif
 .if ${PORT_OPTIONS:MMUTT_XFACE}
 PATCH_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/news/slrnface:extract
 RUN_DEPENDS+=	slrnface:${PORTSDIR}/news/slrnface
 .endif
 .endif
 
 DIST_SUBDIR=	mutt
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	automake autoconf
 AUTOMAKE_ARGS=	--add-missing
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--enable-pop --enable-imap --disable-fcntl \
 		--with-ssl=${OPENSSLBASE} --sysconfdir=${PREFIX}/etc \
 		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${DOCSDIR} --with-charmaps \
 		--enable-compressed
 .if defined(MUTT_CONFIGURE_ARGS)
 CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
 .endif
 .if ${PORT_OPTIONS:MMUTT_FLOCK}
 CONFIGURE_ARGS+=	--enable-flock
 .else
 CONFIGURE_ARGS+=	--disable-flock
 .endif
 .if ${PORT_OPTIONS:MLOCALES_FIX}
 CONFIGURE_ARGS+=	--enable-locales-fix
 .endif
 .if ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 .if ! ${PORT_OPTIONS:MMUTT_ICONV} && ! ${PORT_OPTIONS:MNLS}
 CONFIGURE_ARGS+=	--disable-iconv
 .else
 CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
 .endif
 .if ${PORT_OPTIONS:MSLANG}
 CONFIGURE_ARGS+=	--with-slang=${PREFIX}
 .elif ${PORT_OPTIONS:MNCURSES}
 CONFIGURE_ARGS+=	--with-curses=${NCURSESBASE}
 CFLAGS+=	-I${NCURSESINC}
 .endif
 .if ${PORT_OPTIONS:MGSSAPI}
 .if exists(${LOCALBASE}/bin/gss-client)
 LIB_DEPENDS+=		gssapi_krb5:${PORTSDIR}/security/krb5
 CONFIGURE_ARGS+=	--with-gss=${LOCALBASE}
 .elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=	--with-gss
 WITH_MUTT_KRB5_SYS=YES
 .endif
 .endif
 MAN1=		mutt.1 mutt_dotlock.1
 MAN5=		mbox.5 muttrc.5
 
 post-patch::
 	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
 		${WRKSRC}/contrib/gpg.rc
 	@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
 		${WRKSRC}/contrib/pgp6.rc
 	@${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \
 		${WRKSRC}/contrib/Makefile.in
 
 .if ${PORT_OPTIONS:MMUTT_XFACE}
 post-patch::
 	@${ECHO} "===>  Applying XFACE patch"
 	slrnface_dir=`${FIND} ${PORTSDIR}/news/slrnface/work -type d \
 			-name slrnface-\*`; \
 	cd ${BUILD_WRKSRC}; ${PATCH} ${PATCH_ARGS} < $$slrnface_dir/mutt.patch
 .endif
 
 pre-configure::
 	@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
 .if defined(WITH_MUTT_KRB5_SYS)
 	@${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h.in
 	@${REINPLACE_CMD} -e 's|<gssapi/gssapi\.h>|<gssapi.h>|' \
 		${WRKSRC}/imap/auth_gss.c
 .endif
 
 # XXX
 # this should be done automagically by aclocal but ....
 # for now, this will have to do
 pre-build:
 	@${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \
 			-e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \
 			-e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \
 			-e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \
 		${BUILD_WRKSRC}/Makefile
 
 .if ${PORT_OPTIONS:MDOCS}
 post-build:
 	@${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
 	@${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \
 		-e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
 		-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
 		${WRKSRC}/doc/mutt.man
 	@${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \
 		-e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
 		-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
 		${WRKSRC}/doc/muttrc.man
 .if ${PORT_OPTIONS:MSGML_DOCS}
 PLIST:=		${WRKDIR}/PLIST
 pre-install:
 	@${CAT} ${PKGDIR}/pkg-plist.htmlfiles > ${PLIST}
 	@${CAT} ${PKGDIR}/pkg-plist >> ${PLIST}
 .endif
 .endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/etc/Muttrc.dist
 .if ${PORT_OPTIONS:MDOCS}
 	@${ECHO} "===>   Installing Mutt documentation"
 	@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}
 	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
 		${DOCSDIR}
 .if ${PORT_OPTIONS:MSGML_DOCS}
 	${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m 0755 \
 	    -d ${DOCSDIR}/html
 	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
 	${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${DOCSDIR}
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MMUTT_XFACE}
 	@${ECHO} ""
 	@${ECHO} "************************************************************"
 	@${ECHO} "  To enable the XFACE support in mutt you also have to add"
 	@${ECHO} "        set xface=yes"
 	@${ECHO} "  to your ~/.muttrc"
 	@${ECHO} "  Additional information is provided by news/slrnface"
 	@${ECHO} "************************************************************"
 	@${ECHO} ""
 .endif
 
 .include <bsd.port.mk>
Index: head/mail/openwebmail/Makefile
===================================================================
--- head/mail/openwebmail/Makefile	(revision 341582)
+++ head/mail/openwebmail/Makefile	(revision 341583)
@@ -1,215 +1,215 @@
 # Created by: Yen-Ming Lee <leeym@leeym.com>
 # $FreeBSD$
 
 PORTNAME=	openwebmail
 PORTVERSION=	2.53
 PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://openwebmail.acatysmoof.com/download/%SUBDIR%/ \
 		http://openwebmail.org/openwebmail/download/%SUBDIR%/
 MASTER_SITE_SUBDIR?=	release
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A webmail system designed to manage big mail folder files efficiently
 
 RUN_DEPENDS=	p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv
 
 USES=		perl5
 USE_PERL5=	run build patch
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 OWCGIDIR=	${PREFIX}/www/cgi-bin/openwebmail
 OWDATADIR=	${PREFIX}/www/data/openwebmail
 PATCH_WRKSRC=	${WRKSRC}/cgi-bin/openwebmail
 PATCH_STRIP=	-p1
 PLIST=		${WRKDIR}/.PLIST.${PKGNAME}
 
 OPTIONS_DEFINE=	ANTIWORD MAGICK ISPELL LEARNSPAM LSOF PAM POP3_OVER_SSL QUOTA \
 		SPAMCHECK SPAMCHECK_ALL SPEEDYCGI TNEF VIRUSCHECK VIRUSCHECK_ALL \
 		WGET ZLIB
 
 ANTIWORD_DESC=	AntiWord
 ISPELL_DESC=	ISpell
 LEARNSPAM_DESC=	Learn HAM/SPAM
 LSOF_DESC=	lsof
 PAM_DESC=	PAM
 POP3_OVER_SSL_DESC=	POP3 Over SSL
 QUOTA_DESC=	Quota
 SPAMCHECK_DESC=	Spam check (Mail::SpamAssassin)
 SPAMCHECK_ALL_DESC=	Spam check for all (default: pop3)
 SPEEDYCGI_DESC=	SpeedyCGI
 TNEF_DESC=	tnef
 VIRUSCHECK_DESC=	Virus check (Clam AntiVirus)
 VIRUSCHECK_ALL_DESC=	Virus check for all (default: pop3)
 WGET_DESC=	wget
 ZLIB_DESC=	ZLib
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 # WITH_SPEEDYCGI needs suidperl enabled under perl 5.8.4 or above,
 # so, disable it first, and enable it again if perl exists and enabled suidperl
 .if ${PERL_LEVEL} >= 500804 && !empty(PORT_OPTIONS:MSPEEDYCGI)
 DISABLE_SPEEDYCGI=yes
 PORT_OPTIONS:=	${PORT_OPTIONS:NSPEEDYCGI}
 .if exists(${PERL})
 PERL_V!=	${PERL} -V
 .if ${PERL_V:M*dosuid*} != ""
 .undef DISABLE_SPEEDYCGI
 .endif # dosuid
 .endif # exists(${PERL})
 .endif # perl5.8
 
 .if ${PORT_OPTIONS:MLEARNSPAM} || !empty(PORT_OPTIONS:MSPAMCHECK_ALL)
 PORT_OPTIONS+=	SPAMCHECK
 .endif
 
 .if ${PORT_OPTIONS:MVIRUSCHECK_ALL}
 PORT_OPTIONS+=	VIRUSCHECK
 .endif
 
 .if ${PORT_OPTIONS:MANTIWORD}
 RUN_DEPENDS+=	antiword:${PORTSDIR}/textproc/antiword
 .endif
 
 .if ${PORT_OPTIONS:MMAGICK}
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 .if ${PORT_OPTIONS:MISPELL}
-RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
+RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/aspell-ispell
 .endif
 
 .if ${PORT_OPTIONS:MLSOF}
 RUN_DEPENDS+	${LOCALBASE}/sbin/lsof:${PORTSDIR}/sysutils/lsof
 .endif
 
 .if ${PORT_OPTIONS:MPAM}
 RUN_DEPENDS+=	p5-Authen-PAM>=0:${PORTSDIR}/security/p5-Authen-PAM
 .endif
 
 .if ${PORT_OPTIONS:MPOP3_OVER_SSL}
 RUN_DEPENDS+=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
 .endif
 
 .if ${PORT_OPTIONS:MQUOTA}
 RUN_DEPENDS+=	p5-Quota>=0:${PORTSDIR}/sysutils/p5-Quota
 .endif
 
 .if ${PORT_OPTIONS:MTNEF}
 RUN_DEPENDS+=	${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef
 .endif
 
 .if ${PORT_OPTIONS:MSPAMCHECK}
 RUN_DEPENDS+=	p5-Mail-SpamAssassin>=0:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 .endif
 
 .if ${PORT_OPTIONS:MSPEEDYCGI}
 RUN_DEPENDS+=	speedy_suidperl:${PORTSDIR}/www/p5-CGI-SpeedyCGI
 .if ${PERL_LEVEL} < 500804
 EXTRA_PATCHES+=	${PATCH_WRKSRC}/misc/patches/suidperl2speedy_suidperl.patch
 .else
 EXTRA_PATCHES+=	${PATCH_WRKSRC}/misc/patches/suidperl2speedy_suidperl.notmp.patch
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MVIRUSCHECK}
 RUN_DEPENDS+=	clamdscan:${PORTSDIR}/security/clamav
 .endif
 
 .if ${PORT_OPTIONS:MWGET}
 RUN_DEPENDS+=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 .endif
 
 .if ${PORT_OPTIONS:MZLIB}
 . if ${PERL_LEVEL} < 500903
 RUN_DEPENDS+=	p5-IO-Compress>=0:${PORTSDIR}/archivers/p5-IO-Compress
 . endif
 .endif
 
 post-extract:
 .for x in addressbooks/global calendar.book
 	@${RM} ${WRKSRC}/cgi-bin/openwebmail/etc/${x}
 .endfor
 
 post-patch:
 	### XXX: Hack, some of this should be LOCALBASE
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g'
 .if defined(DISABLE_SPEEDYCGI)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "WARNING:"
 	@${ECHO_MSG} "Your perl doesn't support SUID, or you don't have perl yet,"
 	@${ECHO_MSG} "so SpeedyCGI support is disabled automatically."
 	@${ECHO_MSG} "If you want SpeedyCGI support, please reinstall perl with ENABLE_SUIDPERL=yes,"
 	@${ECHO_MSG} "and reinstall ${PORTNAME}."
 	@${ECHO_MSG} ""
 .endif
 	@${MV} ${PATCH_WRKSRC}/etc/openwebmail.conf ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 	@${PERL} -pi.bak -e 's,${LOCALBASE}/www/cgi-bin/openwebmail,${OWCGIDIR},g' ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 	@${PERL} -pi.bak -e 's,${LOCALBASE}/www/data/openwebmail,${OWDATADIR},g' ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 .if ${PORT_OPTIONS:MLEARNSPAM}
 	@${PERL} -pi.bak -e 's,enable_learnspam	no,enable_learnspam	yes,g' ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 .endif
 .if ${PORT_OPTIONS:MSPAMCHECK}
 	@${PERL} -pi.bak -e 's,enable_spamcheck	no,enable_spamcheck	yes,g' ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 	@${ECHO} "enable_saprefs	yes" >> ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 .endif
 .if ${PORT_OPTIONS:MSPAMCHECK_ALL}
 	@${ECHO} "spamcheck_source_allowed	all" >> ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 .endif
 .if ${PORT_OPTIONS:MVIRUSCHECK}
 	@${PERL} -pi.bak -e 's,enable_viruscheck	no,enable_viruscheck	yes,g' ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 .endif
 .if ${PORT_OPTIONS:MVIRUSCHECK_ALL}
 	@${ECHO} "viruscheck_source_allowed	all" >> ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 .endif
 .if ${PORT_OPTIONS:MSPEEDYCGI}
 	@${ECHO} "has_savedsuid_support	no" >> ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
 .else
 	@${PERL} -pi.bak -e 's,/usr/bin/suidperl,${PERL},g' ${PATCH_WRKSRC}/openwebmail*pl
 .endif
 
 pre-install:
 	@${FIND} ${WRKSRC}/*/openwebmail \( -name "*.bak" -or -name "*.orig" \) -delete
 .if !exists(${PLIST})
 	@${ECHO} "@unexec if cmp -s %D/www/cgi-bin/openwebmail/etc/openwebmail.conf %D/www/cgi-bin/openwebmail/etc/openwebmail.conf-dist; then ${RM} -f %D/www/cgi-bin/openwebmail/etc/openwebmail.conf; fi" > ${PLIST}
 	@${FIND} ${WRKSRC}/*/openwebmail -type f -o -type l | \
 		${GREP} -v UTF-8 | \
 		${SED} -e 's,${WRKSRC},www,g' | ${SORT} -u >> ${PLIST}
 	@${ECHO} "www/cgi-bin/openwebmail/etc/dbm.conf" >> ${PLIST}
 .for f in b2g g2b lunar
 	@${ECHO} "www/cgi-bin/openwebmail/etc/maps/${f}.db" >> ${PLIST}
 .endfor
 .if empty(PORT_OPTIONS:MSPEEDYCGI)
 	@${FIND} ${WRKSRC}/*/openwebmail -name "openwebmail*pl" | \
 		${SED} -e 's,${WRKSRC},www,g' \
 		-e 's,openwebmail/openwebmail,openwebmail/.openwebmail,g' \
 		>> ${PLIST}
 .endif
 	@${ECHO_CMD} "@unexec ${FIND} %D/www/*/openwebmail -name "*.UTF-8" | ${XARGS} ${RM} -fr" >> ${PLIST}
 	@${FIND} ${WRKSRC}/*/openwebmail -type d | ${SORT} -ur | \
 		${GREP} -v UTF-8 | \
 		${SED} -e 's,${WRKSRC},@dirrm www,g' >> ${PLIST}
 	@${ECHO_CMD} "@dirrmtry www/cgi-bin" >> ${PLIST}
 	@${ECHO_CMD} "@dirrmtry www/data" >> ${PLIST}
 .endif
 
 do-install:
 	@${MKDIR} ${OWCGIDIR} ${OWDATADIR}
 	@cd ${WRKSRC}/cgi-bin/openwebmail && ${FIND} . \
 		| ${CPIO} -dpum --quiet -R ${BINOWN}:mail ${OWCGIDIR}
 	@cd ${WRKSRC}/data/openwebmail && ${FIND} . \
 		| ${CPIO} -dpum --quiet -R ${SHAREOWN}:${SHAREGRP} ${OWDATADIR}
 .if !exists(${OWCGIDIR}/etc/openwebmail.conf)
 	@${CP} ${OWCGIDIR}/etc/openwebmail.conf-dist ${OWCGIDIR}/etc/openwebmail.conf
 .endif
 	@${PERL} ${OWCGIDIR}/misc/test/dbmtest.pl | ${GREP} "^dbm" > ${OWCGIDIR}/etc/dbm.conf
 	@${CHMOD} 4755 ${OWCGIDIR}/openwebmail*pl
 .if empty(PORT_OPTIONS:MSPEEDYCGI)
 	@${PERL} ${OWCGIDIR}/misc/tools/wrapsuid/wrapsuid.pl ${OWCGIDIR} 2>/dev/null
 .endif
 
 post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>