Date: Tue, 9 Nov 2004 18:58:48 +0100 (CET) From: Udo Schweigert <udo.schweigert@siemens.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/73727: maintainer-update of mail/mutt-devel Message-ID: <200411091758.iA9HwmWw024047@alaska.cert.siemens.com> Resent-Message-ID: <200411091800.iA9I0j3R091981@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 73727
>Category: ports
>Synopsis: maintainer-update of mail/mutt-devel
>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: Tue Nov 09 18:00:45 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Udo Schweigert
>Release: FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
>Description:
Maintainer update of mail/mutt-devel:
- Add WITH_MUTT_ASPELL and WITH_MUTT_ISPELL knobs.
(aspell is prefered over ispell, as it supports more languages and
gives better suggestions)
- Update the maildir header cache patch.
- Fix the libidn dependency.
- Fix PREFIX/LOCALBASE handling (I hope it's OK now ;-)
- Bump PORTREVISION.
Committer: cvs add files/extra-patch-aspell
>How-To-Repeat:
>Fix:
diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile
--- /usr/ports/mail/mutt-devel/Makefile Wed Oct 27 06:06:38 2004
+++ ./Makefile Tue Nov 9 18:51:40 2004
@@ -66,6 +66,12 @@
# define
# WITH_MUTT_CYRUS_SASL2
#
+# If you want mutt to use the GNU aspell spelling checker define:
+# WITH_MUTT_ASPELL
+#
+# If you want mutt to use the ispell spelling checker define:
+# WITH_MUTT_ISPELL
+#
# If you want to use the rethreading functions define:
# WITH_MUTT_EDIT_THREADS
#
@@ -84,7 +90,7 @@
PORTNAME= mutt-devel
PORTVERSION= 1.5.6
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES+= mail ipv6
.if defined(WITH_MUTT_NNTP)
CATEGORIES+= news
@@ -165,10 +171,24 @@
-e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \
${BUILD_WRKSRC}/Makefile
-.if defined(PACKAGE_BUILDING)
+.if exists(${LOCALBASE}/bin/aspell) && !defined(WITH_MUTT_ISPELL)
+WITH_MUTT_ASPELL= yes
+.elif exists(${LOCALBASE}/bin/ispell) && !defined(WITH_MUTT_ASPELL)
+WITH_MUTT_ISPELL= yes
+.endif
+.if defined(PACKAGE_BUILDING) && !defined(WITH_MUTT_ASPELL) && \
+ !defined(WITH_MUTT_ISPELL)
+WITH_MUTT_ASPELL= yes
+.endif
+.if defined(WITH_MUTT_ASPELL)
+BUILD_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
+RUN_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
+.elif defined(WITH_MUTT_ISPELL)
BUILD_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
-RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell \
- urlview:${PORTSDIR}/textproc/urlview
+RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
+.endif
+.if defined(PACKAGE_BUILDING)
+RUN_DEPENDS+= urlview:${PORTSDIR}/textproc/urlview
.endif
.if defined(WITH_MUTT_NCURSES_PORT)
@@ -200,7 +220,7 @@
.endif
.if defined(MUTT_USES_NCURSES) && ${OSVERSION} < 400000
LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
-CFLAGS+= -I${PREFIX}/include/ncurses -I${PREFIX}/include
+CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
.elif defined(MUTT_USES_SLANG)
LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang
.endif
@@ -209,13 +229,13 @@
.endif
.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42
-CFLAGS+= -I${PREFIX}/include/db42
+CFLAGS+= -I${LOCALBASE}/include/db42
.endif
.if exists(${LOCALBASE}/lib/libidn.so)
WITH_MUTT_IDN= yes
.endif
.if defined(WITH_MUTT_IDN)
-LIB_DEPENDS+= idn.16:${PORTSDIR}/devel/libidn
+LIB_DEPENDS+= idn:${PORTSDIR}/devel/libidn
.endif
.if ! defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT)
pre-configure::
@@ -249,13 +269,18 @@
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-edit-threads
.endif
+.if defined(WITH_MUTT_ASPELL)
+pre-configure::
+ @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-aspell
+.endif
+
.if defined(WITH_MUTT_LOCALES_FIX)
CONFIGURE_ARGS+= --enable-locales-fix
.endif
.if defined(MUTT_USES_NCURSES) && ${OSVERSION} < 400000
-CONFIGURE_ARGS+= --with-curses=${PREFIX}
+CONFIGURE_ARGS+= --with-curses=${LOCALBASE}
.elif defined(MUTT_USES_SLANG)
-CONFIGURE_ARGS+= --with-slang=${PREFIX}
+CONFIGURE_ARGS+= --with-slang=${LOCALBASE}
PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.slang.gz:vvv
.endif
.if defined(WITH_MUTT_CYRUS_SASL2)
@@ -267,7 +292,7 @@
.if defined(WITHOUT_MUTT_ICONV)
CONFIGURE_ARGS+= --disable-iconv
.else
-CONFIGURE_ARGS+= --with-libiconv-prefix=${PREFIX}
+CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE}
.endif
.if defined(WITH_MUTT_IDN)
CONFIGURE_ARGS+= --with-idn
diff -ru /usr/ports/mail/mutt-devel/files/extra-patch-aspell ./files/extra-patch-aspell
--- /usr/ports/mail/mutt-devel/files/extra-patch-aspell Thu Jan 1 01:00:00 1970
+++ ./files/extra-patch-aspell Tue Nov 9 10:51:46 2004
@@ -0,0 +1,11 @@
+--- Muttrc.head.in.orig Thu Jan 24 13:10:47 2002
++++ Muttrc.head.in Tue Nov 9 08:53:14 2004
+@@ -19,6 +19,8 @@
+ macro index <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
+ macro pager <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
+
++set ispell="/usr/local/bin/aspell --mode=email check"
++
+ # If Mutt is unable to determine your site's domain name correctly, you can
+ # set the default here.
+ #
diff -ru /usr/ports/mail/mutt-devel/files/extra-patch-maildir-header-cache ./files/extra-patch-maildir-header-cache
--- /usr/ports/mail/mutt-devel/files/extra-patch-maildir-header-cache Wed Oct 20 12:59:11 2004
+++ ./files/extra-patch-maildir-header-cache Tue Nov 9 09:31:27 2004
@@ -2,7 +2,7 @@
--- a/PATCHES
+++ b/PATCHES
@@ -0,0 +1 @@
-+patch-1.5.6.tg.hcache.10
++patch-1.5.6.tg.hcache.11
diff -Nru a/configure.in b/configure.in
--- a/configure.in 2004-08-18 09:43:09 +02:00
+++ b/configure.in 2004-10-14 07:21:52 +02:00
@@ -131,8 +131,8 @@
WHERE char *MhUnseen;
diff -Nru a/hcache.c b/hcache.c
--- /dev/null Wed Dec 31 16:00:00 196900
-+++ b/hcache.c 2004-09-28 19:57:45 +02:00
-@@ -0,0 +1,856 @@
++++ b/hcache.c 2004-11-09 00:09:22 +01:00
+@@ -0,0 +1,880 @@
+/*
+ * Copyright (C) 2004 Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
+ * Copyright (C) 2004 Tobias Werth <sitowert@stud.uni-erlangen.de>
@@ -200,10 +200,34 @@
+ unsigned long long uid_validity;
+} validate;
+
++static void *
++lazy_malloc(size_t siz)
++{
++ if (0 < siz && siz < 4096) {
++ siz = 4096;
++ }
++
++ return safe_malloc(siz);
++}
++
++static void
++lazy_realloc(void *ptr, size_t siz)
++{
++ void **p = (void **)ptr;
++
++ if ( p != NULL
++ && 0 < siz
++ && siz < 4096) {
++ return;
++ }
++
++ safe_realloc(ptr, siz);
++}
++
+static unsigned char *
+dump_int(unsigned int i, unsigned char *d, int *off)
+{
-+ safe_realloc(&d, *off + sizeof(int));
++ lazy_realloc(&d, *off + sizeof(int));
+ memcpy(d + *off, &i, sizeof(int));
+ (*off) += sizeof(int);
+
@@ -230,7 +254,7 @@
+
+ size = mutt_strlen(c) + 1;
+ d = dump_int(size, d, off);
-+ safe_realloc(&d, *off + size);
++ lazy_realloc(&d, *off + size);
+ memcpy(d + *off, c, size);
+ *off += size;
+
@@ -247,7 +271,7 @@
+ }
+
+ d = dump_int(size, d, off);
-+ safe_realloc(&d, *off + size);
++ lazy_realloc(&d, *off + size);
+ memcpy(d + *off, c, size);
+ *off += size;
+
@@ -430,7 +454,7 @@
+static unsigned char *
+dump_body(BODY *c, unsigned char *d, int *off)
+{
-+ safe_realloc(&d, *off + sizeof(BODY));
++ lazy_realloc(&d, *off + sizeof(BODY));
+ memcpy(d + *off, c, sizeof(BODY));
+ *off += sizeof(BODY);
+
@@ -542,7 +566,7 @@
+{
+ int crc = 0;
+
-+ crc = crc32(crc, (unsigned char const *) "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20040928175752|08278", mutt_strlen("sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20040928175752|08278"));
++ crc = crc32(crc, (unsigned char const *) "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613", mutt_strlen("sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613"));
+
+#if HAVE_LANGINFO_CODESET
+ crc = crc32(crc, (unsigned char const *) Charset, mutt_strlen(Charset));
@@ -629,7 +653,7 @@
+ unsigned char *d = NULL;
+ *off = 0;
+
-+ d = safe_malloc(sizeof(validate));
++ d = lazy_malloc(sizeof(validate));
+
+ if (uid_validity) {
+ memcpy(d, &uid_validity, sizeof(long long));
@@ -642,7 +666,7 @@
+
+ d = dump_int(db->crc, d, off);
+
-+ safe_realloc(&d, *off + sizeof(HEADER));
++ lazy_realloc(&d, *off + sizeof(HEADER));
+ memcpy(d + *off, h, sizeof(HEADER));
+ *off += sizeof(HEADER);
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411091758.iA9HwmWw024047>