Date: Mon, 10 May 2004 12:01:47 +0200 (CEST) From: Udo Schweigert <udo.schweigert@siemens.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/66443: maintainer-update of mail/mutt Message-ID: <200405101001.i4AA1lqF040093@alaska.cert.siemens.com> Resent-Message-ID: <200405101010.i4AAALLN051208@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 66443
>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: Mon May 10 03:10:21 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Udo Schweigert
>Release: FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
>Description:
Maintainer update of mail/mutt:
- Fix mutt's tmp-file-naming to fix syntax highlightning for the vim
editor.
- Add the WITHOUT_MUTT_ICONV knob and add dependency on iconv if
that knob is not defined.
PRs 63192 and 65887 can be closed, after this has been committed.
>How-To-Repeat:
>Fix:
diff -ru /usr/ports/mail/mutt/Makefile ./Makefile
--- /usr/ports/mail/mutt/Makefile Sun Mar 14 07:16:54 2004
+++ ./Makefile Fri Apr 23 08:21:54 2004
@@ -43,7 +43,16 @@
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
+USE_ICONV= yes
+.if defined(WITHOUT_MUTT_ICONV)
+.error the WITHOUT_MUTT_ICONV knob of the mutt port only works if \
+ WITHOUT_NLS is also given
.endif
+.elif !defined(WITHOUT_MUTT_ICONV)
+USE_ICONV= yes
+.endif
+
+
.if defined(WITH_SLANG)
LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang
.elif defined(WITH_NCURSES_PORT)
@@ -73,7 +82,6 @@
--with-ssl=${OPENSSLBASE} --sysconfdir=${PREFIX}/etc \
--with-sharedir=${PREFIX}/share/mutt \
--with-docdir=${DOCSDIR} --with-charmaps \
- --with-libiconv-prefix=${PREFIX} \
--enable-compressed
.if defined(MUTT_CONFIGURE_ARGS)
CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS}
@@ -86,6 +94,11 @@
PLIST_SUB+= NLS="@comment "
.else
PLIST_SUB+= NLS=""
+.endif
+.if defined(WITHOUT_MUTT_ICONV) && defined(WITHOUT_NLS)
+CONFIGURE_ARGS+= --disable-iconv
+.else
+CONFIGURE_ARGS+= --with-libiconv-prefix=${PREFIX}
.endif
.if defined(WITH_SLANG)
CONFIGURE_ARGS+= --with-slang=${PREFIX}
diff -ru /usr/ports/mail/mutt/files/patch-mktemp ./files/patch-mktemp
--- /usr/ports/mail/mutt/files/patch-mktemp Mon Feb 9 16:28:15 2004
+++ ./files/patch-mktemp Mon May 10 06:56:07 2004
@@ -1,12 +1,15 @@
---- muttlib.c.orig Mon Feb 9 08:25:28 2004
-+++ muttlib.c Mon Feb 9 08:32:46 2004
-@@ -656,7 +656,8 @@
+--- muttlib.c.orig Fri May 7 17:30:35 2004
++++ muttlib.c Fri May 7 17:32:13 2004
+@@ -656,7 +656,11 @@
void mutt_mktemp (char *s)
{
- snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-%d-%d", NONULL (Tempdir), NONULL(Hostname), (int) getpid (), Counter++);
-+ snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-XXXXXXXX", NONULL(Tempdir), NONULL(Hostname));
++ char t[7];
++ snprintf (t, 7, "-%05d", Counter++);
++ snprintf (s, _POSIX_PATH_MAX-7, "%s/mutt-%s-XXXXXXXX", NONULL(Tempdir), NONULL(Hostname));
+ mktemp (s);
++ strncat(s, t, _POSIX_PATH_MAX);
unlink (s);
}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200405101001.i4AA1lqF040093>