Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 Apr 1999 18:32:05 +0400 (MSD)
From:      Andrey Zakhvatov <andy@icc.surw.chel.su>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/11352: Update port: mail/mmr
Message-ID:  <199904271432.SAA00794@icc.surw.chel.su>

next in thread | raw e-mail | index | archive | help

>Number:         11352
>Category:       ports
>Synopsis:       Update port: mail/mmr
>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:   Tue Apr 27 07:40:01 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     Andrey Zakhvatov
>Release:        FreeBSD 3.1-RELEASE i386
>Organization:
South Ural Railway ICC
>Environment:

>Description:

   This is a patch to update mail/mmr port.


diff -Nru mmr/Makefile mmr-1.5.2/Makefile
--- mmr/Makefile	Tue Oct 13 14:33:36 1998
+++ mmr-1.5.2/Makefile	Tue Apr 27 18:25:22 1999
@@ -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.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 -Nru mmr/files/md5 mmr-1.5.2/files/md5
--- mmr/files/md5	Sat Nov  1 17:15:12 1997
+++ mmr-1.5.2/files/md5	Tue Apr 27 17:51:42 1999
@@ -1 +1 @@
-MD5 (mmr-1.5.1.tar.gz) = ef6848e16a3957e6cbb08203a2316b56
+MD5 (mmr-1.5.2.tar.gz) = 73823d31eb97dfbb737958316063073d
diff -Nru mmr/patches/patch-aa mmr-1.5.2/patches/patch-aa
--- mmr/patches/patch-aa	Sat Nov  1 17:15:13 1997
+++ mmr-1.5.2/patches/patch-aa	Tue Apr 27 18:09:32 1999
@@ -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 -Nru mmr/patches/patch-ab mmr-1.5.2/patches/patch-ab
--- mmr/patches/patch-ab	Sat Nov  1 17:15:13 1997
+++ mmr-1.5.2/patches/patch-ab	Tue Apr 27 18:09:44 1999
@@ -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 -Nru mmr/patches/patch-ac mmr-1.5.2/patches/patch-ac
--- mmr/patches/patch-ac	Sat Nov  1 17:15:13 1997
+++ mmr-1.5.2/patches/patch-ac	Tue Apr 27 18:09:52 1999
@@ -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 -Nru mmr/patches/patch-ad mmr-1.5.2/patches/patch-ad
--- mmr/patches/patch-ad	Thu Jan  1 03:00:00 1970
+++ mmr-1.5.2/patches/patch-ad	Tue Apr 27 18:12:50 1999
@@ -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 -Nru mmr/pkg/COMMENT mmr-1.5.2/pkg/COMMENT
--- mmr/pkg/COMMENT	Sat Nov  1 17:15:14 1997
+++ mmr-1.5.2/pkg/COMMENT	Tue Apr 27 18:22:14 1999
@@ -1 +1 @@
-A curses based MIME aware mailer
+Curses based MIME Mail Reader.
diff -Nru mmr/pkg/DESCR mmr-1.5.2/pkg/DESCR
--- mmr/pkg/DESCR	Sat Nov  1 17:15:14 1997
+++ mmr-1.5.2/pkg/DESCR	Tue Apr 27 18:23:45 1999
@@ -18,5 +18,5 @@
 
    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 -Nru mmr/pkg/PLIST mmr-1.5.2/pkg/PLIST
--- mmr/pkg/PLIST	Sat Nov  1 17:15:14 1997
+++ mmr-1.5.2/pkg/PLIST	Tue Apr 27 18:24:02 1999
@@ -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


>How-To-Repeat:

>Fix:

   Please, check and apply this patch.


>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?199904271432.SAA00794>