cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix mutt's tmp-file-naming to fix syntax highlightning for

Browse Source 
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
This commit is contained in:
Kirill Ponomarev 2004-05-10 11:37:58 +00:00
parent d933843f2a
commit d71d55958c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=108822
4 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mail/mutt/Makefile
View File

@ -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)

11
mail/mutt/files/patch-mktemp
View File

@ -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);
}

14
mail/mutt14/Makefile
View File

@ -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)

11
mail/mutt14/files/patch-mktemp
View File

@ -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);
}