Date: Sat, 20 Aug 2005 00:40:07 +1200 From: Matthew Luckie <mjl@luckie.org.nz> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/85119: [patch] unbreak mail/ml on 6.X, 5.X Message-ID: <E1E66AJ-0008AW-Gi@rayon.plunket.luckie.org.nz> Resent-Message-ID: <200508191240.j7JCeNZF093994@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 85119 >Category: ports >Synopsis: [patch] unbreak mail/ml on 6.X, 5.X >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Aug 19 12:40:23 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Matthew Luckie >Release: FreeBSD 6.0-BETA i386 >Organization: University of Waikato >Environment: System: FreeBSD rayon.plunket.luckie.org.nz 6.0-BETA FreeBSD 6.0-BETA #0: Mon Jul 18 21:32:58 NZST 2005 root@rayon.plunket.luckie.org.nz:/usr/obj/usr/src/sys/rayon i386 >Description: unbreak mail/ml on 5.X, 6.X google's cache suggests that the old distfile site which is marked as disappeared is more correctly 'unreliable' as google seemed to get through to it on the 13th. >How-To-Repeat: N/A >Fix: diff -uNr ml.orig/Makefile ml/Makefile --- ml.orig/Makefile Sun Jul 31 07:03:22 2005 +++ ml/Makefile Sat Aug 20 00:32:02 2005 @@ -8,11 +8,7 @@ PORTNAME= ml PORTVERSION= 3.4 CATEGORIES= mail -# mastersite disappeared in October 2003 -MASTER_SITES= # http://ftp.rge.com/pub/mail/ml/ - -DEPRECATED= "master site disappeared" -EXPIRATION_DATE=2005-08-31 +MASTER_SITES= http://ftp.uni-koeln.de/windows/xcontrib/ MAINTAINER= ports@FreeBSD.org COMMENT= An X11 IMAP client @@ -21,15 +17,9 @@ USE_IMAKE= yes USE_MOTIF= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile" -.endif - pre-configure: @${ECHO_MSG} "===> Building c-client" @( cd ${WRKSRC}/../imap-4; make bsi ) @( cd ${WRKSRC}; ${RM} -f makeproto ) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -uNr ml.orig/files/patch-ah ml/files/patch-ah --- ml.orig/files/patch-ah Thu Jan 1 12:00:00 1970 +++ ml/files/patch-ah Sat Aug 20 00:15:50 2005 @@ -0,0 +1,20 @@ +--- ../imap-4/src/osdep/unix/bezerk.c.orig Tue Mar 31 13:07:23 1998 ++++ ../imap-4/src/osdep/unix/bezerk.c Sat Aug 20 00:11:13 2005 +@@ -896,7 +896,7 @@ + /* length of internal + message headers */ + iov[j].iov_len = (m->header + m->headersize) - m->internal; + /* suppress extra newline if present */ +- if ((iov[j].iov_base)[iov[j].iov_len - 2] == '\n') iov[j++].iov_len--; ++ if (((char *)iov[j].iov_base)[iov[j].iov_len - 2] == '\n') iov[j++].iov_len--; + else j++; /* unlikely but... */ + /* status */ + iov[j].iov_base = status; +@@ -1775,7 +1775,7 @@ + /* length of internal + message headers */ + iov[j].iov_len = (m->header + m->headersize) - m->internal; + /* suppress extra newline if present */ +- if ((iov[j].iov_base)[iov[j].iov_len - 2] == '\n') iov[j++].iov_len--; ++ if (((char *)iov[j].iov_base)[iov[j].iov_len - 2] == '\n') iov[j++].iov_len--; + else j++; /* unlikely but... */ + /* status */ + iov[j].iov_base = LOCAL->buf; diff -uNr ml.orig/files/patch-ai ml/files/patch-ai --- ml.orig/files/patch-ai Thu Jan 1 12:00:00 1970 +++ ml/files/patch-ai Sat Aug 20 00:18:32 2005 @@ -0,0 +1,20 @@ +--- ../imap-4/src/osdep/unix/mmdf.c.orig Tue Mar 31 13:07:25 1998 ++++ ../imap-4/src/osdep/unix/mmdf.c Sat Aug 20 00:17:25 2005 +@@ -869,7 +869,7 @@ + /* length of internal + message headers */ + iov[j].iov_len = (m->header + m->headersize) - m->internal; + /* suppress extra newline if present */ +- if ((iov[j].iov_base)[iov[j].iov_len - 2] == '\n') iov[j++].iov_len--; ++ if (((char *)iov[j].iov_base)[iov[j].iov_len - 2] == '\n') iov[j++].iov_len--; + else j++; /* unlikely but... */ + /* status */ + iov[j].iov_base = status; +@@ -1727,7 +1727,7 @@ + /* length of internal + message headers */ + iov[j].iov_len = (m->header + m->headersize) - m->internal; + /* suppress extra newline if present */ +- if ((iov[j].iov_base)[iov[j].iov_len - 2] == '\n') iov[j++].iov_len--; ++ if (((char *)iov[j].iov_base)[iov[j].iov_len - 2] == '\n') iov[j++].iov_len--; + else j++; /* unlikely but... */ + /* status */ + iov[j].iov_base = LOCAL->buf; >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1E66AJ-0008AW-Gi>