Attachment #35416 for bug #57172

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

Lines 72-78 Link Here

(-)./Makefile (-20 / +21 lines)
72		72
73	PORTNAME= mutt-devel	73	PORTNAME= mutt-devel
74	PORTVERSION= 1.5.4	74	PORTVERSION= 1.5.4
75	PORTREVISION?= 7	75	PORTREVISION?= 8
76	CATEGORIES+= mail ipv6	76	CATEGORIES+= mail ipv6
77	.if defined(WITH_MUTT_NNTP)	77	.if defined(WITH_MUTT_NNTP)
78	CATEGORIES+= news	78	CATEGORIES+= news
Lines 94-104 Link Here
94	COMMENT?= The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.)	94	COMMENT?= The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.)
95		95
96	DIST_SUBDIR= mutt	96	DIST_SUBDIR= mutt
		97	DOCSDIR?= ${PREFIX}/share/doc/mutt
		98	EXAMPLESDIR?= ${PREFIX}/share/examples/mutt
		99	DATADIR?= ${PREFIX}/share/mutt
		100
97	LDFLAGS+= -L${LOCALBASE}/lib	101	LDFLAGS+= -L${LOCALBASE}/lib
98	CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"	102	CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
99	CONFIGURE_ARGS= --enable-flock --disable-fcntl --with-ssl=${OPENSSLBASE} \	103	CONFIGURE_ARGS= --enable-flock --disable-fcntl --with-ssl=${OPENSSLBASE} \
100	--with-sharedir=${PREFIX}/share/mutt \	104	--with-sharedir=${PREFIX}/share/mutt --with-docdir=${DOCSDIR} \
101	--with-docdir=${PREFIX}/share/doc/mutt \
102	--sysconfdir=${PREFIX}/etc --enable-external-dotlock \	105	--sysconfdir=${PREFIX}/etc --enable-external-dotlock \
103	--with-libiconv-prefix=${PREFIX} --enable-pop --enable-imap	106	--with-libiconv-prefix=${PREFIX} --enable-pop --enable-imap
104	.if defined(MUTT_CONFIGURE_ARGS)	107	.if defined(MUTT_CONFIGURE_ARGS)
Lines 115-121 Link Here
115		118
116	.include <bsd.port.pre.mk>	119	.include <bsd.port.pre.mk>
117		120
118	CD_PATCH_VERSION= 1.5.3	121	CD_PATCH_VERSION= 1.5.4
119	.if !defined(VVV_PATCH_VERSION)	122	.if !defined(VVV_PATCH_VERSION)
120	VVV_PATCH_VERSION= ${PORTVERSION}	123	VVV_PATCH_VERSION= ${PORTVERSION}
121	.endif	124	.endif
Lines 217-228 Link Here
217	SGML_NEEDED= yes	220	SGML_NEEDED= yes
218	.endif	221	.endif
219	.if defined(WITH_MUTT_EDIT_THREADS)	222	.if defined(WITH_MUTT_EDIT_THREADS)
220	PATCHFILES+= patch-${CD_PATCH_VERSION}.cd.edit_threads.9.3:cd	223	PATCHFILES+= patch-${CD_PATCH_VERSION}.cd.edit_threads.9.5:cd
221	CONFIGURE_ARGS+= --enable-imap-edit-threads	224	CONFIGURE_ARGS+= --enable-imap-edit-threads
222	SGML_NEEDED= yes	225	SGML_NEEDED= yes
223	.endif	226	.endif
224	.if defined(WITH_MUTT_SIGNATURE_MENU)	227	.if defined(WITH_MUTT_SIGNATURE_MENU)
225	.error The WITH_MUTT_SIGNATURE_MENU is not available at the moment.
226	PATCHFILES+= patch-${CD_PATCH_VERSION}.cd.signatures_menu.2.1:cd	228	PATCHFILES+= patch-${CD_PATCH_VERSION}.cd.signatures_menu.2.1:cd
227	SGML_NEEDED= yes	229	SGML_NEEDED= yes
228	.endif	230	.endif
Lines 241-246 Link Here
241	post-patch::	243	post-patch::
242	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \	244	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
243	${WRKSRC}/contrib/gpg.rc	245	${WRKSRC}/contrib/gpg.rc
		246	${REINPLACE_CMD} -E -e 's\|@samplesdir@\|${EXAMPLESDIR}\|g' \
		247	${WRKSRC}/contrib/Makefile.in
244		248
245	pre-configure::	249	pre-configure::
246	@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)	250	@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
Lines 278-285 Link Here
278	SCRIPTS_ENV+= MUTT_PORTDOCS="yes"	282	SCRIPTS_ENV+= MUTT_PORTDOCS="yes"
279	post-build:	283	post-build:
280	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref	284	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
281	printf ",s\|\$${PREFIX}\|%s\|g\nw\nq\n" ${PREFIX} \| \	285	${REINPLACE_CMD} -E -e 's\|\$$\{PREFIX\}\|${PREFIX}\|g' \
282	ed -s ${WRKSRC}/doc/mutt.man	286	-e 's\|\$$\{DOCSDIR\}\|${DOCSDIR}\|g' \
		287	-e 's\|\$$\{EXAMPLESDIR\}\|${EXAMPLESDIR}\|g' \
		288	${WRKSRC}/doc/mutt.man
283	.if ! defined(WITHOUT_MUTT_HTML)	289	.if ! defined(WITHOUT_MUTT_HTML)
284	SGML_USED= yes	290	SGML_USED= yes
285	.endif	291	.endif
Lines 306-328 Link Here
306	${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/etc/Muttrc.dist	312	${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/etc/Muttrc.dist
307	.if !defined(NOPORTDOCS)	313	.if !defined(NOPORTDOCS)
308	@${ECHO} "===> Installing Mutt documentation"	314	@${ECHO} "===> Installing Mutt documentation"
309	@${MKDIR} ${PREFIX}/share/doc/mutt && \	315	@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}
310	${CHMOD} a+rx ${PREFIX}/share/doc/mutt	316	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
311	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt \	317	../ABOUT-NLS ../contrib/language* ${DOCSDIR}
312	PGP-Notes.txt ../ABOUT-NLS ../contrib/language* \
313	${PREFIX}/share/doc/mutt
314	.if ${SGML_USED} == yes	318	.if ${SGML_USED} == yes
315	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.latin1 manual.ps \	319	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.latin1 manual.ps ${DOCSDIR}
316	${PREFIX}/share/doc/mutt
317	.endif	320	.endif
318	.if defined(WITH_MUTT_NNTP)	321	.if defined(WITH_MUTT_NNTP)
319	@cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp \	322	@cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp ${DOCSDIR}
320	${PREFIX}/share/doc/mutt
321	.endif	323	.endif
322	.if ! defined(WITHOUT_MUTT_HTML)	324	.if ! defined(WITHOUT_MUTT_HTML)
323	@${MKDIR} ${PREFIX}/share/doc/mutt/html && \	325	@${MKDIR} ${DOCSDIR}/html && ${CHMOD} a+rx ${DOCSDIR}/html
324	${CHMOD} a+rx ${PREFIX}/share/doc/mutt/html	326	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
325	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html
326	.endif	327	.endif
327	.endif	328	.endif
328	.if defined(USE_SLANG)	329	.if defined(USE_SLANG)

Lines 3-9 Link Here

(-)./distinfo (-3 / +3 lines)
3	MD5 (mutt/patch-1.5.4.vvv.nntp.gz) = d0cb0f609aa0461d1b17137bd49c14cb	3	MD5 (mutt/patch-1.5.4.vvv.nntp.gz) = d0cb0f609aa0461d1b17137bd49c14cb
4	MD5 (mutt/patch-1.5.4.vvv.initials.gz) = d92517da934f5c32692aecf7ece596b7	4	MD5 (mutt/patch-1.5.4.vvv.initials.gz) = d92517da934f5c32692aecf7ece596b7
5	MD5 (mutt/patch-1.5.4.vvv.quote.gz) = 80d91491679b426b0f670fa965ae3777	5	MD5 (mutt/patch-1.5.4.vvv.quote.gz) = 80d91491679b426b0f670fa965ae3777
6	MD5 (mutt/patch-1.5.3.cd.edit_threads.9.3) = 753a19d8efdece04cd521c3a3079dc9f	6	MD5 (mutt/patch-1.5.4.cd.edit_threads.9.5) = f8d7fe6ea1a6a1b92c942f4446918433
7	MD5 (mutt/patch-1.5.3.cd.signatures_menu.2.1) = 6db636f0004e73ee2d9f577acd4ed380	7	MD5 (mutt/patch-1.5.4.cd.signatures_menu.2.1) = 5b2298335071c46ee1f3ed8c689066b1
8	MD5 (mutt/patch-1.5.3.cd.ifdef.1) = 01b47e075364834b82da053cac4eb69f	8	MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa
9	MD5 (mutt/p0-patch-1.5.4.dw.mbox-hook.1) = 326f415380cc377c99d2232f16267ffe	9	MD5 (mutt/p0-patch-1.5.4.dw.mbox-hook.1) = 326f415380cc377c99d2232f16267ffe

Lines 6-12 Link Here

(-)./files/extra-patch-doc-ref (-1 / +1 lines)
6	mail under unix operating systems, including support color terminals, MIME,	6	mail under unix operating systems, including support color terminals, MIME,
7	-and a threaded sorting mode.	7	-and a threaded sorting mode.
8	+and a threaded sorting mode. Details of how to use all of this is	8	+and a threaded sorting mode. Details of how to use all of this is
9	+available in \fI${PREFIX}/share/doc/mutt/\fP.	9	+available in \fI${DOCSDIR}\fP.
10	.SH OPTIONS	10	.SH OPTIONS
11	.IP "-a \fIfile\fP"	11	.IP "-a \fIfile\fP"
12	Attach a file to your message using MIME.	12	Attach a file to your message using MIME.




--- doc/mutt.man.orig	Wed Nov 13 11:07:05 2002
+++ doc/mutt.man	Wed Sep 24 15:36:17 2003
@@ -148,9 +148,9 @@
 User's personal mapping between MIME types and file extensions.
 .IP "/etc/mime.types"
 System mapping between MIME types and file extensions.
-.IP "/usr/local/bin/mutt_dotlock"
+.IP "${PREFIX}/bin/mutt_dotlock"
 The privileged dotlocking program.
-.IP "/usr/local/doc/mutt/manual.txt"
+.IP "${DOCSDIR}/manual.txt"
 The Mutt manual.
 .SH BUGS
 .PP

Lines 4-10 Link Here

(-)./files/patch-examples (-1 / +1 lines)
4	mandir = @mandir@	4	mandir = @mandir@
5	srcdir = @srcdir@	5	srcdir = @srcdir@
6	docdir = @docdir@	6	docdir = @docdir@
7	+samplesdir = @prefix@/share/examples/mutt	7	+samplesdir = @samplesdir@
8	top_srcdir = @top_srcdir@	8	top_srcdir = @top_srcdir@
9	top_builddir = ..	9	top_builddir = ..
10	INSTALL = @INSTALL@	10	INSTALL = @INSTALL@





if [ "$MUTT_PORTDOCS" = "yes" ]; then
  cat >> $tmp_first <<EOF
%%DOCSDIR%%/ABOUT-NLS
%%DOCSDIR%%/COPYRIGHT
%%DOCSDIR%%/ChangeLog
%%DOCSDIR%%/ChangeLog.old
%%DOCSDIR%%/GPL
%%DOCSDIR%%/INSTALL
%%DOCSDIR%%/NEWS
%%DOCSDIR%%/PGP-Notes.txt
%%DOCSDIR%%/README
%%DOCSDIR%%/README.SECURITY
%%DOCSDIR%%/README.SSL
%%DOCSDIR%%/TODO
%%DOCSDIR%%/applying-patches.txt
%%DOCSDIR%%/devel-notes.txt
%%DOCSDIR%%/language.txt
%%DOCSDIR%%/language50.txt
%%DOCSDIR%%/manual.txt
%%DOCSDIR%%/patch-notes.txt
%%DOCSDIR%%/smime-notes.txt
%%EXAMPLESDIR%%/Mush.rc
%%EXAMPLESDIR%%/Pine.rc
%%EXAMPLESDIR%%/Tin.rc
%%EXAMPLESDIR%%/ca-bundle.crt
%%EXAMPLESDIR%%/gpg.rc
%%EXAMPLESDIR%%/pgp2.rc
%%EXAMPLESDIR%%/pgp5.rc
%%EXAMPLESDIR%%/pgp6.rc
%%EXAMPLESDIR%%/sample.mailcap
%%EXAMPLESDIR%%/sample.muttrc
%%EXAMPLESDIR%%/sample.muttrc-tlr
%%EXAMPLESDIR%%/smime.rc
%%EXAMPLESDIR%%/smime_keys_test.pl
%%EXAMPLESDIR%%/iconv/iconv.aix-3.2.5.rc
%%EXAMPLESDIR%%/iconv/iconv.aix-4.1.5.rc
%%EXAMPLESDIR%%/iconv/iconv.aix-4.2.0.rc
%%EXAMPLESDIR%%/iconv/iconv.aix-4.3.2.rc
%%EXAMPLESDIR%%/iconv/iconv.freebsd-3.3.rc
%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.3.rc
%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.90.rc
%%EXAMPLESDIR%%/iconv/iconv.hpux-10.01.rc
%%EXAMPLESDIR%%/iconv/iconv.hpux-10.20.rc
%%EXAMPLESDIR%%/iconv/iconv.hpux-11.00.rc
%%EXAMPLESDIR%%/iconv/iconv.irix-6.5.rc
%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0a.rc
%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0d.rc
%%EXAMPLESDIR%%/iconv/iconv.solaris-2.4.rc
%%EXAMPLESDIR%%/iconv/iconv.solaris-2.5.1.rc
%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc
%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc
%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc
EOF

  if [ "$MUTT_NNTP" = "yes" ]; then
    echo "%%DOCSDIR%%/ChangeLog.nntp" >> $tmp_first
  fi
  if [ "$MUTT_SGML" = "yes" ]; then
    echo "%%DOCSDIR%%/manual.latin1" >> $tmp_first
    echo "%%DOCSDIR%%/manual.ps" >> $tmp_first
  fi

  if [ "$MUTT_HTML" = "yes" ]; then

    if [ "$MUTT_PGP_PATCH" = "yes" ]; then
      html=$(($html + 2))
    fi
    echo "%%DOCSDIR%%/html/manual.html" >> $tmp_first
    echo "%%DOCSDIR%%/html/manual_toc.html" >> $tmp_first 
    i=1
    while [ $i -le $html ]; do
      echo "%%DOCSDIR%%/html/manual$i.html" >> $tmp_first 
      i=$(($i + 1))
    done
    echo "@dirrm %%DOCSDIR%%/html" >> $tmp_last
  fi
  cat >> $tmp_last <<EOF
@dirrm %%EXAMPLESDIR%%/iconv
@dirrm %%EXAMPLESDIR%%
@dirrm %%DOCSDIR%%
EOF
fi

Return to bug 57172

Line 0 Link Here

(-)./files/patch-doc-mutt.man (+14 lines)
	1	--- doc/mutt.man.orig Wed Nov 13 11:07:05 2002
	2	+++ doc/mutt.man Wed Sep 24 15:36:17 2003
	3	@@ -148,9 +148,9 @@
	4	User's personal mapping between MIME types and file extensions.
	5	.IP "/etc/mime.types"
	6	System mapping between MIME types and file extensions.
	7	-.IP "/usr/local/bin/mutt_dotlock"
	8	+.IP "${PREFIX}/bin/mutt_dotlock"
	9	The privileged dotlocking program.
	10	-.IP "/usr/local/doc/mutt/manual.txt"
	11	+.IP "${DOCSDIR}/manual.txt"
	12	The Mutt manual.
	13	.SH BUGS
	14	.PP

Lines 61-124 Link Here

(-)./scripts/generate-plist (-60 / +60 lines)
61		61
62	if [ "$MUTT_PORTDOCS" = "yes" ]; then	62	if [ "$MUTT_PORTDOCS" = "yes" ]; then
63	cat >> $tmp_first <<EOF	63	cat >> $tmp_first <<EOF
64	share/doc/mutt/ABOUT-NLS	64	%%DOCSDIR%%/ABOUT-NLS
65	share/doc/mutt/COPYRIGHT	65	%%DOCSDIR%%/COPYRIGHT
66	share/doc/mutt/ChangeLog	66	%%DOCSDIR%%/ChangeLog
67	share/doc/mutt/ChangeLog.old	67	%%DOCSDIR%%/ChangeLog.old
68	share/doc/mutt/GPL	68	%%DOCSDIR%%/GPL
69	share/doc/mutt/INSTALL	69	%%DOCSDIR%%/INSTALL
70	share/doc/mutt/NEWS	70	%%DOCSDIR%%/NEWS
71	share/doc/mutt/PGP-Notes.txt	71	%%DOCSDIR%%/PGP-Notes.txt
72	share/doc/mutt/README	72	%%DOCSDIR%%/README
73	share/doc/mutt/README.SECURITY	73	%%DOCSDIR%%/README.SECURITY
74	share/doc/mutt/README.SSL	74	%%DOCSDIR%%/README.SSL
75	share/doc/mutt/TODO	75	%%DOCSDIR%%/TODO
76	share/doc/mutt/applying-patches.txt	76	%%DOCSDIR%%/applying-patches.txt
77	share/doc/mutt/devel-notes.txt	77	%%DOCSDIR%%/devel-notes.txt
78	share/doc/mutt/language.txt	78	%%DOCSDIR%%/language.txt
79	share/doc/mutt/language50.txt	79	%%DOCSDIR%%/language50.txt
80	share/doc/mutt/manual.txt	80	%%DOCSDIR%%/manual.txt
81	share/doc/mutt/patch-notes.txt	81	%%DOCSDIR%%/patch-notes.txt
82	share/doc/mutt/smime-notes.txt	82	%%DOCSDIR%%/smime-notes.txt
83	share/examples/mutt/Mush.rc	83	%%EXAMPLESDIR%%/Mush.rc
84	share/examples/mutt/Pine.rc	84	%%EXAMPLESDIR%%/Pine.rc
85	share/examples/mutt/Tin.rc	85	%%EXAMPLESDIR%%/Tin.rc
86	share/examples/mutt/ca-bundle.crt	86	%%EXAMPLESDIR%%/ca-bundle.crt
87	share/examples/mutt/gpg.rc	87	%%EXAMPLESDIR%%/gpg.rc
88	share/examples/mutt/pgp2.rc	88	%%EXAMPLESDIR%%/pgp2.rc
89	share/examples/mutt/pgp5.rc	89	%%EXAMPLESDIR%%/pgp5.rc
90	share/examples/mutt/pgp6.rc	90	%%EXAMPLESDIR%%/pgp6.rc
91	share/examples/mutt/sample.mailcap	91	%%EXAMPLESDIR%%/sample.mailcap
92	share/examples/mutt/sample.muttrc	92	%%EXAMPLESDIR%%/sample.muttrc
93	share/examples/mutt/sample.muttrc-tlr	93	%%EXAMPLESDIR%%/sample.muttrc-tlr
94	share/examples/mutt/smime.rc	94	%%EXAMPLESDIR%%/smime.rc
95	share/examples/mutt/smime_keys_test.pl	95	%%EXAMPLESDIR%%/smime_keys_test.pl
96	share/examples/mutt/iconv/iconv.aix-3.2.5.rc	96	%%EXAMPLESDIR%%/iconv/iconv.aix-3.2.5.rc
97	share/examples/mutt/iconv/iconv.aix-4.1.5.rc	97	%%EXAMPLESDIR%%/iconv/iconv.aix-4.1.5.rc
98	share/examples/mutt/iconv/iconv.aix-4.2.0.rc	98	%%EXAMPLESDIR%%/iconv/iconv.aix-4.2.0.rc
99	share/examples/mutt/iconv/iconv.aix-4.3.2.rc	99	%%EXAMPLESDIR%%/iconv/iconv.aix-4.3.2.rc
100	share/examples/mutt/iconv/iconv.freebsd-3.3.rc	100	%%EXAMPLESDIR%%/iconv/iconv.freebsd-3.3.rc
101	share/examples/mutt/iconv/iconv.glibc-2.1.3.rc	101	%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.3.rc
102	share/examples/mutt/iconv/iconv.glibc-2.1.90.rc	102	%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.90.rc
103	share/examples/mutt/iconv/iconv.hpux-10.01.rc	103	%%EXAMPLESDIR%%/iconv/iconv.hpux-10.01.rc
104	share/examples/mutt/iconv/iconv.hpux-10.20.rc	104	%%EXAMPLESDIR%%/iconv/iconv.hpux-10.20.rc
105	share/examples/mutt/iconv/iconv.hpux-11.00.rc	105	%%EXAMPLESDIR%%/iconv/iconv.hpux-11.00.rc
106	share/examples/mutt/iconv/iconv.irix-6.5.rc	106	%%EXAMPLESDIR%%/iconv/iconv.irix-6.5.rc
107	share/examples/mutt/iconv/iconv.osf1-4.0a.rc	107	%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0a.rc
108	share/examples/mutt/iconv/iconv.osf1-4.0d.rc	108	%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0d.rc
109	share/examples/mutt/iconv/iconv.solaris-2.4.rc	109	%%EXAMPLESDIR%%/iconv/iconv.solaris-2.4.rc
110	share/examples/mutt/iconv/iconv.solaris-2.5.1.rc	110	%%EXAMPLESDIR%%/iconv/iconv.solaris-2.5.1.rc
111	share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc	111	%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc
112	share/examples/mutt/iconv/iconv.solaris-2.6.rc	112	%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc
113	share/examples/mutt/iconv/iconv.solaris-2.7.rc	113	%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc
114	EOF	114	EOF
115		115
116	if [ "$MUTT_NNTP" = "yes" ]; then	116	if [ "$MUTT_NNTP" = "yes" ]; then
117	echo "share/doc/mutt/ChangeLog.nntp" >> $tmp_first	117	echo "%%DOCSDIR%%/ChangeLog.nntp" >> $tmp_first
118	fi	118	fi
119	if [ "$MUTT_SGML" = "yes" ]; then	119	if [ "$MUTT_SGML" = "yes" ]; then
120	echo "share/doc/mutt/manual.latin1" >> $tmp_first	120	echo "%%DOCSDIR%%/manual.latin1" >> $tmp_first
121	echo "share/doc/mutt/manual.ps" >> $tmp_first	121	echo "%%DOCSDIR%%/manual.ps" >> $tmp_first
122	fi	122	fi
123		123
124	if [ "$MUTT_HTML" = "yes" ]; then	124	if [ "$MUTT_HTML" = "yes" ]; then
Lines 144-162 Link Here
144	if [ "$MUTT_PGP_PATCH" = "yes" ]; then	144	if [ "$MUTT_PGP_PATCH" = "yes" ]; then
145	html=$(($html + 2))	145	html=$(($html + 2))
146	fi	146	fi
147	echo "share/doc/mutt/html/manual.html" >> $tmp_first	147	echo "%%DOCSDIR%%/html/manual.html" >> $tmp_first
148	echo "share/doc/mutt/html/manual_toc.html" >> $tmp_first	148	echo "%%DOCSDIR%%/html/manual_toc.html" >> $tmp_first
149	i=1	149	i=1
150	while [ $i -le $html ]; do	150	while [ $i -le $html ]; do
151	echo "share/doc/mutt/html/manual$i.html" >> $tmp_first	151	echo "%%DOCSDIR%%/html/manual$i.html" >> $tmp_first
152	i=$(($i + 1))	152	i=$(($i + 1))
153	done	153	done
154	echo "@dirrm share/doc/mutt/html" >> $tmp_last	154	echo "@dirrm %%DOCSDIR%%/html" >> $tmp_last
155	fi	155	fi
156	cat >> $tmp_last <<EOF	156	cat >> $tmp_last <<EOF
157	@dirrm share/examples/mutt/iconv	157	@dirrm %%EXAMPLESDIR%%/iconv
158	@dirrm share/examples/mutt	158	@dirrm %%EXAMPLESDIR%%
159	@dirrm share/doc/mutt	159	@dirrm %%DOCSDIR%%
160	EOF	160	EOF
161	fi	161	fi