From 909ac3ac525de19f91091869b5ea2646366d9b0c Mon Sep 17 00:00:00 2001 From: Norikatsu Shigemura Date: Wed, 24 Sep 2003 15:27:28 +0000 Subject: o Use DOCSDIR and EXAMPLESDIR. o Add patches now avialable for 1.5.4. o Bump PORTREVISION. PR: ports/57172 Submitted by: Udo Schweigert (maintainer) --- mail/mutt-devel/Makefile | 41 +++++----- mail/mutt-devel/distinfo | 6 +- mail/mutt-devel/files/extra-patch-doc-ref | 2 +- mail/mutt-devel/files/patch-doc-mutt.man | 14 ++++ mail/mutt-devel/files/patch-examples | 2 +- mail/mutt-devel/scripts/generate-plist | 120 +++++++++++++++--------------- 6 files changed, 100 insertions(+), 85 deletions(-) create mode 100644 mail/mutt-devel/files/patch-doc-mutt.man (limited to 'mail/mutt-devel') diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index e74a18b54f67..dc8618b8e214 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -72,7 +72,7 @@ PORTNAME= mutt-devel PORTVERSION= 1.5.4 -PORTREVISION?= 7 +PORTREVISION?= 8 CATEGORIES+= mail ipv6 .if defined(WITH_MUTT_NNTP) CATEGORIES+= news @@ -94,11 +94,14 @@ MAINTAINER?= udo.schweigert@siemens.com COMMENT?= The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.) DIST_SUBDIR= mutt +DOCSDIR?= ${PREFIX}/share/doc/mutt +EXAMPLESDIR?= ${PREFIX}/share/examples/mutt +DATADIR?= ${PREFIX}/share/mutt + LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-flock --disable-fcntl --with-ssl=${OPENSSLBASE} \ - --with-sharedir=${PREFIX}/share/mutt \ - --with-docdir=${PREFIX}/share/doc/mutt \ + --with-sharedir=${PREFIX}/share/mutt --with-docdir=${DOCSDIR} \ --sysconfdir=${PREFIX}/etc --enable-external-dotlock \ --with-libiconv-prefix=${PREFIX} --enable-pop --enable-imap .if defined(MUTT_CONFIGURE_ARGS) @@ -115,7 +118,7 @@ SCRIPTS_ENV= WRKDIR="${WRKDIR}" .include -CD_PATCH_VERSION= 1.5.3 +CD_PATCH_VERSION= 1.5.4 .if !defined(VVV_PATCH_VERSION) VVV_PATCH_VERSION= ${PORTVERSION} .endif @@ -217,12 +220,11 @@ PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \ SGML_NEEDED= yes .endif .if defined(WITH_MUTT_EDIT_THREADS) -PATCHFILES+= patch-${CD_PATCH_VERSION}.cd.edit_threads.9.3:cd +PATCHFILES+= patch-${CD_PATCH_VERSION}.cd.edit_threads.9.5:cd CONFIGURE_ARGS+= --enable-imap-edit-threads SGML_NEEDED= yes .endif .if defined(WITH_MUTT_SIGNATURE_MENU) -.error The WITH_MUTT_SIGNATURE_MENU is not available at the moment. PATCHFILES+= patch-${CD_PATCH_VERSION}.cd.signatures_menu.2.1:cd SGML_NEEDED= yes .endif @@ -241,6 +243,8 @@ MAN5= muttrc.5 mbox.5 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:: @(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4) @@ -278,8 +282,10 @@ post-patch:: SCRIPTS_ENV+= MUTT_PORTDOCS="yes" post-build: ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref - printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \ - ed -s ${WRKSRC}/doc/mutt.man + ${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \ + -e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \ + -e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \ + ${WRKSRC}/doc/mutt.man .if ! defined(WITHOUT_MUTT_HTML) SGML_USED= yes .endif @@ -306,23 +312,18 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/etc/Muttrc.dist .if !defined(NOPORTDOCS) @${ECHO} "===> Installing Mutt documentation" - @${MKDIR} ${PREFIX}/share/doc/mutt && \ - ${CHMOD} a+rx ${PREFIX}/share/doc/mutt - @cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt \ - PGP-Notes.txt ../ABOUT-NLS ../contrib/language* \ - ${PREFIX}/share/doc/mutt + @${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR} + @cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \ + ../ABOUT-NLS ../contrib/language* ${DOCSDIR} .if ${SGML_USED} == yes - @cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.latin1 manual.ps \ - ${PREFIX}/share/doc/mutt + @cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.latin1 manual.ps ${DOCSDIR} .endif .if defined(WITH_MUTT_NNTP) - @cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp \ - ${PREFIX}/share/doc/mutt + @cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp ${DOCSDIR} .endif .if ! defined(WITHOUT_MUTT_HTML) - @${MKDIR} ${PREFIX}/share/doc/mutt/html && \ - ${CHMOD} a+rx ${PREFIX}/share/doc/mutt/html - ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html + @${MKDIR} ${DOCSDIR}/html && ${CHMOD} a+rx ${DOCSDIR}/html + ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html .endif .endif .if defined(USE_SLANG) diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo index 79235d4265a3..892c5e2033f6 100644 --- a/mail/mutt-devel/distinfo +++ b/mail/mutt-devel/distinfo @@ -3,7 +3,7 @@ MD5 (mutt/patch-1.5.4.rr.compressed.gz) = a7b37150c35ea65049b3cd1edab5079d MD5 (mutt/patch-1.5.4.vvv.nntp.gz) = d0cb0f609aa0461d1b17137bd49c14cb MD5 (mutt/patch-1.5.4.vvv.initials.gz) = d92517da934f5c32692aecf7ece596b7 MD5 (mutt/patch-1.5.4.vvv.quote.gz) = 80d91491679b426b0f670fa965ae3777 -MD5 (mutt/patch-1.5.3.cd.edit_threads.9.3) = 753a19d8efdece04cd521c3a3079dc9f -MD5 (mutt/patch-1.5.3.cd.signatures_menu.2.1) = 6db636f0004e73ee2d9f577acd4ed380 -MD5 (mutt/patch-1.5.3.cd.ifdef.1) = 01b47e075364834b82da053cac4eb69f +MD5 (mutt/patch-1.5.4.cd.edit_threads.9.5) = f8d7fe6ea1a6a1b92c942f4446918433 +MD5 (mutt/patch-1.5.4.cd.signatures_menu.2.1) = 5b2298335071c46ee1f3ed8c689066b1 +MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa MD5 (mutt/p0-patch-1.5.4.dw.mbox-hook.1) = 326f415380cc377c99d2232f16267ffe diff --git a/mail/mutt-devel/files/extra-patch-doc-ref b/mail/mutt-devel/files/extra-patch-doc-ref index ee044b188b0b..99222e0bceb0 100644 --- a/mail/mutt-devel/files/extra-patch-doc-ref +++ b/mail/mutt-devel/files/extra-patch-doc-ref @@ -6,7 +6,7 @@ mail under unix operating systems, including support color terminals, MIME, -and a threaded sorting mode. +and a threaded sorting mode. Details of how to use all of this is -+available in \fI${PREFIX}/share/doc/mutt/\fP. ++available in \fI${DOCSDIR}\fP. .SH OPTIONS .IP "-a \fIfile\fP" Attach a file to your message using MIME. diff --git a/mail/mutt-devel/files/patch-doc-mutt.man b/mail/mutt-devel/files/patch-doc-mutt.man new file mode 100644 index 000000000000..82f4a93ffd04 --- /dev/null +++ b/mail/mutt-devel/files/patch-doc-mutt.man @@ -0,0 +1,14 @@ +--- 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 diff --git a/mail/mutt-devel/files/patch-examples b/mail/mutt-devel/files/patch-examples index 79b4e049d12a..91fb73ceaad7 100644 --- a/mail/mutt-devel/files/patch-examples +++ b/mail/mutt-devel/files/patch-examples @@ -4,7 +4,7 @@ mandir = @mandir@ srcdir = @srcdir@ docdir = @docdir@ -+samplesdir = @prefix@/share/examples/mutt ++samplesdir = @samplesdir@ top_srcdir = @top_srcdir@ top_builddir = .. INSTALL = @INSTALL@ diff --git a/mail/mutt-devel/scripts/generate-plist b/mail/mutt-devel/scripts/generate-plist index 92e354f4ed4c..0f3f431aaeb3 100644 --- a/mail/mutt-devel/scripts/generate-plist +++ b/mail/mutt-devel/scripts/generate-plist @@ -61,64 +61,64 @@ EOF if [ "$MUTT_PORTDOCS" = "yes" ]; then cat >> $tmp_first <> $tmp_first + echo "%%DOCSDIR%%/ChangeLog.nntp" >> $tmp_first fi if [ "$MUTT_SGML" = "yes" ]; then - echo "share/doc/mutt/manual.latin1" >> $tmp_first - echo "share/doc/mutt/manual.ps" >> $tmp_first + echo "%%DOCSDIR%%/manual.latin1" >> $tmp_first + echo "%%DOCSDIR%%/manual.ps" >> $tmp_first fi if [ "$MUTT_HTML" = "yes" ]; then @@ -144,19 +144,19 @@ EOF if [ "$MUTT_PGP_PATCH" = "yes" ]; then html=$(($html + 2)) fi - echo "share/doc/mutt/html/manual.html" >> $tmp_first - echo "share/doc/mutt/html/manual_toc.html" >> $tmp_first + echo "%%DOCSDIR%%/html/manual.html" >> $tmp_first + echo "%%DOCSDIR%%/html/manual_toc.html" >> $tmp_first i=1 while [ $i -le $html ]; do - echo "share/doc/mutt/html/manual$i.html" >> $tmp_first + echo "%%DOCSDIR%%/html/manual$i.html" >> $tmp_first i=$(($i + 1)) done - echo "@dirrm share/doc/mutt/html" >> $tmp_last + echo "@dirrm %%DOCSDIR%%/html" >> $tmp_last fi cat >> $tmp_last <