From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Oct 26 02:50:28 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B9A5A16A4C0 for ; Sun, 26 Oct 2003 02:50:27 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D7DE43FDF for ; Sun, 26 Oct 2003 02:50:21 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h9QAoKFY047361 for ; Sun, 26 Oct 2003 02:50:20 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h9QAoKLK047360; Sun, 26 Oct 2003 02:50:20 -0800 (PST) (envelope-from gnats) Resent-Date: Sun, 26 Oct 2003 02:50:20 -0800 (PST) Resent-Message-Id: <200310261050.h9QAoKLK047360@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Udo Schweigert Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7612616A4B3 for ; Sun, 26 Oct 2003 02:43:26 -0800 (PST) Received: from david.siemens.de (david.siemens.de [192.35.17.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id B12FD43FAF for ; Sun, 26 Oct 2003 02:43:24 -0800 (PST) (envelope-from udo.schweigert@siemens.com) Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by david.siemens.de (8.11.7/8.11.7) with ESMTP id h9QAhNp29393 for ; Sun, 26 Oct 2003 11:43:23 +0100 (MET) Received: from mars.cert.siemens.de (ust.mchp.siemens.de [139.23.201.17]) by mail2.siemens.de (8.11.7/8.11.7) with ESMTP id h9QAhNs10024 for ; Sun, 26 Oct 2003 11:43:23 +0100 (MET) Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [139.23.202.134]) mail/cert.mc.pre,v 1.52 2003/10/14 15:14:21 ust Exp $) with ESMTP id h9QAhN2R070386 for ; Sun, 26 Oct 2003 11:43:23 +0100 (CET) Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [127.0.0.1]) hosts/alaska/mail/config.mc,v 1.16 2003/10/13 08:06:06 ust Exp $) with ESMTP id h9QAhN0F075463 for ; Sun, 26 Oct 2003 11:43:23 +0100 (CET) (envelope-from ust@alaska.cert.siemens.de) Received: (from ust@localhost) hosts/alaska/mail/submit.mc,v 1.4 2002/12/31 15:32:17 ust Exp $) id h9QAhNdA063799; Sun, 26 Oct 2003 11:43:23 +0100 (CET) (envelope-from ust) Message-Id: <200310261043.h9QAhNdA063799@alaska.cert.siemens.de> Date: Sun, 26 Oct 2003 11:43:23 +0100 (CET) From: Udo Schweigert To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/58558: maintainer-update of mail/mutt X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Udo Schweigert List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Oct 2003 10:50:28 -0000 >Number: 58558 >Category: ports >Synopsis: maintainer-update of mail/mutt >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:19 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: - Fix the DOCSDIR and EXAMPLESDIR code. Now both can be set to non-standard values. - Striping of binaries is no longer needed (it's done by install -s). - Be less verbose. Committer: cvs add files/patch-doc-mutt.man >How-To-Repeat: >Fix: diff -ru /usr/ports/mail/mutt/Makefile ./Makefile --- /usr/ports/mail/mutt/Makefile Thu Sep 25 06:34:29 2003 +++ ./Makefile Sun Oct 26 11:23:13 2003 @@ -92,6 +92,8 @@ 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 .if defined(WITH_MUTT_XFACE) post-patch:: @@ -105,7 +107,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}|" \ @@ -113,10 +115,16 @@ .if !defined(NOPORTDOCS) post-build: - ${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml - ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref - printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \ - ed -s ${WRKSRC}/doc/mutt.man + @${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml + @${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(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no" PLIST:= ${WRKDIR}/PLIST pre-install: @@ -126,7 +134,6 @@ .endif post-install: - @${STRIP_CMD} ${PREFIX}/bin/mutt ${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/etc/Muttrc.dist .if !defined(NOPORTDOCS) @${ECHO} "===> Installing Mutt documentation" diff -ru /usr/ports/mail/mutt/files/extra-patch-doc-ref ./files/extra-patch-doc-ref --- /usr/ports/mail/mutt/files/extra-patch-doc-ref Mon Mar 17 08:09:24 2003 +++ ./files/extra-patch-doc-ref Sun Oct 26 11:21:48 2003 @@ -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 -ru /usr/ports/mail/mutt/files/patch-doc-mutt.man ./files/patch-doc-mutt.man --- /usr/ports/mail/mutt/files/patch-doc-mutt.man Thu Jan 1 01:00:00 1970 +++ ./files/patch-doc-mutt.man Sun Oct 26 11:11:23 2003 @@ -0,0 +1,34 @@ +--- doc/mutt.man.orig Wed Jul 24 10:41:31 2002 ++++ doc/mutt.man Sun Oct 26 11:06:36 2003 +@@ -136,9 +136,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 +--- doc/muttrc.man Sun Oct 26 11:09:09 2003 ++++ doc/muttrc.man Sun Oct 26 11:08:48 2003 +@@ -990,7 +972,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 +@@ -3970,7 +3952,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. diff -ru /usr/ports/mail/mutt/files/patch-examples ./files/patch-examples --- /usr/ports/mail/mutt/files/patch-examples Wed Mar 26 19:21:14 2003 +++ ./files/patch-examples Sun Oct 26 10:41:30 2003 @@ -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@ >Release-Note: >Audit-Trail: >Unformatted: