9 files changed, 62 insertions, 31 deletions

diff --git a/mail/mmr/Makefile b/mail/mmr/Makefile
index d32fe829299d..d79fdc11cfef 100644
--- a/mail/mmr/Makefile
+++ b/mail/mmr/Makefile
@@ -1,23 +1,32 @@
 # New ports collection makefile for:	mmr
-# Version required:			1.5.1
+# Version required:			1.5.2
 # Date created:				23 October 1997
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.3 1998/10/12 19:24:09 jseger Exp $
+# $Id: Makefile,v 1.4 1998/10/13 02:44:51 jseger Exp $
 #
 
-DISTNAME=		mmr-1.5.1
+DISTNAME=		mmr-1.5.2
 CATEGORIES=		mail
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
+MASTER_SITES=		${MASTER_SITE_SUNSITE} \
+			http://www.devolution.com/~slouken/projects/mmr/
 MASTER_SITE_SUBDIR=	system/mail/mua
 
 MAINTAINER=		andy@icc.surw.chel.su
 
-ALL_TARGET=		mmr
-
-USE_GMAKE=	yes
+ALL_TARGET=
 
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/mmr ${PREFIX}/bin
+	@ ${MKDIR} ${PREFIX}/share/examples/mmr
+	@ ${INSTALL_DATA} ${WRKSRC}/DOT-mmrc ${PREFIX}/share/examples/mmr/dot.mmrc.sample
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@ ${MKDIR} ${PREFIX}/share/doc/mmr
+.for file in BUGS CHANGES COPYING Copyright Features README TODO
+	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/mmr
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/mail/mmr/distinfo b/mail/mmr/distinfo
index fbb187028cd0..a2283d7ee039 100644
--- a/mail/mmr/distinfo
+++ b/mail/mmr/distinfo
@@ -1 +1 @@
-MD5 (mmr-1.5.1.tar.gz) = ef6848e16a3957e6cbb08203a2316b56
+MD5 (mmr-1.5.2.tar.gz) = 73823d31eb97dfbb737958316063073d
diff --git a/mail/mmr/files/patch-aa b/mail/mmr/files/patch-aa
index 086490a8d447..ed1cfdb21543 100644
--- a/mail/mmr/files/patch-aa
+++ b/mail/mmr/files/patch-aa
@@ -1,21 +1,23 @@
---- Makefile.orig	Mon Sep 22 16:20:20 1997
-+++ Makefile	Sat Nov  1 08:55:42 1997
+--- Makefile	Thu Dec 24 23:32:56 1998
++++ /home/andy/tmp/wrk/Makefile	Tue Apr 27 18:06:19 1999
 @@ -7,15 +7,15 @@
  #		(Toggled at runtime with ^T)
  # -DMAILPATH=\"/some/path\"
  #		Set the default mail spool directory
 -DEFS = -DTHREADMAIL
-+DEFS = -DTHREADMAIL -DMAILPATH=\"/var/mail\"
++DEFS = -DTHREADMAIL -DMAILPATH=\"/var/mail\" -DMAILER=\"/usr/sbin/sendmail\ -t\"
  
  OBJS = main.o rcfile.o listing.o handlemail.o commands.o terminal.o mailmsg.o \
         mime.o mimetype.o base64.o filemap.o iobottle.o my_regex.o outgoing.o \
  	md5/libmd5.a
--LIBS = -lncurses
-+LIBS = -lncurses -lcompat
- CXX  = g++
- INCDIRS = -Imd5 -I/usr/include/ncurses
--CXXFLAGS = $(DEFS) $(INCDIRS) -g
-+CXXFLAGS = $(DEFS) $(INCDIRS) $(CFLAGS)
+-LIBS = -lcurses -ltermcap -lnsl
+-CXX  = g++ -g
+-INCDIRS = -Imd5 -I/usr/include/ncurses
+-CXXFLAGS = $(DEFS) $(INCDIRS) $(CFLAGS)
++LIBS = -lncurses
++CXX?= g++ -g
++INCDIRS = -Imd5
++CXXFLAGS+= $(DEFS) $(INCDIRS)
  
  # Remind 'make' how to make C++ files.. *sigh*
  include .c++howto
diff --git a/mail/mmr/files/patch-ab b/mail/mmr/files/patch-ab
index fa7c84e71873..4bd602a70fd9 100644
--- a/mail/mmr/files/patch-ab
+++ b/mail/mmr/files/patch-ab
@@ -1,10 +1,12 @@
---- headers.h.orig	Tue Feb 18 13:39:00 1997
-+++ headers.h	Sat Nov  1 08:55:42 1997
-@@ -12,4 +12,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <sys/ioctl.h>
-+#ifdef __FreeBSD__
-+extern char* cuserid(char*);
+--- outgoing.cc	Fri Jul 17 04:10:02 1998
++++ /home/andy/tmp/wrk/outgoing.cc	Tue Apr 27 18:06:33 1999
+@@ -13,7 +13,9 @@
+ #include "terminal.h"
+ #include "rcfile.h"
+ 
++#ifndef MAILER
+ #define MAILER	"/usr/lib/sendmail -t"
 +#endif
- }
+ #define EDITOR	"vi +%d"
+ #define SIGFILE	".signature"
+ 
diff --git a/mail/mmr/files/patch-ac b/mail/mmr/files/patch-ac
index f8e63a5f10e6..f1fcf7b91417 100644
--- a/mail/mmr/files/patch-ac
+++ b/mail/mmr/files/patch-ac
@@ -1,5 +1,5 @@
---- terminal.h.orig	Mon Jun 23 13:49:40 1997
-+++ terminal.h	Sat Nov  1 08:55:42 1997
+--- terminal.h	Mon Jun 23 21:49:40 1997
++++ /home/andy/tmp/wrk/terminal.h	Tue Apr 27 18:06:25 1999
 @@ -13,7 +13,11 @@
  extern "C" {
  #include <stdlib.h>
diff --git a/mail/mmr/files/patch-ad b/mail/mmr/files/patch-ad
new file mode 100644
index 000000000000..e6483ad29d3c
--- /dev/null
+++ b/mail/mmr/files/patch-ad
@@ -0,0 +1,8 @@
+--- md5/Makefile	Wed Feb 12 01:38:38 1997
++++ /home/andy/tmp/wrk/md5/Makefile	Tue Apr 27 18:12:21 1999
+@@ -1,4 +1,4 @@
+-CC = gcc
++CC?= gcc
+ 
+ libmd5.a: md5c.o
+ 	ar rvc $@ md5c.o
diff --git a/mail/mmr/pkg-comment b/mail/mmr/pkg-comment
index b7b6ee3f0216..f3cada10feca 100644
--- a/mail/mmr/pkg-comment
+++ b/mail/mmr/pkg-comment
@@ -1 +1 @@
-A curses based MIME aware mailer
+Curses based MIME Mail Reader.
diff --git a/mail/mmr/pkg-descr b/mail/mmr/pkg-descr
index 9d003c9a954f..fe230262a77a 100644
--- a/mail/mmr/pkg-descr
+++ b/mail/mmr/pkg-descr
@@ -18,5 +18,5 @@ then be merged with the current message listing.
 
    Searchable message listings, including search through message text
 
-   Automatic ignoring of certain MIME types.
-   Get rid of those Micrsoft Exchange MIME trailers.
+
+http://www.devolution.com/~slouken/projects/mmr/index.html
diff --git a/mail/mmr/pkg-plist b/mail/mmr/pkg-plist
index f0f613d4508e..83ceb92ec87b 100644
--- a/mail/mmr/pkg-plist
+++ b/mail/mmr/pkg-plist
@@ -1 +1,11 @@
 bin/mmr
+share/doc/mmr/BUGS
+share/doc/mmr/CHANGES
+share/doc/mmr/COPYING
+share/doc/mmr/Copyright
+share/doc/mmr/Features
+share/doc/mmr/README
+share/doc/mmr/TODO
+share/examples/mmr/dot.mmrc.sample
+@dirrm share/doc/mmr
+@dirrm share/examples/mmr