update to 1.5.4

PR:		17718
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

6 files changed, 46 insertions, 49 deletions

diff --git a/mail/mmr/Makefile b/mail/mmr/Makefile
index a3023ef75e7d..4e0cba376148 100644
--- a/mail/mmr/Makefile
+++ b/mail/mmr/Makefile
@@ -1,31 +1,30 @@
 # New ports collection makefile for:	mmr
-# Version required:			1.5.2
+# Version required:			1.5.4
 # Date created:				23 October 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		mmr-1.5.2
-CATEGORIES=		mail
-MASTER_SITES=		${MASTER_SITE_SUNSITE} \
-			http://www.devolution.com/~slouken/projects/mmr/
-MASTER_SITE_SUBDIR=	system/mail/mua
+DISTNAME=	mmr-1.5.4
+CATEGORIES=	mail
+MASTER_SITES=	http://www.devolution.com/~slouken/projects/mmr/
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-ALL_TARGET=
+ALL_TARGET=	# empty
 
-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-extract:
+	@${RM} -f ${WRKSRC}/*.o
 
-post-install:
+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
 .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
+	@${MKDIR} ${PREFIX}/share/doc/mmr
+.for file in BUGS CHANGES Features README TODO
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/mmr
 .endfor
 .endif
 
diff --git a/mail/mmr/distinfo b/mail/mmr/distinfo
index a2283d7ee039..83100e8da3f0 100644
--- a/mail/mmr/distinfo
+++ b/mail/mmr/distinfo
@@ -1 +1 @@
-MD5 (mmr-1.5.2.tar.gz) = 73823d31eb97dfbb737958316063073d
+MD5 (mmr-1.5.4.tar.gz) = bd0c11cb3c5e4eec2b51b438782bbcbc
diff --git a/mail/mmr/files/patch-aa b/mail/mmr/files/patch-aa
index ed1cfdb21543..a6cdb67adb0a 100644
--- a/mail/mmr/files/patch-aa
+++ b/mail/mmr/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile	Thu Dec 24 23:32:56 1998
-+++ /home/andy/tmp/wrk/Makefile	Tue Apr 27 18:06:19 1999
+--- Makefile.orig	Fri Mar 31 03:26:17 2000
++++ Makefile	Fri Mar 31 03:27:50 2000
 @@ -7,15 +7,15 @@
  #		(Toggled at runtime with ^T)
  # -DMAILPATH=\"/some/path\"
@@ -13,11 +13,11 @@
 -LIBS = -lcurses -ltermcap -lnsl
 -CXX  = g++ -g
 -INCDIRS = -Imd5 -I/usr/include/ncurses
--CXXFLAGS = $(DEFS) $(INCDIRS) $(CFLAGS)
+-CXXFLAGS = $(DEFS) $(INCDIRS) -O2
 +LIBS = -lncurses
-+CXX?= g++ -g
++CXX  ?= g++ -g
 +INCDIRS = -Imd5
-+CXXFLAGS+= $(DEFS) $(INCDIRS)
++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 4bd602a70fd9..14429c69a444 100644
--- a/mail/mmr/files/patch-ab
+++ b/mail/mmr/files/patch-ab
@@ -1,8 +1,8 @@
---- 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"
+--- outgoing.cpp.orig	Thu Apr 22 23:24:59 1999
++++ outgoing.cpp	Fri Mar 31 03:22:18 2000
+@@ -14,7 +14,9 @@
  #include "rcfile.h"
+ #include "outgoing.h"
  
 +#ifndef MAILER
  #define MAILER	"/usr/lib/sendmail -t"
diff --git a/mail/mmr/files/patch-ae b/mail/mmr/files/patch-ae
index 145e91067c70..b94a2570fbf6 100644
--- a/mail/mmr/files/patch-ae
+++ b/mail/mmr/files/patch-ae
@@ -1,20 +1,20 @@
---- mailmsg.cc.orig	Sat Feb 19 21:38:48 2000
-+++ mailmsg.cc	Sat Feb 19 21:39:24 2000
-@@ -190,7 +190,7 @@
- 						continue;
- 					}
- 					schar = 
--					  ((*status == ' ') ? "R" : status);
-+					  ((*status == ' ') ? (char *)"R" : status);
- 					*sptr = *schar;
- 					NewField("Status", schar);
- 					status_written = 1;
-@@ -208,7 +208,7 @@
- 				char *schar;
- 				sptr = new char[strlen("Status: ")+2+1];
- 				strcpy(sptr, "Status: ");
--				schar = ((*status == ' ') ? "R" : status);
-+				schar = ((*status == ' ') ? (char *)"R" : status);
- 				strcat(sptr, schar); strcat(sptr, "\n");
- 				QueueRing(ringbuf, sptr, strlen(sptr));
- 				delete[] sptr;
+--- mailmsg.cpp.orig	Sat Jan 29 19:09:17 2000
++++ mailmsg.cpp	Fri Mar 31 03:37:43 2000
+@@ -142,7 +142,7 @@
+ 					continue;
+ 				}
+ 				schar = 
+-				  ((*status == ' ') ? "R" : status);
++				  ((*status == ' ') ? (char *)"R" : status);
+ 				*sptr = *schar;
+ 				NewField("Status", schar);
+ 				status_written = 1;
+@@ -157,7 +157,7 @@
+ 			char *schar;
+ 			sptr = new char[strlen("Status: ")+2+1];
+ 			strcpy(sptr, "Status: ");
+-			schar = ((*status == ' ') ? "R" : status);
++			schar = ((*status == ' ') ? (char *)"R" : status);
+ 			strcat(sptr, schar); strcat(sptr, "\n");
+ 			QueueRing(ringbuf, sptr, strlen(sptr));
+ 			delete[] sptr;
diff --git a/mail/mmr/pkg-plist b/mail/mmr/pkg-plist
index 83ceb92ec87b..0f4bab98ef9f 100644
--- a/mail/mmr/pkg-plist
+++ b/mail/mmr/pkg-plist
@@ -1,11 +1,9 @@
 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
+@dirrm share/doc/mmr