View | Details | Raw Unified | Return to bug 187629 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-23 / +22 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	mutt
4
PORTNAME=	mutt
5
PORTVERSION=	1.5.23
5
PORTVERSION=	1.5.23
6
PORTREVISION=	1
6
CATEGORIES+=	mail ipv6
7
CATEGORIES+=	mail ipv6
7
MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
8
MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
8
		ftp://ftp.mutt.org/mutt/devel/ \
9
		ftp://ftp.mutt.org/mutt/devel/ \
Lines 58-70 Link Here
58
.if defined (MUTT_LITE)
59
.if defined (MUTT_LITE)
59
LITE=	YES
60
LITE=	YES
60
.endif
61
.endif
61
.if !defined (LITE)
62
.if defined (LITE)
63
OPTIONS_UNSET=	NLS DOCS EXAMPLES
64
.else
62
OPTIONS_DEFINE=	COMPRESSED_FOLDERS SASL DEBUG FLOCK \
65
OPTIONS_DEFINE=	COMPRESSED_FOLDERS SASL DEBUG FLOCK \
63
		GPGME GREETING_PATCH GSSAPI HTML ICONV IDN IFDEF_PATCH \
66
		GPGME GREETING_PATCH GSSAPI HTML ICONV IDN IFDEF_PATCH \
64
		IMAP_HEADER_CACHE LOCALES_FIX MAILBOX_MANPAGES \
67
		IMAP_HEADER_CACHE LOCALES_FIX MAILBOX_MANPAGES \
65
		MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH \
68
		MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH \
66
		NNTP PARENT_CHILD_MATCH_PATCH \
69
		NLS NNTP PARENT_CHILD_MATCH_PATCH \
67
		QUOTE_PATCH REVERSE_REPLY_PATCH SGMLFORMAT SIDEBAR_PATCH \
70
		QUOTE_PATCH REVERSE_REPLY_PATCH SIDEBAR_PATCH \
68
		SIGNATURE_MENU SMART_DATE SMIME_OUTLOOK_COMPAT SMTP \
71
		SIGNATURE_MENU SMART_DATE SMIME_OUTLOOK_COMPAT SMTP \
69
		TOKYOCABINET TRASH_PATCH XML
72
		TOKYOCABINET TRASH_PATCH XML
70
73
Lines 89-98 Link Here
89
MAILDIR_MTIME_PATCH_DESC=	Maildir mtime patch
92
MAILDIR_MTIME_PATCH_DESC=	Maildir mtime patch
90
MBOX_HOOK_PATCH_DESC=	Enhanced mbox-hook
93
MBOX_HOOK_PATCH_DESC=	Enhanced mbox-hook
91
NCURSES_DESC=	Ncurses support
94
NCURSES_DESC=	Ncurses support
95
NLS_DESC=	Native language support
92
PARENT_CHILD_MATCH_PATCH_DESC=	Parent/child match
96
PARENT_CHILD_MATCH_PATCH_DESC=	Parent/child match
93
QUOTE_PATCH_DESC=	Extended quoting
97
QUOTE_PATCH_DESC=	Extended quoting
94
REVERSE_REPLY_PATCH_DESC=	Reverse_reply
98
REVERSE_REPLY_PATCH_DESC=	Reverse_reply
95
SGMLFORMAT_DESC=	SGML support
96
SIDEBAR_PATCH_DESC=	Sidebar support
99
SIDEBAR_PATCH_DESC=	Sidebar support
97
SIGNATURE_MENU_DESC=	Signature menu
100
SIGNATURE_MENU_DESC=	Signature menu
98
SLANG_DESC=	SLANG support
101
SLANG_DESC=	SLANG support
Lines 101-111 Link Here
101
SMTP_DESC=	SMTP relay support
104
SMTP_DESC=	SMTP relay support
102
TOKYOCABINET_DESC=	Use tokyocabinet instead of Berkley DB
105
TOKYOCABINET_DESC=	Use tokyocabinet instead of Berkley DB
103
TRASH_PATCH_DESC=	Trash folder support
106
TRASH_PATCH_DESC=	Trash folder support
104
XML_DESC=	Use XML tools for building documentation
107
XML_DESC=	Use XML tools for rebuilding documentation
105
108
106
OPTIONS_DEFAULT=	COMPRESSED_FOLDERS HTML ICONV MAILBOX_MANPAGES \
109
OPTIONS_DEFAULT=	COMPRESSED_FOLDERS HTML ICONV IFDEF_PATCH \
107
		NCURSES QUOTE_PATCH SGMLFORMAT SMIME_OUTLOOK_COMPAT \
110
		IMAP_HEADER_CACHE MAILBOX_MANPAGES MAILDIR_HEADER_CACHE \
108
		NLS XML SMTP
111
		MAILDIR_MTIME_PATCH NLS NCURSES PARENT_CHILD_MATCH_PATCH \
112
		QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
113
		SMIME_OUTLOOK_COMPAT SMTP XML
109
.endif
114
.endif
110
115
111
.include <bsd.port.options.mk>
116
.include <bsd.port.options.mk>
Lines 137-143 Link Here
137
# XXX
142
# XXX
138
# this should be done automagically by aclocal but ....
143
# this should be done automagically by aclocal but ....
139
# for now, this will have to do
144
# for now, this will have to do
140
pre-build:
145
pre-build::
141
	@${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \
146
	@${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \
142
			-e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \
147
			-e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \
143
			-e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \
148
			-e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \
Lines 169-179 Link Here
169
USES+=		ncurses
174
USES+=		ncurses
170
.endif
175
.endif
171
176
172
.if ! ${PORT_OPTIONS:MSGMLFORMAT} || ! ${PORT_OPTIONS:MXML} || !defined(XML_USED) \
173
	|| ! ${PORT_OPTIONS:MDOCS}
174
XML_USED=	no
175
.endif
176
177
.if ${PORT_OPTIONS:MNLS}
177
.if ${PORT_OPTIONS:MNLS}
178
USES+=		gettext
178
USES+=		gettext
179
PLIST_SUB+=	NLS=""
179
PLIST_SUB+=	NLS=""
Lines 403-415 Link Here
403
CONFIGURE_ARGS+=	--without-qdbm
403
CONFIGURE_ARGS+=	--without-qdbm
404
.endif
404
.endif
405
405
406
.if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
407
XML_USED=	yes
408
.endif
409
.if ${PORT_OPTIONS:MHTML}
410
XML_USED=	yes
411
.endif
412
413
.if ${PORT_OPTIONS:MMAILBOX_MANPAGES}
406
.if ${PORT_OPTIONS:MMAILBOX_MANPAGES}
414
PLIST_SUB+=	MBOXMAN=""
407
PLIST_SUB+=	MBOXMAN=""
415
.else
408
.else
Lines 421-427 Link Here
421
.else
414
.else
422
PLIST_SUB+=	HTML="@comment "
415
PLIST_SUB+=	HTML="@comment "
423
.endif
416
.endif
424
.if ${PORT_OPTIONS:MDOCS} || ${XML_USED} == yes
417
.if ${PORT_OPTIONS:MDOCS}
425
post-build:
418
post-build:
426
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
419
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
427
	@${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \
420
	@${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \
Lines 434-443 Link Here
434
		${WRKSRC}/doc/muttrc.man
427
		${WRKSRC}/doc/muttrc.man
435
.endif
428
.endif
436
429
437
.if ${XML_USED} == yes
430
.if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
431
PLIST_SUB+=	XML=""
438
BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
432
BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
439
		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
433
		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
440
		lynx:${PORTSDIR}/www/lynx
434
		lynx:${PORTSDIR}/www/lynx
435
.else
436
PLIST_SUB+=	XML="@comment "
437
pre-build::
438
	@${REINPLACE_CMD} -E -e 's|-xsltproc|@-true xsltproc|g' \
439
		${WRKSRC}/doc/Makefile
441
.endif
440
.endif
442
441
443
.if ${PORT_OPTIONS:MSLANG}
442
.if ${PORT_OPTIONS:MSLANG}
(-)./pkg-plist (-13 / +13 lines)
Lines 38-56 Link Here
38
%%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt
38
%%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt
39
%%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt
39
%%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt
40
%%NNTP%%%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.nntp
40
%%NNTP%%%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.nntp
41
%%PORTDOCS%%%%DOCSDIR%%/advancedusage.html
41
%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/advancedusage.html
42
%%PORTDOCS%%%%DOCSDIR%%/configuration.html
42
%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/configuration.html
43
%%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html
43
%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html
44
%%PORTDOCS%%%%DOCSDIR%%/index.html
44
%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/index.html
45
%%PORTDOCS%%%%DOCSDIR%%/intro.html
45
%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/intro.html
46
%%PORTDOCS%%%%DOCSDIR%%/manual.html
46
%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/manual.html
47
%%PORTDOCS%%%%DOCSDIR%%/mimesupport.html
47
%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/mimesupport.html
48
%%PORTDOCS%%%%DOCSDIR%%/miscellany.html
48
%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/miscellany.html
49
%%PORTDOCS%%%%DOCSDIR%%/optionalfeatures.html
49
%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/optionalfeatures.html
50
%%PORTDOCS%%%%DOCSDIR%%/reference.html
50
%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/reference.html
51
%%PORTDOCS%%%%DOCSDIR%%/security.html
51
%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/security.html
52
%%PORTDOCS%%%%DOCSDIR%%/tuning.html
52
%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/tuning.html
53
%%COMPRESS%%%%PORTDOCS%%%%DOCSDIR%%/compressed-folders.html
53
%%XML%%%%HTML%%%%COMPRESS%%%%PORTDOCS%%%%DOCSDIR%%/compressed-folders.html
54
%%PORTDOCS%%@dirrm %%DOCSDIR%%
54
%%PORTDOCS%%@dirrm %%DOCSDIR%%
55
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mush.rc
55
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mush.rc
56
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc
56
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc

Return to bug 187629