Attachment #36569 for bug #58559

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




# 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}|" \

.endif
.if ! defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT)
pre-configure::
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook
.endif

.if ! defined(WITHOUT_MUTT_PGP_PATCH)
SGML_NEEDED=	yes
pre-configure::
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-pgp-dw
.endif

.if defined(WITH_MUTT_LOCALES_FIX)

post-patch::
	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
		${WRKSRC}/contrib/gpg.rc
	@${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \
		${WRKSRC}/contrib/Makefile.in

pre-configure::

.endif
.if ! defined(WITHOUT_MUTT_QUOTE_PATCH)
post-patch::
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-quote
.endif

.if !defined(NOPORTDOCS)
SCRIPTS_ENV+=	MUTT_PORTDOCS="yes"
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
.if ! defined(WITHOUT_MUTT_HTML)
SGML_USED=	yes
.endif

.endif
.else 	# ! NOPORTDOCS
post-patch::
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
.endif # ! NOPORTDOCS

.if ${SGML_USED} == yes
SCRIPTS_ENV+=	MUTT_SGML="yes"
BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
post-patch::
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-sgmlformat
.endif

pre-install:




 The Mutt manual.
 .SH BUGS
 .PP
--- doc/muttrc.man.orig	Wed Mar 19 22:55:03 2003
+++ doc/muttrc.man	Sun Oct 26 11:16:05 2003
@@ -1031,7 +1031,7 @@
 .B dotlock_program
 .nf
 Type: path
-Default: \(lq/usr/local/bin/mutt_dotlock\(rq
+Default: \(lq${PREFIX}/bin/mutt_dotlock\(rq
 .fi
 .IP
 Contains the path of the mutt_dotlock (8) binary to be used by
@@ -4410,7 +4410,7 @@
 instead of a raw socket. You may be able to use this to set up
 preauthenticated connections to your IMAP/POP3 server. Example:
 .IP
-tunnel=\(rqssh -q mailhost.net /usr/local/libexec/imapd\(rq
+tunnel=\(rqssh -q mailhost.net ${PREFIX}/libexec/imapd\(rq
 .IP
 NOTE: For this example to work you must be able to log in to the remote
 machine without having to enter a password.

Return to bug 58559

Lines 133-139 Link Here

(-)./Makefile (-9 / +13 lines)
133	# this should be done automagically by aclocal but ....	133	# this should be done automagically by aclocal but ....
134	# for now, this will have to do	134	# for now, this will have to do
135	pre-build:	135	pre-build:
136	${REINPLACE_CMD} -E -e "s\|^(ACLOCAL = ).+\|\1${ACLOCAL}\|" \	136	@${REINPLACE_CMD} -E -e "s\|^(ACLOCAL = ).+\|\1${ACLOCAL}\|" \
137	-e "s\|^(AUTOCONF = ).+\|\1${AUTOCONF}\|" \	137	-e "s\|^(AUTOCONF = ).+\|\1${AUTOCONF}\|" \
138	-e "s\|^(AUTOMAKE = ).+\|\1${AUTOMAKE}\|" \	138	-e "s\|^(AUTOMAKE = ).+\|\1${AUTOMAKE}\|" \
139	-e "s\|^(AUTOHEADER = ).+\|\1${AUTOHEADER}\|" \	139	-e "s\|^(AUTOHEADER = ).+\|\1${AUTOHEADER}\|" \
Lines 181-193 Link Here
181	.endif	181	.endif
182	.if ! defined(WITHOUT_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(WITHOUT_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
191	.endif	191	.endif
192		192
193	.if defined(WITH_MUTT_LOCALES_FIX)	193	.if defined(WITH_MUTT_LOCALES_FIX)
Lines 243-249 Link Here
243	post-patch::	243	post-patch::
244	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \	244	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
245	${WRKSRC}/contrib/gpg.rc	245	${WRKSRC}/contrib/gpg.rc
246	${REINPLACE_CMD} -E -e 's\|@samplesdir@\|${EXAMPLESDIR}\|g' \	246	@${REINPLACE_CMD} -E -e 's\|@samplesdir@\|${EXAMPLESDIR}\|g' \
247	${WRKSRC}/contrib/Makefile.in	247	${WRKSRC}/contrib/Makefile.in
248		248
249	pre-configure::	249	pre-configure::
Lines 275-291 Link Here
275	.endif	275	.endif
276	.if ! defined(WITHOUT_MUTT_QUOTE_PATCH)	276	.if ! defined(WITHOUT_MUTT_QUOTE_PATCH)
277	post-patch::	277	post-patch::
278	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-quote	278	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-quote
279	.endif	279	.endif
280		280
281	.if !defined(NOPORTDOCS)	281	.if !defined(NOPORTDOCS)
282	SCRIPTS_ENV+= MUTT_PORTDOCS="yes"	282	SCRIPTS_ENV+= MUTT_PORTDOCS="yes"
283	post-build:	283	post-build:
284	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref	284	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
285	${REINPLACE_CMD} -E -e 's\|\$$\{PREFIX\}\|${PREFIX}\|g' \	285	@${REINPLACE_CMD} -E -e 's\|\$$\{PREFIX\}\|${PREFIX}\|g' \
286	-e 's\|\$$\{DOCSDIR\}\|${DOCSDIR}\|g' \	286	-e 's\|\$$\{DOCSDIR\}\|${DOCSDIR}\|g' \
287	-e 's\|\$$\{EXAMPLESDIR\}\|${EXAMPLESDIR}\|g' \	287	-e 's\|\$$\{EXAMPLESDIR\}\|${EXAMPLESDIR}\|g' \
288	${WRKSRC}/doc/mutt.man	288	${WRKSRC}/doc/mutt.man
		289	@${REINPLACE_CMD} -E -e 's\|\$$\{PREFIX\}\|${PREFIX}\|g' \
		290	-e 's\|\$$\{DOCSDIR\}\|${DOCSDIR}\|g' \
		291	-e 's\|\$$\{EXAMPLESDIR\}\|${EXAMPLESDIR}\|g' \
		292	${WRKSRC}/doc/muttrc.man
289	.if ! defined(WITHOUT_MUTT_HTML)	293	.if ! defined(WITHOUT_MUTT_HTML)
290	SGML_USED= yes	294	SGML_USED= yes
291	.endif	295	.endif
Lines 294-307 Link Here
294	.endif	298	.endif
295	.else # ! NOPORTDOCS	299	.else # ! NOPORTDOCS
296	post-patch::	300	post-patch::
297	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib	301	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
298	.endif # ! NOPORTDOCS	302	.endif # ! NOPORTDOCS
299		303
300	.if ${SGML_USED} == yes	304	.if ${SGML_USED} == yes
301	SCRIPTS_ENV+= MUTT_SGML="yes"	305	SCRIPTS_ENV+= MUTT_SGML="yes"
302	BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat	306	BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat
303	post-patch::	307	post-patch::
304	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-sgmlformat	308	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-sgmlformat
305	.endif	309	.endif
306		310
307	pre-install:	311	pre-install:

Lines 12-14 Link Here

(-)./files/patch-doc-mutt.man (+20 lines)
12	The Mutt manual.	12	The Mutt manual.
13	.SH BUGS	13	.SH BUGS
14	.PP	14	.PP
		15	--- doc/muttrc.man.orig Wed Mar 19 22:55:03 2003
		16	+++ doc/muttrc.man Sun Oct 26 11:16:05 2003
		17	@@ -1031,7 +1031,7 @@
		18	.B dotlock_program
		19	.nf
		20	Type: path
		21	-Default: \(lq/usr/local/bin/mutt_dotlock\(rq
		22	+Default: \(lq${PREFIX}/bin/mutt_dotlock\(rq
		23	.fi
		24	.IP
		25	Contains the path of the mutt_dotlock (8) binary to be used by
		26	@@ -4410,7 +4410,7 @@
		27	instead of a raw socket. You may be able to use this to set up
		28	preauthenticated connections to your IMAP/POP3 server. Example:
		29	.IP
		30	-tunnel=\(rqssh -q mailhost.net /usr/local/libexec/imapd\(rq
		31	+tunnel=\(rqssh -q mailhost.net ${PREFIX}/libexec/imapd\(rq
		32	.IP
		33	NOTE: For this example to work you must be able to log in to the remote
		34	machine without having to enter a password.