diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-05-10 11:38:52 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-05-10 11:38:52 +0000 |
| commit | 536fda27c1ab9ef2aaa7a0e3858414423e2edc96 (patch) | |
| tree | 314d0b6cb5e66da59faed81b8d7b0935d7bdbe92 /mail/mutt-devel | |
| parent | d71d55958c65724ff085cbc97d3b90f0c2ec56ae (diff) | |
| download | ports-536fda27c1ab9ef2aaa7a0e3858414423e2edc96.tar.gz ports-536fda27c1ab9ef2aaa7a0e3858414423e2edc96.zip | |
Notes
Diffstat (limited to 'mail/mutt-devel')
| -rw-r--r-- | mail/mutt-devel/Makefile | 13 | ||||
| -rw-r--r-- | mail/mutt-devel/files/patch-mktemp | 11 |
2 files changed, 19 insertions, 5 deletions
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index 7731c6b906bf..ad20670ed277 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -37,6 +37,9 @@ # WITH_MUTT_COMPRESSED_FOLDERS # This is a default knob and can be disabled by WITHOUT_MUTT_COMPRESSED_FOLDERS # +# If you do not want mutt to use the iconv library define: +# WITHOUT_MUTT_ICONV +# # If you want to enable extended quoting functions define: # WITH_MUTT_QUOTE_PATCH # This is a default knob and can be disabled by WITHOUT_MUTT_QUOTE_PATCH @@ -113,7 +116,7 @@ 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=${DOCSDIR} \ --sysconfdir=${PREFIX}/etc --enable-external-dotlock \ - --with-libiconv-prefix=${PREFIX} --enable-pop --enable-imap + --enable-pop --enable-imap .if defined(MUTT_CONFIGURE_ARGS) CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS} .endif @@ -184,6 +187,9 @@ SGML_USED= no .if !defined(WITHOUT_NLS) USE_GETTEXT= yes .endif +.if !defined(WITHOUT_MUTT_ICONV) +USE_ICONV= yes +.endif .if defined(NOPORTDOCS) SGML_USED= no @@ -240,6 +246,11 @@ CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls .endif +.if defined(WITHOUT_MUTT_ICONV) +CONFIGURE_ARGS+= --disable-iconv +.else +CONFIGURE_ARGS+= --with-libiconv-prefix=${PREFIX} +.endif PATCH_DIST_STRIP= -p1 diff --git a/mail/mutt-devel/files/patch-mktemp b/mail/mutt-devel/files/patch-mktemp index d6c18b85c52d..bb02ae52e2f7 100644 --- a/mail/mutt-devel/files/patch-mktemp +++ b/mail/mutt-devel/files/patch-mktemp @@ -1,12 +1,15 @@ ---- muttlib.c.orig Sun Feb 1 18:15:17 2004 -+++ muttlib.c Mon Feb 9 08:44:36 2004 -@@ -657,7 +657,8 @@ +--- muttlib.c.orig Thu Apr 22 14:43:58 2004 ++++ muttlib.c Thu Apr 22 14:51:01 2004 +@@ -657,7 +657,11 @@ void _mutt_mktemp (char *s, const char *src, int line) { - 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); dprint (1, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s)); unlink (s); } |