Date: Sun, 13 Jun 1999 08:28:08 -0700 (PDT) From: albast@xs4all.nl To: freebsd-gnats-submit@freebsd.org Subject: ports/12186: Update for ports/mail/ml: ML-3.3new to 3.4 Message-ID: <19990613152808.801F914DCB@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 12186 >Category: ports >Synopsis: Update for ports/mail/ml: ML-3.3new to 3.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jun 13 08:30:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Jeroen Hogeveen >Release: FreeBSD-3.2-STABLE >Organization: >Environment: FreeBSD Ampersand.twiddle.net 3.2-STABLE FreeBSD 3.2-STABLE #5: Mon Jun 7 02:26:33 CEST 1999 jh@Ampersand.twiddle.net:/usr/src/sys/compile/AMPERSAND i386 >Description: diff -ruN ml3.3/Makefile ml/Makefile --- ml3.3/Makefile Sun Jun 13 15:02:38 1999 +++ ml/Makefile Sun Jun 13 15:14:00 1999 @@ -6,20 +6,21 @@ # $Id: Makefile,v 1.1.1.1 1999/01/11 05:13:09 steve Exp $ # -DISTNAME= ml-3.3.new -PKGNAME= ml-3.3 +DISTNAME= ml-3.4 +PKGNAME= ml-3.4 CATEGORIES= mail MASTER_SITES= http://people.netscape.com/max/ml/ MAINTAINER= albast@xs4all.nl +PATCH_DEBUG= yes WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_IMAKE= yes REQUIRES_MOTIF= yes pre-configure: @echo "===> Building c-client" - @( cd ${WRKSRC}/../imap-4; make bsf ) + @( cd ${WRKSRC}/../imap-4; make bsi ) @( cd ${WRKSRC}; ${RM} -f makeproto ) do-install: diff -ruN ml3.3/files/md5 ml/files/md5 --- ml3.3/files/md5 Sun Jun 13 15:02:38 1999 +++ ml/files/md5 Sun Jun 13 15:25:58 1999 @@ -1 +1 @@ -MD5 (ml-3.3.new.tar.gz) = 982fbdc78a924bfc02b11b5749ef21f8 +MD5 (ml-3.4.tar.gz) = e5908a5093521494264ea582f865a33b diff -ruN ml3.3/patches/patch-aa ml/patches/patch-aa --- ml3.3/patches/patch-aa Sun Jun 13 15:02:38 1999 +++ ml/patches/patch-aa Sun Jun 13 15:14:16 1999 @@ -1,38 +1,21 @@ -*** ../imap-4/src/osdep/unix/Makefile.orig Sun Mar 15 18:36:06 1998 ---- ../imap-4/src/osdep/unix/Makefile Sun Mar 15 18:37:26 1998 -*************** -*** 39,46 **** - dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ - rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ - bezerk.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o -! CC=cc -! CFLAGS=$(EXTRACFLAGS) - EXTRADRIVERS=mbox - DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf bezerk news phile dummy - LN=ln -s ---- 39,46 ---- - dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ - rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ - bezerk.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o -! #CC=cc -! #CFLAGS+=$(EXTRACFLAGS) - EXTRADRIVERS=mbox - DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf bezerk news phile dummy - LN=ln -s -*************** -*** 122,128 **** - STDPROTO=bezerkproto MAILSPOOL=/var/mail \ - ACTIVEFILE=/usr/local/news/lib/active NEWSSPOOL=/var/news \ - RSHPATH=/usr/bin/rsh \ -! CFLAGS="-g -O -pipe -DNFSKLUDGE $(EXTRACFLAGS)" \ - LDFLAGS="-lcrypt" - - bsi: sigbsd # BSD/i386 ---- 122,128 ---- - STDPROTO=bezerkproto MAILSPOOL=/var/mail \ - ACTIVEFILE=/usr/local/news/lib/active NEWSSPOOL=/var/news \ - RSHPATH=/usr/bin/rsh \ -! CFLAGS="${CFLAGS} -DNFSKLUDGE $(EXTRACFLAGS)" \ - LDFLAGS="-lcrypt" - - bsi: sigbsd # BSD/i386 +--- ../imap-4/src/osdep/unix/Makefile.orig Tue Mar 31 03:07:21 1998 ++++ ../imap-4/src/osdep/unix/Makefile Sun Jun 13 13:51:35 1999 +@@ -39,7 +39,7 @@ + netmsg.o rfc822.o nntp.o smtp.o imap4.o pop3.o \ + bezerk.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o + EXTRACFLAGS= +-CFLAGS=$(EXTRACFLAGS) ++#CFLAGS=$(EXTRACFLAGS) + EXTRADRIVERS=mbox mbx + DEFAULTDRIVERS=imap nntp pop3 mh tenex mtx mmdf bezerk news phile dummy + LN=ln -s +@@ -109,7 +109,8 @@ + bsi: # BSD/i386 + $(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \ + STDPROTO=bezerkproto \ +- RSHPATH=/usr/bin/rsh CFLAGS="-g -O -pipe $(EXTRACFLAGS)" ++ RSHPATH=/usr/bin/rsh CFLAGS="${CFLAGS} $(EXTRACFLAGS)" \ ++ LDFLAGS="-lcrypt" + + cvx: # Convex + $(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \ diff -ruN ml3.3/patches/patch-ab ml/patches/patch-ab --- ml3.3/patches/patch-ab Sun Jun 13 15:02:38 1999 +++ ml/patches/patch-ab Sun Jun 13 15:14:42 1999 @@ -1,50 +1,35 @@ -*** Imakefile.orig Sun Mar 15 20:34:12 1998 ---- Imakefile Sun Mar 15 20:35:43 1998 -*************** -*** 4,10 **** - XCOMM We need /usr/include, the current src dir, the parent of this - XCOMM dir, the parent of X11, and the parent of the Motif (Xm) include dir - -! EXTRA_INCLUDES = -DFALLBACK -I$(INCROOT) -I./ -I../ -I/usr/include/Motif1.2 - - - XCOMM `Compile time defines: ---- 4,10 ---- - XCOMM We need /usr/include, the current src dir, the parent of this - XCOMM dir, the parent of X11, and the parent of the Motif (Xm) include dir - -! EXTRA_INCLUDES = -DFALLBACK -DDEFAULT_LIBDIR="\"${X11BASE}/lib/X11/ml\"" -I$(INCROOT) -I. -I.. - - - XCOMM `Compile time defines: -*************** -*** 25,38 **** - XCOMM the Xpm library also - - #XMLIB= -! XMLIB=-L/usr/lib/Motif1.2 -lXm - - LOCAL_LIBRARIES = ../imap-4/c-client/c-client.a - - # anything else your OS needs? -! #OTHERLIBS=-lgen - -! ML_LIBDIR=/usr/local/lib/ml - HELP_FILES=`find ../lib -type f -print` - - XCOMM Default font sizes. Linux folks will want FONTSIZE=14 (or ---- 25,38 ---- - XCOMM the Xpm library also - - #XMLIB= -! XMLIB=${MOTIFLIB} - - LOCAL_LIBRARIES = ../imap-4/c-client/c-client.a - - # anything else your OS needs? -! OTHERLIBS=-lcrypt - -! ML_LIBDIR=${X11BASE}/lib/X11/ml - HELP_FILES=`find ../lib -type f -print` - - XCOMM Default font sizes. Linux folks will want FONTSIZE=14 (or +--- Imakefile.orig Tue Mar 31 02:59:36 1998 ++++ Imakefile Sun Jun 13 13:44:39 1999 +@@ -4,7 +4,7 @@ + XCOMM We need /usr/include, the current src dir, the parent of this + XCOMM dir, the parent of X11, and the parent of the Motif (Xm) include dir + +-EXTRA_INCLUDES = -I../Xm -I/usr/openwin/include -I$(INCROOT) -I./ -I../ ++EXTRA_INCLUDES = -I/usr/dt/include -DDEFAULT_LIBDIR="\"${X11BASE}/lib/X11/ml\"" -I$(INCROOT) -I. -I.. + + + XCOMM `Compile time defines: +@@ -18,19 +18,19 @@ + XCOMM This hasn't yet been tested. + XCOMM -DNO_EDITRES If your X release doesn't have Xmu/Editres.h + +-CFLAGS= -g -DFALLBACK $(EXTRA_INCLUDES) ++CFLAGS+=-DFALLBACK $(EXTRA_INCLUDES) + + + XCOMM Location of Motif library. If Motif 2.0, add the location of + XCOMM the Xpm library also + +-XMLIB= -L../Xm -lXm ../Xm/libXpm.a ++XMLIB=${MOTIFLIB} -lXp + + LOCAL_LIBRARIES = ../imap-4/c-client/c-client.a + + +-OTHERLIBS=-lgen +-ML_LIBDIR=/usr/local/lib/ml ++OTHERLIBS=-lcrypt ++ML_LIBDIR=${X11BASE}/lib/X11/ml + HELP_FILES=`find ../lib -type f -print` + + XCOMM Default font sizes. Linux folks will want FONTSIZE=14 (or diff -ruN ml3.3/patches/patch-ae ml/patches/patch-ae --- ml3.3/patches/patch-ae Thu Jan 1 01:00:00 1970 +++ ml/patches/patch-ae Sun Jun 13 16:27:25 1999 @@ -0,0 +1,30 @@ +--- ../imap-4/src/osdep/unix/os_bsi.h.orig Sun Jun 13 15:41:28 1999 ++++ ../imap-4/src/osdep/unix/os_bsi.h Sun Jun 13 15:42:02 1999 +@@ -34,13 +34,25 @@ + */ + + #define MAILFILE "/var/mail/%s" +-#define ACTIVEFILE "/usr/lib/news/active" +-#define NEWSSPOOL "/usr/spool/news" ++#define ACTIVEFILE "/usr/local/news/db/active" /* inn-stable port */ ++#define NEWSSPOOL "/var/spool/news" /* inn-stable port */ + + #include <stdlib.h> + #include <string.h> + #include <sys/types.h> ++ ++/* ++ * From ports/mail/imap-uw: ++ * FreeBSD v3.x and onward whines about <sys/dir.h> being obsolete, so switch ++ * to POSIX semantics. ++ */ ++#if __FreeBSD__ >= 3 ++#include <dirent.h> ++#define direct dirent ++#else + #include <sys/dir.h> ++#endif ++ + #include <sys/uio.h> /* needed for writev() prototypes */ + #include <syslog.h> + #include <sys/file.h> diff -ruN ml3.3/patches/patch-af ml/patches/patch-af --- ml3.3/patches/patch-af Thu Jan 1 01:00:00 1970 +++ ml/patches/patch-af Sun Jun 13 16:58:28 1999 @@ -0,0 +1,20 @@ +--- ../imap-4/src/c-client/mtest.c.orig Sun Jun 13 16:51:38 1999 ++++ ../imap-4/src/c-client/mtest.c Sun Jun 13 16:54:03 1999 +@@ -479,7 +479,7 @@ + void prompt (char *msg,char *txt) + { + printf ("%s",msg); +- gets (txt); ++ fgets (txt, (8 * MAILTMPLEN), stdin); + } + + /* Interfaces to C-client */ +@@ -664,7 +664,7 @@ + puts (" Msg (end with a line with only a '.'):"); + body->type = TYPETEXT; + *text = '\0'; +- while (gets (line)) { ++ while (fgets (line, MAILTMPLEN, stdin)) { + if (line[0] == '.') { + if (line[1] == '\0') break; + else strcat ((char *) text,"."); >How-To-Repeat: >Fix: Apply patch from full-description. Note for CVS committer: new files "patches/patch-ae" and "patches/patch-af". Thanks Andreas for the update :) >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990613152808.801F914DCB>