diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-05-10 11:37:58 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-05-10 11:37:58 +0000 |
| commit | d71d55958c65724ff085cbc97d3b90f0c2ec56ae (patch) | |
| tree | af03ff39a86367fd710e4db1ba7803515066616a /mail/mutt | |
| parent | Fix path in pkg-message. (diff) | |
- 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.
PR: ports/66443
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=108822
Diffstat (limited to 'mail/mutt')
| -rw-r--r-- | mail/mutt/Makefile | 14 | ||||
| -rw-r--r-- | mail/mutt/files/patch-mktemp | 11 |
2 files changed, 20 insertions, 5 deletions
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 5327698869e3..48b1cbef7f49 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -43,7 +43,15 @@ WITH_SGML_DOCS?=yes .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 +81,6 @@ CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \ --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} @@ -87,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} .elif defined(WITH_NCURSES_PORT) diff --git a/mail/mutt/files/patch-mktemp b/mail/mutt/files/patch-mktemp index 56bc36e7cd91..e8c26f8fc061 100644 --- a/mail/mutt/files/patch-mktemp +++ b/mail/mutt/files/patch-mktemp @@ -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); } |