Date: Sun, 26 Oct 2003 11:46:48 +0100 (CET) From: Udo Schweigert <udo.schweigert@siemens.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58559: maintainer-update of mail/mutt-devel Message-ID: <200310261046.h9QAkmUV011085@alaska.cert.siemens.de> Resent-Message-ID: <200310261050.h9QAoKjh047373@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58559 >Category: ports >Synopsis: maintainer-update of mail/mutt-devel >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Oct 26 02:50:20 PST 2003 >Closed-Date: >Last-Modified: >Originator: Udo Schweigert >Release: FreeBSD 4.9-RC i386 >Organization: >Environment: System: FreeBSD alaska.cert.siemens.de 4.9-RC FreeBSD 4.9-RC #111: Thu Oct 23 08:13:48 CEST 2003 ust@alaska.cert.siemens.de:/usr/obj/usr/src/sys/alaska i386 >Description: Maintainer update of mail/mutt-devel: - Fix the DOCSDIR and EXAMPLESDIR code. Now both can be set to non-standard values. - Be less verbose. >How-To-Repeat: >Fix: diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile --- /usr/ports/mail/mutt-devel/Makefile Sun Oct 26 06:32:21 2003 +++ ./Makefile Sun Oct 26 11:17:31 2003 @@ -133,7 +133,7 @@ # 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}|" \ + @${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \ -e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \ -e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \ -e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \ @@ -181,13 +181,13 @@ .endif .if ! defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT) pre-configure:: - ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook + @${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 + @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-pgp-dw .endif .if defined(WITH_MUTT_LOCALES_FIX) @@ -243,7 +243,7 @@ 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' \ + @${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \ ${WRKSRC}/contrib/Makefile.in pre-configure:: @@ -275,17 +275,21 @@ .endif .if ! defined(WITHOUT_MUTT_QUOTE_PATCH) post-patch:: - ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-quote + @${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' \ + @${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 @@ -294,14 +298,14 @@ .endif .else # ! NOPORTDOCS post-patch:: - ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib + @${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 + @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-sgmlformat .endif pre-install: diff -ru /usr/ports/mail/mutt-devel/files/patch-doc-mutt.man ./files/patch-doc-mutt.man --- /usr/ports/mail/mutt-devel/files/patch-doc-mutt.man Wed Sep 24 17:27:28 2003 +++ ./files/patch-doc-mutt.man Sun Oct 26 11:17:08 2003 @@ -12,3 +12,23 @@ 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. >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310261046.h9QAkmUV011085>