View | Details | Raw Unified | Return to bug 51727
Collapse All | Expand All

(-)./Makefile (-38 / +51 lines)
Lines 10-16 Link Here
10
#
10
#
11
# As all of the knobs have a unique name which should not interfere with
11
# As all of the knobs have a unique name which should not interfere with
12
# other ports you can add them to /etc/make.conf, e.g. a line like
12
# other ports you can add them to /etc/make.conf, e.g. a line like
13
# "WITH_MUTT_HTML=yes" will enable mutt's HTML documentation.
13
# "WITH_MUTT_NNTP=yes" will enable mutt's nntp facilities.
14
#
14
#
15
# In addition to the knobs listed below you can enable other configuration
15
# In addition to the knobs listed below you can enable other configuration
16
# options of mutt by adding them to the MUTT_CONFIGURE_ARGS variable. For
16
# options of mutt by adding them to the MUTT_CONFIGURE_ARGS variable. For
Lines 20-52 Link Here
20
# The two most important knobs are:
20
# The two most important knobs are:
21
#
21
#
22
# In general you can choose between using the SLANG port (WITH_MUTT_SLANG)
22
# In general you can choose between using the SLANG port (WITH_MUTT_SLANG)
23
# and ncurses (WITH_MUTT_NCURSES) which is the default.
23
# and ncurses (WITH_MUTT_NCURSES) which is the default. Note that you may
24
# have to set the variables COLORTERM=yes and COLORFGBG=color,color in your
25
# environment to get slang function properly.
24
#
26
#
25
# If you want to install the mutt documentation in html and ps format define:
27
# If you want to install the mutt documentation in html and ps format define:
26
#  WITH_MUTT_HTML
28
#  WITH_MUTT_HTML
29
#  This is a default knob and can be disabled by WITHOUT_MUTT_HTML
27
#
30
#
28
# If you do not want that the documentation is rebuilt using sgmlformat
31
# If you do not want that the documentation is rebuilt using sgmlformat
29
# define:
32
# define:
30
#  WITHOUT_MUTT_SGMLFORMAT
33
#  WITHOUT_MUTT_SGMLFORMAT
31
#    (this can't be stated if WITH_MUTT_HTML is defined)
34
#    (this can only be stated if WITHOUT_MUTT_HTML is defined)
32
#
33
# If you want to read and post news with mutt define:
34
#  WITH_MUTT_NNTP
35
#
36
# WITH_MUTT_SSL can be enabled if your IMAP/POP server is SSL capable.
37
#
38
# If you want to use the SASL authentication features with your email server
39
# define
40
#  WITH_MUTT_CYRUS_SASL
41
#
35
#
42
# If you want to access compressed email folders define:
36
# If you want to access compressed email folders define:
43
#  WITH_MUTT_COMPRESSED_FOLDERS
37
#  WITH_MUTT_COMPRESSED_FOLDERS
38
#  This is a default knob and can be disabled by WITHOUT_MUTT_COMPRESSED_FOLDERS
44
#
39
#
45
# If you want to enable extended quoting functions define:
40
# If you want to enable extended quoting functions define:
46
#  WITH_MUTT_QUOTE_PATCH
41
#  WITH_MUTT_QUOTE_PATCH
42
#  This is a default knob and can be disabled by WITHOUT_MUTT_QUOTE_PATCH
43
#
44
# WITH_MUTT_SSL can be enabled if your IMAP/POP server is SSL capable.
45
#  This is a default knob and can be disabled by WITHOUT_MUTT_SSL
47
#
46
#
48
# If you want to make SMIME outlook compatible define:
47
# If you want to make SMIME outlook compatible define:
49
#  WITH_MUTT_SMIME_OUTLOOK_COMPAT
48
#  WITH_MUTT_SMIME_OUTLOOK_COMPAT
49
#  This is a default knob and can be disabled by
50
#    WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT
51
#
52
# If you want to use enhanced pgp features define:
53
#  WITH_MUTT_PGP_PATCH
54
#  This is a default knob and can be disabled by WITHOUT_MUTT_PGP_PATCH
55
#
56
# If you want to read and post news with mutt define:
57
#  WITH_MUTT_NNTP
58
#
59
# If you want to use the SASL authentication features with your email server
60
# define
61
#  WITH_MUTT_CYRUS_SASL
50
#
62
#
51
# If you want to use the rethreading functions define:
63
# If you want to use the rethreading functions define:
52
#  WITH_MUTT_EDIT_THREADS
64
#  WITH_MUTT_EDIT_THREADS
Lines 54-62 Link Here
54
# If you want to use the signature menu define:
66
# If you want to use the signature menu define:
55
#  WITH_MUTT_SIGNATURE_MENU
67
#  WITH_MUTT_SIGNATURE_MENU
56
#
68
#
57
# If you want to use enhanced pgp features define:
58
#  WITH_MUTT_PGP_PATCH
59
#
60
# If you want to use the printf-like enhancement to the mbox-hook command
69
# If you want to use the printf-like enhancement to the mbox-hook command
61
# define:
70
# define:
62
#  WITH_MUTT_MBOX_HOOK_PATCH
71
#  WITH_MUTT_MBOX_HOOK_PATCH
Lines 102-107 Link Here
102
USE_AUTOMAKE=	yes
111
USE_AUTOMAKE=	yes
103
112
104
PLIST=		${WRKDIR}/PLIST
113
PLIST=		${WRKDIR}/PLIST
114
PKGMESSAGE=	${WRKDIR}/pkg-message
105
SCRIPTS_ENV=	WRKDIR="${WRKDIR}"
115
SCRIPTS_ENV=	WRKDIR="${WRKDIR}"
106
116
107
.include <bsd.port.pre.mk>
117
.include <bsd.port.pre.mk>
Lines 128-148 Link Here
128
		${BUILD_WRKSRC}/Makefile
138
		${BUILD_WRKSRC}/Makefile
129
139
130
.if defined(PACKAGE_BUILDING)
140
.if defined(PACKAGE_BUILDING)
131
WITH_MUTT_SSL=			yes
132
WITH_MUTT_SLANG=		yes
133
WITH_MUTT_HTML=			yes
134
WITH_MUTT_COMPRESSED_FOLDERS=	yes
135
WITH_MUTT_QUOTE_PATCH=		yes
136
WITH_MUTT_SMIME_OUTLOOK_COMPAT=	yes
137
WITH_MUTT_PGP_PATCH=		yes
138
BUILD_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
141
BUILD_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
139
RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell \
142
RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell \
140
		urlview:${PORTSDIR}/textproc/urlview
143
		urlview:${PORTSDIR}/textproc/urlview
141
.endif
144
.endif
142
145
143
.if defined(WITH_MUTT_PS)
144
WITH_MUTT_HTML=		yes
145
.endif
146
.if defined(WITH_MUTT_NCURSES_PORT)
146
.if defined(WITH_MUTT_NCURSES_PORT)
147
WITH_MUTT_NCURSES=	yes
147
WITH_MUTT_NCURSES=	yes
148
.endif
148
.endif
Lines 173-190 Link Here
173
.elif defined(USE_SLANG)
173
.elif defined(USE_SLANG)
174
LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
174
LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
175
.endif
175
.endif
176
.if defined(WITH_MUTT_SSL)
176
.if !defined(WITHOUT_MUTT_SSL)
177
USE_OPENSSL=	yes
177
USE_OPENSSL=	yes
178
.endif
178
.endif
179
.if defined(WITH_MUTT_CYRUS_SASL)
179
.if defined(WITH_MUTT_CYRUS_SASL)
180
LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
180
LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
181
.endif
181
.endif
182
.if defined(WITH_MUTT_SMIME_OUTLOOK_COMPAT)
182
.if ! defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT)
183
pre-configure::
183
pre-configure::
184
	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook
184
	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook
185
.endif
185
.endif
186
186
187
.if defined(WITH_MUTT_PGP_PATCH)
187
.if ! defined(WITHOUT_MUTT_PGP_PATCH)
188
SGML_NEEDED=	yes
188
SGML_NEEDED=	yes
189
pre-configure::
189
pre-configure::
190
	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-pgp-dw
190
	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-pgp-dw
Lines 198-204 Link Here
198
.elif defined(USE_SLANG)
198
.elif defined(USE_SLANG)
199
CONFIGURE_ARGS+=	--with-slang=${PREFIX}
199
CONFIGURE_ARGS+=	--with-slang=${PREFIX}
200
.endif
200
.endif
201
.if defined(WITH_MUTT_SSL)
201
.if !defined(WITHOUT_MUTT_SSL)
202
CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
202
CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
203
.endif
203
.endif
204
.if defined(WITH_MUTT_CYRUS_SASL)
204
.if defined(WITH_MUTT_CYRUS_SASL)
Lines 207-213 Link Here
207
207
208
PATCH_DIST_STRIP=	-p1
208
PATCH_DIST_STRIP=	-p1
209
209
210
.if defined(WITH_MUTT_COMPRESSED_FOLDERS)
210
.if ! defined (WITHOUT_MUTT_COMPRESSED_FOLDERS)
211
PATCHFILES+=	patch-${VVV_PATCH_VERSION}.rr.compressed.gz:vvv
211
PATCHFILES+=	patch-${VVV_PATCH_VERSION}.rr.compressed.gz:vvv
212
CONFIGURE_ARGS+=	--enable-compressed
212
CONFIGURE_ARGS+=	--enable-compressed
213
SGML_NEEDED=	yes
213
SGML_NEEDED=	yes
Lines 217-223 Link Here
217
CONFIGURE_ARGS+=	--enable-nntp
217
CONFIGURE_ARGS+=	--enable-nntp
218
SGML_NEEDED=	yes
218
SGML_NEEDED=	yes
219
.endif
219
.endif
220
.if defined(WITH_MUTT_QUOTE_PATCH)
220
.if ! defined(WITHOUT_MUTT_QUOTE_PATCH)
221
PATCHFILES+=	patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
221
PATCHFILES+=	patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
222
		patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
222
		patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
223
SGML_NEEDED=	yes
223
SGML_NEEDED=	yes
Lines 254-263 Link Here
254
.if defined(WITH_MUTT_NNTP)
254
.if defined(WITH_MUTT_NNTP)
255
SCRIPTS_ENV+=	MUTT_NNTP="yes"
255
SCRIPTS_ENV+=	MUTT_NNTP="yes"
256
.endif
256
.endif
257
.if defined(WITH_MUTT_COMPRESSED_FOLDERS)
257
.if ! defined (WITHOUT_MUTT_COMPRESSED_FOLDERS)
258
SCRIPTS_ENV+=	MUTT_COMPRESSED_FOLDERS="yes"
258
SCRIPTS_ENV+=	MUTT_COMPRESSED_FOLDERS="yes"
259
.endif
259
.endif
260
.if defined(WITH_MUTT_QUOTE_PATCH)
260
.if ! defined(WITHOUT_MUTT_QUOTE_PATCH)
261
SCRIPTS_ENV+=	MUTT_QUOTE_PATCH="yes"
261
SCRIPTS_ENV+=	MUTT_QUOTE_PATCH="yes"
262
.endif
262
.endif
263
.if defined(WITH_MUTT_EDIT_THREADS)
263
.if defined(WITH_MUTT_EDIT_THREADS)
Lines 269-278 Link Here
269
.if defined(WITH_MUTT_IFDEF_PATCH)
269
.if defined(WITH_MUTT_IFDEF_PATCH)
270
SCRIPTS_ENV+=	MUTT_IFDEF_PATCH="yes"
270
SCRIPTS_ENV+=	MUTT_IFDEF_PATCH="yes"
271
.endif
271
.endif
272
.if defined(WITH_MUTT_PGP_PATCH)
272
.if ! defined(WITHOUT_MUTT_PGP_PATCH)
273
SCRIPTS_ENV+=	MUTT_PGP_PATCH="yes"
273
SCRIPTS_ENV+=	MUTT_PGP_PATCH="yes"
274
.endif
274
.endif
275
.if defined(WITH_MUTT_HTML)
275
.if ! defined(WITHOUT_MUTT_HTML)
276
SCRIPTS_ENV+=	MUTT_HTML="yes"
276
SCRIPTS_ENV+=	MUTT_HTML="yes"
277
.endif
277
.endif
278
278
Lines 282-288 Link Here
282
	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
282
	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
283
	printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
283
	printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
284
		ed -s ${WRKSRC}/doc/mutt.man
284
		ed -s ${WRKSRC}/doc/mutt.man
285
.if defined(WITH_MUTT_HTML)
285
.if ! defined(WITHOUT_MUTT_HTML)
286
SGML_USED=	yes
286
SGML_USED=	yes
287
.endif
287
.endif
288
.if defined(SGML_NEEDED) && !defined(WITHOUT_MUTT_SGMLFORMAT)
288
.if defined(SGML_NEEDED) && !defined(WITHOUT_MUTT_SGMLFORMAT)
Lines 304-309 Link Here
304
	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/generate-plist > ${PLIST}
304
	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/generate-plist > ${PLIST}
305
305
306
post-install:
306
post-install:
307
	@${ECHO} > ${PKGMESSAGE}
307
.if !defined(NOPORTDOCS)
308
.if !defined(NOPORTDOCS)
308
	@${ECHO} "===>   Installing Mutt documentation"
309
	@${ECHO} "===>   Installing Mutt documentation"
309
	@${MKDIR} ${PREFIX}/share/doc/mutt && \
310
	@${MKDIR} ${PREFIX}/share/doc/mutt && \
Lines 319-329 Link Here
319
	@cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp \
320
	@cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp \
320
		${PREFIX}/share/doc/mutt
321
		${PREFIX}/share/doc/mutt
321
.endif
322
.endif
322
.if defined(WITH_MUTT_HTML)
323
.if ! defined(WITHOUT_MUTT_HTML)
323
	@${MKDIR} ${PREFIX}/share/doc/mutt/html && \
324
	@${MKDIR} ${PREFIX}/share/doc/mutt/html && \
324
		${CHMOD} a+rx ${PREFIX}/share/doc/mutt/html
325
		${CHMOD} a+rx ${PREFIX}/share/doc/mutt/html
325
	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html
326
	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html
326
.endif
327
.endif
327
.endif
328
.endif
328
329
.if defined(USE_SLANG)
330
	@${ECHO} "====================================================" >> ${PKGMESSAGE}
331
	@${ECHO} "You have installed ${PORTNAME} with SLANG support." >> ${PKGMESSAGE}
332
	@${ECHO} "This may work for a color terminal only when defining" >> ${PKGMESSAGE}
333
	@${ECHO} "COLORTERM=yes and COLORFGBG=color,color in your" >> ${PKGMESSAGE}
334
	@${ECHO} "environment." >> ${PKGMESSAGE}
335
	@${ECHO} "====================================================" >> ${PKGMESSAGE}
336
.endif
337
.if !defined(BATCH)
338
	@${ECHO}
339
	@${CAT} ${PKGMESSAGE}
340
	@${ECHO}
341
.endif
329
.include <bsd.port.post.mk>
342
.include <bsd.port.post.mk>
(-)./files/patch-init.c (-13 / +3 lines)
Lines 1-16 Link Here
1
--- init.c.orig	Wed Jul 24 10:41:29 2002
1
--- init.c.orig	Wed Jul 24 10:41:29 2002
2
+++ init.c	Wed Apr 30 13:06:45 2003
2
+++ init.c	Sat May  3 08:46:29 2003
3
@@ -45,7 +45,9 @@
3
@@ -1707,7 +1707,11 @@
4
 #include <stdlib.h>
5
 #include <unistd.h>
6
 #include <string.h>
7
+#if __FreeBSD_version >= 500000
8
 #include <sys/utsname.h>
9
+#endif
10
 #include <errno.h>
11
 #include <sys/wait.h>
12
 
13
@@ -1707,7 +1709,11 @@
14
 void mutt_init (int skip_sys_rc, LIST *commands)
4
 void mutt_init (int skip_sys_rc, LIST *commands)
15
 {
5
 {
16
   struct passwd *pw;
6
   struct passwd *pw;
Lines 22-28 Link Here
22
   char *p, buffer[STRING], error[STRING];
12
   char *p, buffer[STRING], error[STRING];
23
   int i, default_rc = 0, need_pause = 0;
13
   int i, default_rc = 0, need_pause = 0;
24
   BUFFER err;
14
   BUFFER err;
25
@@ -1765,16 +1771,21 @@
15
@@ -1765,16 +1769,21 @@
26
 #endif
16
 #endif
27
 
17
 
28
   /* And about the host... */
18
   /* And about the host... */

Return to bug 51727