7 files changed, 113 insertions, 97 deletions

diff --git a/mail/ml/Makefile b/mail/ml/Makefile
index 295bada96202..5bc981f05253 100644
--- a/mail/ml/Makefile
+++ b/mail/ml/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	YACL
-# Version required:     3.3-new
+# Version required:     3.4
 # Date created:		15 March 1998
 # Whom:			Jeroen Hogeveen <albast@xs4all.nl>
 #
-# $Id$
+# $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
 CATEGORIES=		mail
 MASTER_SITES=		http://people.netscape.com/max/ml/
 
@@ -16,13 +15,11 @@ MAINTAINER=		albast@xs4all.nl
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 USE_IMAKE=		yes
 REQUIRES_MOTIF=		yes
+NO_INSTALL_MANPAGES=	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:
-	@( cd ${WRKSRC}; make install )
-
 .include <bsd.port.mk>
diff --git a/mail/ml/distinfo b/mail/ml/distinfo
index ca4133e7e96e..7da8a9ce1d43 100644
--- a/mail/ml/distinfo
+++ b/mail/ml/distinfo
@@ -1 +1 @@
-MD5 (ml-3.3.new.tar.gz) = 982fbdc78a924bfc02b11b5749ef21f8
+MD5 (ml-3.4.tar.gz) = e5908a5093521494264ea582f865a33b
diff --git a/mail/ml/files/patch-aa b/mail/ml/files/patch-aa
index f3cf396f834a..1b9178ffd035 100644
--- a/mail/ml/files/patch-aa
+++ b/mail/ml/files/patch-aa
@@ -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	Mon Mar 30 17:07:21 1998
++++ ../imap-4/src/osdep/unix/Makefile	Sat Jun 26 02:04:49 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 --git a/mail/ml/files/patch-ab b/mail/ml/files/patch-ab
index 8c2f340a4cf1..5ac9eca9d844 100644
--- a/mail/ml/files/patch-ab
+++ b/mail/ml/files/patch-ab
@@ -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 --git a/mail/ml/files/patch-ae b/mail/ml/files/patch-ae
new file mode 100644
index 000000000000..c5d3797740e8
--- /dev/null
+++ b/mail/ml/files/patch-ae
@@ -0,0 +1,30 @@
+--- ../imap-4/src/osdep/unix/os_bsi.h.orig	Mon Mar 30 17:07:22 1998
++++ ../imap-4/src/osdep/unix/os_bsi.h	Sat Jun 26 02:13:22 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 --git a/mail/ml/files/patch-af b/mail/ml/files/patch-af
new file mode 100644
index 000000000000..d986c4773ff4
--- /dev/null
+++ b/mail/ml/files/patch-af
@@ -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,".");
diff --git a/mail/ml/pkg-plist b/mail/ml/pkg-plist
index cb603644b8f4..f05179d26c48 100644
--- a/mail/ml/pkg-plist
+++ b/mail/ml/pkg-plist
@@ -26,6 +26,7 @@ lib/X11/ml/mailboxes.help
 lib/X11/ml/mailrename.help
 lib/X11/ml/mainhelp.help
 lib/X11/ml/mime.handlers
+lib/X11/ml/mime.handlers.ORIG
 lib/X11/ml/mime.types.txt
 lib/X11/ml/mimeask.help
 lib/X11/ml/mimeinfo.help