Attachment #111101 for bug #152318

Lines 168-173 Link Here

(-)./Makefile (-9 / +4 lines)
168	USE_AUTOTOOLS= automake:111 autoconf:268	168	USE_AUTOTOOLS= automake:111 autoconf:268
169	USE_OPENSSL= yes	169	USE_OPENSSL= yes
170		170
		171	.if !defined(WITHOUT_MUTT_OPTIONS)
		172	.include "${.CURDIR}/../mutt-devel/options"
		173	.endif
		174
171	PLIST= ${WRKDIR}/PLIST	175	PLIST= ${WRKDIR}/PLIST
172	PKGMESSAGE= ${WRKDIR}/pkg-message	176	PKGMESSAGE= ${WRKDIR}/pkg-message
173	SCRIPTS_ENV= WRKDIR="${WRKDIR}"	177	SCRIPTS_ENV= WRKDIR="${WRKDIR}"
Lines 195-205 Link Here
195	.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)	199	.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
196	WITH_MUTT_IMAP_HEADER_CACHE= yes	200	WITH_MUTT_IMAP_HEADER_CACHE= yes
197	.endif	201	.endif
198	.if ${OSVERSION} >= 700033 \|\| (${OSVERSION} < 700000 && ${OSVERSION} >= 602107)
199	NCURSES_IS_DEFAULT= yes
200	.else
201	SLANG_IS_DEFAULT= yes
202	.endif
203		202
204	.if defined (MUTT_LITE)	203	.if defined (MUTT_LITE)
205	WITHOUT_MUTT_XML= yes	204	WITHOUT_MUTT_XML= yes
Lines 253-264 Link Here
253	MUTT_USES_NCURSES= yes	252	MUTT_USES_NCURSES= yes
254	.endif	253	.endif
255	.if !defined(MUTT_USES_SLANG) && !defined(WITHOUT_MUTT_SLANG) && !defined(MUTT_USES_NCURSES)	254	.if !defined(MUTT_USES_SLANG) && !defined(WITHOUT_MUTT_SLANG) && !defined(MUTT_USES_NCURSES)
256	.if defined(SLANG_IS_DEFAULT)
257	MUTT_USES_SLANG= yes
258	.elif defined(NCURSES_IS_DEFAULT)
259	MUTT_USES_NCURSES= yes	255	MUTT_USES_NCURSES= yes
260	.endif	256	.endif
261	.endif
262	.if defined(WITHOUT_MUTT_SGMLFORMAT)	257	.if defined(WITHOUT_MUTT_SGMLFORMAT)
263	XML_USED= no	258	XML_USED= no
264	.endif	259	.endif

Lines 5-11 Link Here

(-)./files/patch-bdb (-1 / +1 lines)
5	done	5	done
6	done	6	done
7	- BDB_VERSIONS="db-4 db4 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"	7	- BDB_VERSIONS="db-4 db4 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
8	+ BDB_VERSIONS="db-4 db4 db-5.0 db5.0 db50 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"	8	+ BDB_VERSIONS="db-4 db4 db-5.1 db5.1 db51 db-5.0 db5.0 db50 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
9	AC_MSG_CHECKING([for BerkeleyDB > 4.0])	9	AC_MSG_CHECKING([for BerkeleyDB > 4.0])
10	for d in $bdbpfx; do	10	for d in $bdbpfx; do
11	BDB_INCLUDE_DIR=""	11	BDB_INCLUDE_DIR=""




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/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"	on \
		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"	on \
		MUTT_SMTP			"Enable SMTP relay support"	off \
		MUTT_XML			"Use XML tools for documentation"		on 

Return to bug 152318

Line 0 Link Here

(-)./options (+31 lines)
	1	OPTIONS= MUTT_ASPELL "Enable aspell support" off \
	2	MUTT_COMPRESSED_FOLDERS "Enable compressed folders" on \
	3	MUTT_CYRUS_SASL2 "Enable SASL2 authentication" off \
	4	MUTT_DEBUG "Enable debugging capabilities" off \
	5	MUTT_FLOCK "Enable flock() usage" off \
	6	MUTT_GPGME "Enable gpgme interface" off \
	7	MUTT_GREETING_PATCH "Enable greeting" off \
	8	MUTT_HTML "Enable HTML documentation" on \
	9	MUTT_ICONV "Enable iconv support" on \
	10	MUTT_IDN "Enable idn support" off \
	11	MUTT_IFDEF_PATCH "Enable ifdef feature" off \
	12	MUTT_IMAP_HEADER_CACHE "Enable imap header cache" off \
	13	MUTT_ISPELL "Enable ispell support" off \
	14	MUTT_LOCALES_FIX "Enable locales fix" off \
	15	MUTT_MAILBOX_MANPAGES "Install mbox.5/mdf.8 manpages" on \
	16	MUTT_MAILDIR_HEADER_CACHE "Enable maildir header cache" off \
	17	MUTT_MAILDIR_MTIME_PATCH "Enable Maildir mtime patch" off \
	18	MUTT_MBOX_HOOK_PATCH "Enable enhanced mbox-hook" off \
	19	MUTT_NCURSES "Enable ncurses support" on \
	20	MUTT_NCURSES_PORT "Use ncurses from port" off \
	21	MUTT_NNTP "Enable news reader" off \
	22	MUTT_PARENT_CHILD_MATCH "Enable parent/child match" off \
	23	MUTT_QUOTE_PATCH "Enable extended quoting" on \
	24	MUTT_REVERSE_REPLY_PATCH "Enable reverse_reply" off \
	25	MUTT_SGMLFORMAT "Enable sgml support" on \
	26	MUTT_SIDEBAR_PATCH "Enable sidebar" off \
	27	MUTT_SIGNATURE_MENU "Enable signature menu" off \
	28	MUTT_SLANG "Enable slang support" off \
	29	MUTT_SMIME_OUTLOOK_COMPAT "SMIME outlook compatible" on \
	30	MUTT_SMTP "Enable SMTP relay support" off \
	31	MUTT_XML "Use XML tools for documentation" on